Fix IWYU with clang-15 (#31556)

* Fix iwyu

* iwyu fix

* more fixed

* Build fix

* more fix

* More fixes 3

BUILD

@@ -2103,6 +2103,7 @@ grpc_cc_library(
     external_deps = [
         "absl/base",
         "absl/base:core_headers",
+        "absl/meta:type_traits",
         "absl/status",
         "absl/strings",
         "absl/time",
@@ -3120,6 +3121,7 @@ grpc_cc_library(
         "promise",
         "//src/core:arena",
         "//src/core:arena_promise",
+        "//src/core:basic_seq",
         "//src/core:channel_fwd",
         "//src/core:channel_init",
         "//src/core:channel_stack_type",

src/core/BUILD

@@ -946,6 +946,7 @@ grpc_cc_library(
     ],
     deps = [
         "activity",
+        "basic_seq",
         "event_engine_memory_allocator",
         "exec_ctx_wakeup_scheduler",
         "experiments",
@@ -1856,7 +1857,6 @@ grpc_cc_library(
     external_deps = ["absl/functional:any_invocable"],
     deps = [
         "channel_args",
-        "channel_args_preconditioning",
         "context",
         "default_event_engine_factory",
         "event_engine_trace",
@@ -2611,6 +2611,7 @@ grpc_cc_library(
         "//:grpc_security_base",
         "//:grpc_trace",
         "//:httpcli",
+        "//:orphanable",
         "//:ref_counted_ptr",
         "//:uri_parser",
     ],
@@ -3080,7 +3081,6 @@ grpc_cc_library(
         "arena_promise",
         "channel_args",
         "channel_fwd",
-        "channel_init",
         "channel_stack_type",
         "slice",
         "//:channel_stack_builder",
@@ -3226,6 +3226,7 @@ grpc_cc_library(
     external_deps = [
         "absl/base:core_headers",
         "absl/container:inlined_vector",
+        "absl/meta:type_traits",
         "absl/status",
         "absl/status:statusor",
         "absl/strings",
@@ -3534,7 +3535,6 @@ grpc_cc_library(
     deps = [
         "channel_args",
         "channel_fwd",
-        "channel_init",
         "channel_stack_type",
         "ref_counted",
         "useful",
@@ -3589,7 +3589,6 @@ grpc_cc_library(
         "//:ref_counted_ptr",
         "//:sockaddr_utils",
         "//:uri_parser",
-        "//:xds_client",
     ],
 )
 
@@ -3671,7 +3670,6 @@ grpc_cc_library(
         "//:ref_counted_ptr",
         "//:server_address",
         "//:work_serializer",
-        "//:xds_client",
     ],
 )
 
@@ -3923,7 +3921,6 @@ grpc_cc_library(
         "json",
         "lb_policy",
         "lb_policy_factory",
-        "lb_policy_registry",
         "subchannel_interface",
         "//:config",
         "//:debug_location",
@@ -3962,7 +3959,6 @@ grpc_cc_library(
         "json_object_loader",
         "lb_policy",
         "lb_policy_factory",
-        "lb_policy_registry",
         "subchannel_interface",
         "unique_type_name",
         "validation_errors",
@@ -3998,7 +3994,6 @@ grpc_cc_library(
         "json",
         "lb_policy",
         "lb_policy_factory",
-        "lb_policy_registry",
         "subchannel_interface",
         "//:config",
         "//:debug_location",
@@ -4161,7 +4156,6 @@ grpc_cc_library(
         "//:src/cpp/server/load_reporter/constants.h",
     ],
     external_deps = [
-        "absl/container:inlined_vector",
         "absl/meta:type_traits",
         "absl/status",
         "absl/status:statusor",
@@ -4175,7 +4169,6 @@ grpc_cc_library(
     deps = [
         "arena_promise",
         "channel_fwd",
-        "channel_init",
         "channel_stack_type",
         "context",
         "grpc_sockaddr",

src/core/ext/filters/channel_idle/channel_idle_filter.h

@@ -29,6 +29,7 @@
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/single_set_ptr.h"
 #include "src/core/lib/gprpp/time.h"

src/core/ext/filters/client_channel/client_channel_channelz.cc

@@ -20,8 +20,6 @@
 
 #include "src/core/ext/filters/client_channel/client_channel_channelz.h"
 
-#include <map>
-
 #include "src/core/lib/transport/connectivity_state.h"
 
 // IWYU pragma: no_include <type_traits>

src/core/ext/filters/client_channel/http_proxy.cc

@@ -44,7 +44,6 @@
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "src/core/lib/gprpp/memory.h"
-#include "src/core/lib/handshaker/proxy_mapper_registry.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/slice/b64.h"
 #include "src/core/lib/transport/http_connect_handshaker.h"

src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc

@@ -22,6 +22,7 @@
 
 #include <new>
 
+#include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 

src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc

@@ -20,7 +20,6 @@
 
 #include <stddef.h>
 
-#include <memory>
 #include <utility>
 
 #include "src/core/lib/channel/channel_args.h"

src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc

@@ -24,7 +24,6 @@
 #include <algorithm>
 #include <atomic>
 #include <cmath>
-#include <cstdint>
 #include <map>
 #include <memory>
 #include <set>

src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc

@@ -45,7 +45,6 @@
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/load_balancing/lb_policy.h"
 #include "src/core/lib/load_balancing/lb_policy_factory.h"
-#include "src/core/lib/load_balancing/lb_policy_registry.h"
 #include "src/core/lib/load_balancing/subchannel_interface.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/transport/connectivity_state.h"

src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc

@@ -63,7 +63,6 @@
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/load_balancing/lb_policy.h"
 #include "src/core/lib/load_balancing/lb_policy_factory.h"
-#include "src/core/lib/load_balancing/lb_policy_registry.h"
 #include "src/core/lib/load_balancing/subchannel_interface.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/transport/connectivity_state.h"

src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc

@@ -44,7 +44,6 @@
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/load_balancing/lb_policy.h"
 #include "src/core/lib/load_balancing/lb_policy_factory.h"
-#include "src/core/lib/load_balancing/lb_policy_registry.h"
 #include "src/core/lib/load_balancing/subchannel_interface.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/transport/connectivity_state.h"

src/core/ext/filters/client_channel/lb_policy/xds/cds.cc

@@ -38,13 +38,10 @@
 
 #include "src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h"
 #include "src/core/ext/xds/certificate_provider_store.h"
-#include "src/core/ext/xds/xds_bootstrap_grpc.h"
 #include "src/core/ext/xds/xds_certificate_provider.h"
-#include "src/core/ext/xds/xds_client.h"
 #include "src/core/ext/xds/xds_client_grpc.h"
 #include "src/core/ext/xds/xds_cluster.h"
 #include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_resource_type_impl.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"

src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc

@@ -50,7 +50,6 @@
 #include "src/core/ext/xds/xds_client_grpc.h"
 #include "src/core/ext/xds/xds_client_stats.h"
 #include "src/core/ext/xds/xds_endpoint.h"
-#include "src/core/ext/xds/xds_resource_type_impl.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"

src/core/ext/filters/client_channel/resolver/binder/binder_resolver.cc

@@ -46,7 +46,6 @@
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/resolver/resolver.h"
 #include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/uri/uri_parser.h"
 

src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc

@@ -34,7 +34,6 @@
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
 
-#include <grpc/event_engine/event_engine.h>
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
@@ -80,7 +79,6 @@
 #include "src/core/lib/iomgr/gethostname.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/json/json.h"
-#include "src/core/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/service_config/service_config_impl.h"
 #include "src/core/lib/transport/error_utils.h"

src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc

@@ -26,6 +26,7 @@
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 
+// IWYU pragma: no_include <arpa/inet.h>
 // IWYU pragma: no_include <arpa/nameser.h>
 // IWYU pragma: no_include <inttypes.h>
 // IWYU pragma: no_include <netdb.h>

src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc

@@ -50,7 +50,6 @@
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/resolver/resolver.h"
 #include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/uri/uri_parser.h"
 

src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc

@@ -37,7 +37,6 @@
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/service_config/service_config.h"
 #include "src/core/lib/uri/uri_parser.h"

src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc

@@ -19,7 +19,6 @@
 #include <string.h>
 
 #include <cstdint>
-#include <map>
 #include <memory>
 #include <random>
 #include <string>

src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc

@@ -20,7 +20,6 @@
 #include <memory>
 #include <string>
 #include <utility>
-#include <vector>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/str_split.h"
@@ -36,7 +35,6 @@
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/resolver/resolver.h"
 #include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/uri/uri_parser.h"
 

src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc

@@ -56,11 +56,9 @@
 #include "src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h"
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"
-#include "src/core/ext/xds/xds_client.h"
 #include "src/core/ext/xds/xds_client_grpc.h"
 #include "src/core/ext/xds/xds_http_filters.h"
 #include "src/core/ext/xds/xds_listener.h"
-#include "src/core/ext/xds/xds_resource_type_impl.h"
 #include "src/core/ext/xds/xds_route_config.h"
 #include "src/core/ext/xds/xds_routing.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -80,11 +78,9 @@
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/resolver/resolver.h"
 #include "src/core/lib/resolver/resolver_factory.h"
-#include "src/core/lib/resolver/resolver_registry.h"
 #include "src/core/lib/resolver/server_address.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/service_config/service_config.h"
-#include "src/core/lib/service_config/service_config_call_data.h"
 #include "src/core/lib/service_config/service_config_impl.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/transport/metadata_batch.h"

src/core/ext/filters/client_channel/retry_service_config.cc

@@ -18,7 +18,6 @@
 
 #include "src/core/ext/filters/client_channel/retry_service_config.h"
 
-#include <cstdint>
 #include <map>
 #include <string>
 #include <utility>

src/core/ext/filters/http/client/http_client_filter.cc

@@ -40,6 +40,7 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/promise/context.h"
+#include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/latch.h"
 #include "src/core/lib/promise/seq.h"
 #include "src/core/lib/promise/try_concurrently.h"

src/core/ext/filters/http/client_authority_filter.cc

@@ -34,7 +34,6 @@
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/metadata_batch.h"
 

src/core/ext/filters/http/server/http_server_filter.cc

@@ -25,6 +25,7 @@
 #include <utility>
 
 #include "absl/base/attributes.h"
+#include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 
@@ -33,6 +34,7 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/promise/context.h"
+#include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/latch.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/promise/seq.h"

src/core/ext/filters/load_reporting/server_load_reporting_filter.cc

@@ -29,7 +29,6 @@
 #include <string>
 #include <utility>
 
-#include "absl/container/inlined_vector.h"
 #include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/strings/ascii.h"
@@ -62,7 +61,6 @@
 #include "src/core/lib/promise/seq.h"
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/slice/slice.h"
-#include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/uri/uri_parser.h"

src/core/ext/filters/message_size/message_size_filter.cc

@@ -18,7 +18,6 @@
 
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 
-#include <cstdint>
 #include <new>
 
 #include "absl/status/status.h"

src/core/ext/transport/chttp2/transport/hpack_encoder.cc

@@ -22,7 +22,6 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <memory>
 
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>

src/core/ext/transport/chttp2/transport/hpack_parser.cc

@@ -26,7 +26,6 @@
 #include <stdlib.h>
 
 #include <algorithm>
-#include <cstdint>
 #include <string>
 #include <utility>
 

src/core/ext/transport/chttp2/transport/writing.cc

@@ -29,6 +29,7 @@
 
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
+#include <grpc/status.h>
 #include <grpc/support/log.h>
 
 // IWYU pragma: no_include "src/core/lib/gprpp/orphanable.h"

src/core/ext/xds/file_watcher_certificate_provider_factory.cc

@@ -32,7 +32,6 @@
 
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/json/json_util.h"
-#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
 namespace grpc_core {

src/core/ext/xds/xds_bootstrap_grpc.cc

@@ -38,7 +38,6 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
 
 namespace grpc_core {

src/core/ext/xds/xds_channel_stack_modifier.cc

@@ -29,7 +29,6 @@
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 
 namespace grpc_core {

src/core/ext/xds/xds_cluster.cc

@@ -57,6 +57,7 @@
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/host_port.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/load_balancing/lb_policy_registry.h"

src/core/ext/xds/xds_cluster_specifier_plugin.cc

@@ -34,6 +34,7 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/load_balancing/lb_policy_registry.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upb.h"

src/core/ext/xds/xds_common_types.cc

@@ -44,7 +44,6 @@
 #include "upb/upb.hpp"
 #include "xds/type/v3/typed_struct.upb.h"
 
-#include "src/core/ext/xds/certificate_provider_store.h"
 #include "src/core/ext/xds/upb_utils.h"
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"
 #include "src/core/ext/xds/xds_client.h"

src/core/ext/xds/xds_http_fault_filter.cc

@@ -20,7 +20,6 @@
 
 #include <stdint.h>
 
-#include <map>
 #include <string>
 #include <utility>
 

src/core/ext/xds/xds_http_filters.h

@@ -19,7 +19,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <algorithm>
 #include <map>
 #include <memory>
 #include <string>

src/core/ext/xds/xds_listener.h

@@ -24,7 +24,6 @@
 
 #include <algorithm>
 #include <array>
-#include <cstdint>
 #include <map>
 #include <memory>
 #include <string>

src/core/ext/xds/xds_server_config_fetcher.cc

@@ -21,7 +21,6 @@
 #include <string.h>
 
 #include <algorithm>
-#include <array>
 #include <map>
 #include <memory>
 #include <set>
@@ -58,7 +57,6 @@
 #include "src/core/ext/xds/xds_common_types.h"
 #include "src/core/ext/xds/xds_http_filters.h"
 #include "src/core/ext/xds/xds_listener.h"
-#include "src/core/ext/xds/xds_resource_type_impl.h"
 #include "src/core/ext/xds/xds_route_config.h"
 #include "src/core/ext/xds/xds_routing.h"
 #include "src/core/lib/address_utils/parse_address.h"

src/core/lib/address_utils/parse_address.cc

@@ -42,6 +42,8 @@
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
 
+// IWYU pragma: no_include <arpa/inet.h>
+
 #ifdef GRPC_HAVE_UNIX_SOCKET
 
 bool grpc_parse_unix(const grpc_core::URI& uri,

src/core/lib/channel/channel_trace.cc

@@ -21,7 +21,6 @@
 #include "src/core/lib/channel/channel_trace.h"
 
 #include <algorithm>
-#include <map>
 #include <string>
 #include <utility>
 

src/core/lib/channel/channelz.cc

@@ -22,7 +22,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/escaping.h"
@@ -40,6 +39,7 @@
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/uri/uri_parser.h"
 

src/core/lib/debug/event_log.cc

@@ -18,7 +18,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <cstdint>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"

src/core/lib/event_engine/default_event_engine.cc

@@ -24,7 +24,6 @@
 #include <grpc/event_engine/event_engine.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine_factory.h"

src/core/lib/event_engine/posix_engine/posix_engine.cc

@@ -41,6 +41,8 @@
 #include "src/core/lib/event_engine/posix_engine/event_poller_posix_default.h"
 #endif  // GRPC_POSIX_SOCKET_TCP
 
+// IWYU pragma: no_include <ratio>
+
 using namespace std::chrono_literals;
 
 namespace grpc_event_engine {

src/core/lib/event_engine/work_queue.cc

@@ -15,8 +15,6 @@
 
 #include "src/core/lib/event_engine/work_queue.h"
 
-#include <cstdint>
-#include <memory>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"

src/core/lib/experiments/config.cc

@@ -20,7 +20,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <memory>
 #include <string>
 
 #include "absl/strings/ascii.h"
@@ -32,6 +31,7 @@
 
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/gprpp/global_config.h"
+#include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/no_destruct.h"
 
 GPR_GLOBAL_CONFIG_DEFINE_STRING(

src/core/lib/gprpp/time.cc

@@ -18,7 +18,6 @@
 
 #include <atomic>
 #include <chrono>
-#include <cstdint>
 #include <limits>
 #include <string>
 #include <utility>
@@ -29,6 +28,8 @@
 
 #include "src/core/lib/gprpp/no_destruct.h"
 
+// IWYU pragma: no_include <ratio>
+
 namespace grpc_core {
 
 namespace {

src/core/lib/resource_quota/api.cc

@@ -28,7 +28,6 @@
 #include <grpc/grpc.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/memory_quota.h"

src/core/lib/resource_quota/memory_quota.cc

@@ -28,6 +28,7 @@
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/mpscq.h"
+#include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h"
 #include "src/core/lib/promise/loop.h"
 #include "src/core/lib/promise/map.h"

src/core/lib/security/credentials/google_default/google_default_credentials.cc

@@ -46,6 +46,7 @@
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/host_port.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/status_helper.h"
 #include "src/core/lib/gprpp/sync.h"

src/core/lib/security/credentials/jwt/json_token.cc

@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <map>
 #include <string>
 #include <utility>
 

src/core/lib/security/credentials/jwt/jwt_credentials.cc

@@ -23,7 +23,6 @@
 #include <inttypes.h>
 #include <stdlib.h>
 
-#include <map>
 #include <memory>
 #include <string>
 #include <utility>

src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc

@@ -19,7 +19,6 @@
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 
 #include <algorithm>
-#include <vector>
 
 #include "absl/status/status.h"
 

src/core/lib/security/security_connector/load_system_roots_supported.cc

@@ -19,7 +19,6 @@
 #include <grpc/support/port_platform.h>
 
 #include <algorithm>
-#include <memory>
 #include <vector>
 
 #if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \

src/core/lib/security/security_connector/ssl_utils.cc

@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <memory>
 #include <vector>
 
 #include "absl/strings/match.h"

src/core/lib/security/transport/client_auth_filter.cc

@@ -52,7 +52,6 @@
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/security/transport/auth_filters.h"
-#include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 

src/core/lib/surface/call.cc

@@ -26,7 +26,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <cstdint>
 #include <memory>
 #include <new>
 #include <string>
@@ -35,7 +34,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/cleanup/cleanup.h"
-#include "absl/container/inlined_vector.h"
 #include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"

src/core/lib/surface/init.cc

@@ -51,7 +51,6 @@
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/security/transport/auth_filters.h"
 #include "src/core/lib/surface/api_trace.h"
-#include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/surface/init_internally.h"
 

src/core/lib/transport/transport.h

@@ -60,8 +60,6 @@
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport_fwd.h"
 
-struct grpc_transport_stream_op_batch_payload;
-
 /* Minimum and maximum protocol accepted versions. */
 #define GRPC_PROTOCOL_VERSION_MAX_MAJOR 2
 #define GRPC_PROTOCOL_VERSION_MAX_MINOR 1

src/cpp/client/channel_cc.cc

@@ -41,7 +41,6 @@
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/impl/rpc_method.h>
 #include <grpcpp/support/client_interceptor.h>
-#include <grpcpp/support/config.h>
 #include <grpcpp/support/slice.h>
 
 #include "src/core/lib/iomgr/iomgr.h"

src/cpp/client/client_context.cc

@@ -41,7 +41,6 @@
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/client_interceptor.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 

src/cpp/client/create_channel_internal.h

@@ -26,7 +26,6 @@
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/support/client_interceptor.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 

src/cpp/client/create_channel_posix.cc

@@ -29,7 +29,6 @@
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
-#include <grpcpp/support/config.h>
 
 #include "src/cpp/client/create_channel_internal.h"
 

src/cpp/client/insecure_credentials.cc

@@ -27,7 +27,6 @@
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
-#include <grpcpp/support/config.h>
 
 #include "src/cpp/client/create_channel_internal.h"
 

src/cpp/client/secure_credentials.cc

@@ -40,6 +40,7 @@
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/config.h>
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
 

src/cpp/client/secure_credentials.h

@@ -36,7 +36,6 @@
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
-#include <grpcpp/support/config.h>
 // TODO(yashykt): We shouldn't be including "src/core" headers.
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/security/credentials/credentials.h"

src/cpp/common/alts_context.cc

@@ -25,7 +25,6 @@
 
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/security/alts_context.h>
-#include <grpcpp/support/config.h>
 
 #include "src/proto/grpc/gcp/altscontext.upb.h"
 #include "src/proto/grpc/gcp/transport_security_common.upb.h"

src/cpp/common/alts_util.cc

@@ -28,7 +28,6 @@
 #include <grpcpp/security/alts_context.h>
 #include <grpcpp/security/alts_util.h>
 #include <grpcpp/security/auth_context.h>
-#include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 

src/cpp/common/channel_arguments.cc

@@ -17,7 +17,6 @@
  */
 #include <algorithm>
 #include <list>
-#include <memory>
 #include <string>
 #include <vector>
 
@@ -27,7 +26,6 @@
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/config.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/socket_mutator.h"

src/cpp/common/channel_filter.cc

@@ -30,7 +30,6 @@
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/slice/slice.h"
-#include "src/core/lib/surface/channel_init.h"
 
 namespace grpc {
 

src/cpp/common/resource_quota_cc.cc

@@ -22,7 +22,6 @@
 
 #include <grpc/grpc.h>
 #include <grpcpp/resource_quota.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 

src/cpp/common/secure_auth_context.h

@@ -24,7 +24,6 @@
 
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
-#include <grpcpp/support/config.h>
 #include <grpcpp/support/string_ref.h>
 
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

src/cpp/common/secure_channel_arguments.cc

@@ -16,13 +16,11 @@
  *
  */
 
-#include <memory>
 #include <string>
 #include <vector>
 
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 

src/cpp/common/tls_certificate_provider.cc

@@ -20,7 +20,6 @@
 #include <grpc/grpc_security.h>
 #include <grpc/support/log.h>
 #include <grpcpp/security/tls_certificate_provider.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 namespace experimental {

src/cpp/common/tls_certificate_verifier.cc

@@ -16,6 +16,7 @@
 
 #include <stddef.h>
 
+#include <algorithm>
 #include <functional>
 #include <map>
 #include <string>
@@ -30,7 +31,6 @@
 #include <grpcpp/impl/codegen/sync.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/security/tls_certificate_verifier.h>
-#include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 

src/cpp/common/tls_credentials_options.cc

@@ -26,7 +26,6 @@
 #include <grpcpp/security/tls_certificate_provider.h>
 #include <grpcpp/security/tls_certificate_verifier.h>
 #include <grpcpp/security/tls_credentials_options.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 namespace experimental {

src/cpp/common/validate_service_config.cc

@@ -22,10 +22,11 @@
 #include "absl/status/statusor.h"
 
 #include <grpc/grpc.h>
-#include <grpcpp/support/config.h>
 #include <grpcpp/support/validate_service_config.h>
 
 #include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/service_config/service_config.h"
 #include "src/core/lib/service_config/service_config_impl.h"
 
 namespace grpc {

src/cpp/ext/filters/census/client_filter.cc

@@ -45,7 +45,6 @@
 #include <grpc/slice.h>
 #include <grpc/support/log.h>
 #include <grpcpp/opencensus.h>
-#include <grpcpp/support/config.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/context.h"

src/cpp/ext/filters/census/server_filter.cc

@@ -22,6 +22,7 @@
 
 #include <utility>
 
+#include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"

src/cpp/ext/filters/census/server_filter.h

@@ -33,7 +33,6 @@
 #include <grpc/grpc_security.h>
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpcpp/opencensus.h>
-#include <grpcpp/support/config.h>
 
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"

src/cpp/ext/gcp/observability.cc

@@ -37,7 +37,6 @@
 #include <grpcpp/opencensus.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/config.h>
 
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/cpp/ext/filters/census/open_census_call_tracer.h"

src/cpp/ext/gcp/observability_config.cc

@@ -21,7 +21,6 @@
 #include <stddef.h>
 
 #include <algorithm>
-#include <memory>
 #include <utility>
 
 #include "absl/status/status.h"

src/cpp/ext/proto_server_reflection.cc

@@ -22,6 +22,7 @@
 #include <vector>
 
 #include <grpcpp/grpcpp.h>
+#include <grpcpp/support/interceptor.h>
 
 // IWYU pragma: no_include <google/protobuf/descriptor.h>
 

src/cpp/server/authorization_policy_provider.cc

@@ -19,7 +19,6 @@
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/security/authorization_policy_provider.h>
-#include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 
 namespace grpc {

src/cpp/server/channel_argument_option.cc

@@ -24,7 +24,6 @@
 #include <grpcpp/impl/server_builder_option.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 

src/cpp/server/channelz/channelz_service_plugin.cc

@@ -25,7 +25,6 @@
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/server_builder.h>
-#include <grpcpp/support/config.h>
 
 #include "src/cpp/server/channelz/channelz_service.h"
 

src/cpp/server/csds/csds.cc

@@ -27,7 +27,7 @@
 #include "absl/status/statusor.h"
 
 #include <grpc/slice.h>
-#include <grpcpp/support/config.h>
+#include <grpcpp/support/interceptor.h>
 #include <grpcpp/support/slice.h>
 
 namespace grpc {

src/cpp/server/external_connection_acceptor_impl.h

@@ -25,7 +25,6 @@
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/config.h>
 
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/tcp_server.h"

src/cpp/server/health/default_health_check_service.h

@@ -32,7 +32,6 @@
 #include <grpcpp/impl/codegen/sync.h>
 #include <grpcpp/impl/service_type.h>
 #include <grpcpp/support/byte_buffer.h>
-#include <grpcpp/support/config.h>
 #include <grpcpp/support/server_callback.h>
 #include <grpcpp/support/status.h>
 

src/cpp/server/insecure_server_credentials.cc

@@ -25,7 +25,6 @@
 #include <grpc/support/log.h>
 #include <grpcpp/security/auth_metadata_processor.h>
 #include <grpcpp/security/server_credentials.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 namespace {

src/cpp/server/load_reporter/load_data_store.h

@@ -24,7 +24,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <cstdint>
 #include <memory>
 #include <set>
 #include <string>

src/cpp/server/load_reporter/load_reporter.h

@@ -38,8 +38,6 @@
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"
 
-#include <grpcpp/support/config.h>
-
 #include "src/core/lib/gprpp/sync.h"
 #include "src/cpp/server/load_reporter/load_data_store.h"
 #include "src/proto/grpc/lb/v1/load_reporter.pb.h"

src/cpp/server/load_reporter/load_reporter_async_service_impl.h

@@ -33,7 +33,7 @@
 #include <grpcpp/alarm.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/config.h>
+#include <grpcpp/support/interceptor.h>
 
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/thd.h"

src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc

@@ -22,6 +22,7 @@
 
 #include <utility>
 
+#include <grpcpp/grpcpp.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/server_builder.h>
 

src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h

@@ -28,7 +28,6 @@
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/config.h>
 
 #include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h"
 

src/cpp/server/load_reporter/util.cc

@@ -27,7 +27,6 @@
 #include <grpc/support/log.h>
 #include <grpcpp/ext/server_load_reporting.h>
 #include <grpcpp/server_context.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 namespace load_reporter {

src/cpp/server/orca/call_metric_recorder.cc

@@ -28,7 +28,6 @@
 
 #include <grpcpp/ext/call_metric_recorder.h>
 #include <grpcpp/impl/codegen/sync.h>
-#include <grpcpp/support/config.h>
 #include <grpcpp/support/string_ref.h>
 
 #include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h"

src/cpp/server/orca/orca_interceptor.cc

@@ -29,7 +29,6 @@
 #include <grpcpp/ext/call_metric_recorder.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
-#include <grpcpp/support/config.h>
 
 #include "src/core/lib/transport/metadata_batch.h"