Revert "[iwyu] grpc++ (#29610)" (#29720)

This reverts commit c8159eabdf.

BUILD

@@ -473,17 +473,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "gpr_public_hdrs",
-    hdrs = GPR_PUBLIC_HDRS,
-)
-
-grpc_cc_library(
-    name = "grpc_public_hdrs",
-    hdrs = GRPC_PUBLIC_HDRS,
-    deps = ["gpr_public_hdrs"],
-)
-
 grpc_cc_library(
     name = "grpc++_public_hdrs",
     hdrs = GRPCXX_PUBLIC_HDRS,
@@ -492,7 +481,6 @@ grpc_cc_library(
         "protobuf_headers",
     ],
     visibility = ["@grpc:public"],
-    deps = ["grpc_public_hdrs"],
 )
 
 grpc_cc_library(
@@ -561,13 +549,11 @@ grpc_cc_library(
     deps = [
         "error",
         "gpr_base",
-        "gpr_codegen",
         "grpc",
         "grpc++_base",
         "grpc++_codegen_base",
         "grpc++_codegen_base_src",
         "grpc++_codegen_proto",
-        "grpc++_internal_hdrs_only",
         "grpc_base",
         "grpc_codegen",
         "grpc_credentials_util",
@@ -576,7 +562,6 @@ grpc_cc_library(
         "json",
         "ref_counted_ptr",
         "slice",
-        "slice_refcount",
     ],
 )
 
@@ -673,8 +658,6 @@ grpc_cc_library(
     ],
     language = "c++",
     deps = [
-        "gpr",
-        "grpc",
         "grpc++_internals",
     ],
 )
@@ -693,8 +676,6 @@ grpc_cc_library(
     ],
     visibility = ["@grpc:xds"],
     deps = [
-        "gpr",
-        "grpc",
         "grpc++_internals",
     ],
 )
@@ -716,7 +697,6 @@ grpc_cc_library(
         "grpc++_codegen_base",
         "grpc++_codegen_base_src",
         "grpc++_codegen_proto",
-        "grpc_codegen",
         "grpc_insecure_credentials",
         "grpc_unsecure",
     ],
@@ -750,7 +730,6 @@ grpc_cc_library(
         "include/grpcpp/security/alts_util.h",
     ],
     external_deps = [
-        "absl/memory",
         "upb_lib",
     ],
     language = "c++",
@@ -3907,9 +3886,6 @@ grpc_cc_library(
     deps = [
         "gpr",
         "gpr_codegen",
-        "grpc",
-        "grpc++",
-        "grpc_codegen",
         "lb_server_load_reporting_filter",
         "lb_server_load_reporting_service_server_builder_plugin",
         "slice",
@@ -3924,15 +3900,10 @@ grpc_cc_library(
     hdrs = [
         "src/cpp/server/load_reporter/load_reporter_async_service_impl.h",
     ],
-    external_deps = [
-        "absl/memory",
-        "protobuf_headers",
-    ],
+    external_deps = ["absl/memory"],
     language = "c++",
     deps = [
         "gpr",
-        "gpr_codegen",
-        "grpc++",
         "lb_load_reporter",
     ],
 )
@@ -3967,7 +3938,6 @@ grpc_cc_library(
     external_deps = [
         "opencensus-stats",
         "opencensus-tags",
-        "protobuf_headers",
     ],
     language = "c++",
     deps = [
@@ -5444,8 +5414,6 @@ grpc_cc_library(
     srcs = GRPCXX_SRCS,
     hdrs = GRPCXX_HDRS,
     external_deps = [
-        "absl/base:core_headers",
-        "absl/strings",
         "absl/synchronization",
         "absl/memory",
         "upb_lib",
@@ -5455,10 +5423,8 @@ grpc_cc_library(
     public_hdrs = GRPCXX_PUBLIC_HDRS,
     visibility = ["@grpc:alt_grpc++_base_legacy"],
     deps = [
-        "channel_init",
         "config",
         "gpr_base",
-        "gpr_codegen",
         "grpc",
         "grpc++_codegen_base",
         "grpc++_codegen_base_src",
@@ -5472,10 +5438,6 @@ grpc_cc_library(
         "grpc_transport_inproc",
         "iomgr_timer",
         "ref_counted",
-        "ref_counted_ptr",
-        "resource_quota",
-        "slice",
-        "time",
         "useful",
     ],
 )
@@ -5485,8 +5447,6 @@ grpc_cc_library(
     srcs = GRPCXX_SRCS,
     hdrs = GRPCXX_HDRS,
     external_deps = [
-        "absl/base:core_headers",
-        "absl/strings",
         "absl/synchronization",
         "absl/memory",
         "upb_lib",
@@ -5497,10 +5457,8 @@ grpc_cc_library(
     tags = ["avoid_dep"],
     visibility = ["@grpc:alt_grpc++_base_unsecure_legacy"],
     deps = [
-        "channel_init",
         "config",
         "gpr_base",
-        "gpr_codegen",
         "grpc++_codegen_base",
         "grpc++_codegen_base_src",
         "grpc++_internal_hdrs_only",
@@ -5515,10 +5473,6 @@ grpc_cc_library(
         "grpc_unsecure",
         "iomgr_timer",
         "ref_counted",
-        "ref_counted_ptr",
-        "resource_quota",
-        "slice",
-        "time",
         "useful",
     ],
 )
@@ -5618,7 +5572,6 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "grpc++_codegen_base",
-        "grpc++_public_hdrs",
     ],
 )
 
@@ -5663,9 +5616,6 @@ grpc_cc_library(
     hdrs = [
         "src/cpp/ext/proto_server_reflection.h",
     ],
-    external_deps = [
-        "protobuf_headers",
-    ],
     language = "c++",
     public_hdrs = [
         "include/grpc++/ext/proto_server_reflection_plugin.h",
@@ -5685,9 +5635,6 @@ grpc_cc_library(
         "src/cpp/server/orca/orca_service.cc",
     ],
     external_deps = [
-        "absl/base:core_headers",
-        "absl/time",
-        "absl/types:optional",
         "upb_lib",
     ],
     language = "c++",
@@ -5696,15 +5643,12 @@ grpc_cc_library(
     ],
     visibility = ["@grpc:public"],
     deps = [
-        "gpr",
         "grpc++",
         "grpc++_codegen_base",
-        "grpc++_internal_hdrs_only",
         "grpc_base",
         "iomgr_timer",
         "protobuf_duration_upb",
         "ref_counted",
-        "ref_counted_ptr",
         "time",
         "xds_orca_service_upb",
         "xds_orca_upb",
@@ -5721,9 +5665,6 @@ grpc_cc_library(
     hdrs = [
         "src/cpp/server/channelz/channelz_service.h",
     ],
-    external_deps = [
-        "protobuf_headers",
-    ],
     language = "c++",
     public_hdrs = [
         "include/grpcpp/ext/channelz_service_plugin.h",
@@ -5733,7 +5674,6 @@ grpc_cc_library(
         "gpr",
         "grpc",
         "grpc++",
-        "grpc++_config_proto",
         "//src/proto/grpc/channelz:channelz_proto",
     ],
     alwayslink = 1,
@@ -5747,10 +5687,7 @@ grpc_cc_library(
     hdrs = [
         "src/cpp/server/csds/csds.h",
     ],
-    external_deps = [
-        "absl/status",
-        "absl/status:statusor",
-    ],
+    external_deps = ["absl/status:statusor"],
     language = "c++",
     deps = [
         "gpr",
@@ -5825,14 +5762,10 @@ grpc_cc_library(
     hdrs = [
         "src/cpp/util/core_stats.h",
     ],
-    external_deps = [
-        "protobuf_headers",
-    ],
     language = "c++",
     deps = [
         "gpr",
         "grpc++",
-        "grpc_base",
         "//src/proto/grpc/core:stats_proto",
     ],
 )
@@ -5863,14 +5796,10 @@ grpc_cc_library(
     external_deps = [
         "absl-base",
         "absl-time",
-        "absl/base:core_headers",
-        "absl/status",
-        "absl/types:optional",
         "absl/strings",
         "opencensus-trace",
         "opencensus-trace-context_util",
         "opencensus-trace-propagation",
-        "opencensus-trace-span_context",
         "opencensus-tags",
         "opencensus-tags-context_util",
         "opencensus-stats",
@@ -5879,18 +5808,10 @@ grpc_cc_library(
     language = "c++",
     visibility = ["@grpc:grpc_opencensus_plugin"],
     deps = [
-        "arena",
         "census",
-        "channel_stack_type",
-        "debug_location",
-        "gpr",
         "gpr_base",
-        "gpr_codegen",
         "grpc++",
-        "grpc++_base",
         "grpc_base",
-        "slice",
-        "slice_refcount",
     ],
 )
 

CMakeLists.txt

@@ -3195,37 +3195,6 @@ foreach(_hdr
   include/grpc++/support/stub_options.h
   include/grpc++/support/sync_stream.h
   include/grpc++/support/time.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.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/alloc.h
-  include/grpc/support/atm.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/log.h
-  include/grpc/support/log_windows.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
   include/grpcpp/alarm.h
   include/grpcpp/channel.h
   include/grpcpp/client_context.h
@@ -3883,37 +3852,6 @@ foreach(_hdr
   include/grpc++/support/stub_options.h
   include/grpc++/support/sync_stream.h
   include/grpc++/support/time.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.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/alloc.h
-  include/grpc/support/atm.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/log.h
-  include/grpc/support/log_windows.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
   include/grpcpp/alarm.h
   include/grpcpp/channel.h
   include/grpcpp/client_context.h

bazel/grpc_deps.bzl

@@ -155,11 +155,6 @@ def grpc_deps():
         actual = "@io_opencensus_cpp//opencensus/trace:grpc_trace_bin",
     )
 
-    native.bind(
-        name = "opencensus-trace-span_context",
-        actual = "@io_opencensus_cpp//opencensus/trace:span_context",
-    )
-
     native.bind(
         name = "opencensus-stats",
         actual = "@io_opencensus_cpp//opencensus/stats:stats",

build_autogenerated.yaml

@@ -2564,37 +2564,6 @@ libs:
   - include/grpc++/support/stub_options.h
   - include/grpc++/support/sync_stream.h
   - include/grpc++/support/time.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.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/alloc.h
-  - include/grpc/support/atm.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/log.h
-  - include/grpc/support/log_windows.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
   - include/grpcpp/alarm.h
   - include/grpcpp/channel.h
   - include/grpcpp/client_context.h
@@ -2982,37 +2951,6 @@ libs:
   - include/grpc++/support/stub_options.h
   - include/grpc++/support/sync_stream.h
   - include/grpc++/support/time.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.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/alloc.h
-  - include/grpc/support/atm.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/log.h
-  - include/grpc/support/log_windows.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
   - include/grpcpp/alarm.h
   - include/grpcpp/channel.h
   - include/grpcpp/client_context.h

src/cpp/client/channel_cc.cc

@@ -16,36 +16,31 @@
  *
  */
 
-#include <atomic>
 #include <cstring>
 #include <memory>
-#include <string>
-#include <utility>
-#include <vector>
 
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/connectivity_state.h>
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/codegen/call_op_set.h>
-#include <grpcpp/impl/codegen/call_op_set_interface.h>
 #include <grpcpp/impl/codegen/completion_queue_tag.h>
-#include <grpcpp/impl/codegen/core_codegen_interface.h>
-#include <grpcpp/impl/codegen/sync.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/client_interceptor.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/config.h>
-#include <grpcpp/support/slice.h>
+#include <grpcpp/support/status.h>
 
+#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/iomgr/iomgr.h"
+#include "src/core/lib/surface/completion_queue.h"
 
 namespace grpc {
 

src/cpp/client/channel_test_peer.cc

@@ -16,6 +16,7 @@
  *
  */
 
+#include <grpc/support/sync.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/test/channel_test_peer.h>
 

src/cpp/client/client_callback.cc

@@ -16,10 +16,8 @@
  */
 
 #include <grpcpp/impl/codegen/client_callback.h>
-#include <grpcpp/support/client_callback.h>
 
 #include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/surface/call.h"

src/cpp/client/client_context.cc

@@ -16,32 +16,18 @@
  *
  */
 
-#include <stdlib.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/compression_types.h>
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
-#include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
+#include <grpc/support/string_util.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/impl/codegen/interceptor_common.h>
 #include <grpcpp/impl/codegen/sync.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/server_context.h>
-#include <grpcpp/support/client_interceptor.h>
-#include <grpcpp/support/config.h>
+#include <grpcpp/support/time.h>
 
 namespace grpc {
 

src/cpp/client/client_interceptor.cc

@@ -16,8 +16,7 @@
  *
  */
 
-#include <grpc/support/log.h>
-#include <grpcpp/support/client_interceptor.h>
+#include <grpcpp/impl/codegen/client_interceptor.h>
 
 namespace grpc {
 

src/cpp/client/create_channel.cc

@@ -17,19 +17,12 @@
  */
 
 #include <memory>
-#include <string>
-#include <utility>
-#include <vector>
 
-#include <grpc/grpc.h>
-#include <grpc/status.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/create_channel.h>
 #include <grpcpp/impl/grpc_library.h>
 #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/create_channel_internal.cc

@@ -25,6 +25,8 @@
 
 #include <grpcpp/channel.h>
 
+struct grpc_channel;
+
 namespace grpc {
 
 std::shared_ptr<Channel> CreateChannelInternal(

src/cpp/client/create_channel_internal.h

@@ -23,11 +23,12 @@
 #include <string>
 #include <vector>
 
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpcpp/channel.h>
-#include <grpcpp/support/client_interceptor.h>
+#include <grpcpp/impl/codegen/client_interceptor.h>
 #include <grpcpp/support/config.h>
 
+struct grpc_channel;
+
 namespace grpc {
 
 std::shared_ptr<Channel> CreateChannelInternal(

src/cpp/client/create_channel_posix.cc

@@ -16,20 +16,13 @@
  *
  */
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_posix.h>
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/impl/grpc_library.h>
+#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/insecure_credentials.cc

@@ -15,18 +15,12 @@
  * limitations under the License.
  *
  */
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/support/log.h>
 #include <grpcpp/channel.h>
 #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

@@ -18,37 +18,26 @@
 
 #include "src/cpp/client/secure_credentials.h"
 
-#include <string.h>
-
-#include <algorithm>
-#include <map>
-#include <utility>
-
 #include "absl/strings/str_join.h"
 
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/codegen/gpr_types.h>
+#include <grpc/impl/codegen/slice.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
 #include <grpcpp/channel.h>
+#include <grpcpp/impl/codegen/status.h>
 #include <grpcpp/impl/grpc_library.h>
-#include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/slice.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/status_code_enum.h>
+
 // TODO(yashykt): We shouldn't be including "src/core" headers.
 #include "src/core/lib/gpr/env.h"
-#include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/load_file.h"
 #include "src/core/lib/json/json.h"
+#include "src/core/lib/security/transport/auth_filters.h"
 #include "src/core/lib/security/util/json_util.h"
-#include "src/core/lib/slice/slice_refcount.h"
 #include "src/cpp/client/create_channel_internal.h"
 #include "src/cpp/common/secure_auth_context.h"
 

src/cpp/client/secure_credentials.h

@@ -19,26 +19,13 @@
 #ifndef GRPC_INTERNAL_CPP_CLIENT_SECURE_CREDENTIALS_H
 #define GRPC_INTERNAL_CPP_CLIENT_SECURE_CREDENTIALS_H
 
-#include <stddef.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "absl/strings/str_cat.h"
 
-#include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
-#include <grpc/status.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/client_interceptor.h>
+#include <grpcpp/security/tls_credentials_options.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"
 #include "src/cpp/server/thread_pool_interface.h"
 

src/cpp/client/xds_credentials.cc

@@ -16,13 +16,6 @@
 //
 //
 
-#include <memory>
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/log.h>
-#include <grpcpp/security/credentials.h>
-
 #include "src/cpp/client/secure_credentials.h"
 
 namespace grpc {

src/cpp/codegen/codegen_init.cc

@@ -17,7 +17,7 @@
  */
 
 #include <grpcpp/impl/codegen/core_codegen_interface.h>
-#include <grpcpp/impl/grpc_library.h>
+#include <grpcpp/impl/codegen/grpc_library.h>
 
 /// Null-initializes the global gRPC variables for the codegen library. These
 /// stay null in the absence of grpc++ library. In this case, no gRPC

src/cpp/common/alarm.cc

@@ -17,21 +17,15 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <functional>
-#include <utility>
+#include <memory>
 
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/log.h>
-#include <grpc/support/sync.h>
 #include <grpcpp/alarm.h>
 #include <grpcpp/completion_queue.h>
-#include <grpcpp/impl/codegen/completion_queue_tag.h>
 #include <grpcpp/impl/grpc_library.h>
+#include <grpcpp/support/time.h>
 
-#include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/timer.h"

src/cpp/common/alts_context.cc

@@ -16,19 +16,11 @@
  *
  */
 
-#include <stddef.h>
-
-#include <map>
-#include <string>
-
-#include "upb/upb.h"
-
-#include <grpc/grpc_security_constants.h>
+#include <grpc/grpc_security.h>
 #include <grpcpp/security/alts_context.h>
-#include <grpcpp/support/config.h>
 
+#include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
 #include "src/proto/grpc/gcp/altscontext.upb.h"
-#include "src/proto/grpc/gcp/transport_security_common.upb.h"
 
 namespace grpc {
 namespace experimental {

src/cpp/common/alts_util.cc

@@ -16,25 +16,16 @@
  *
  */
 
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "absl/memory/memory.h"
 #include "upb/upb.hpp"
 
-#include <grpc/grpc_security_constants.h>
+#include <grpc/grpc_security.h>
 #include <grpc/support/log.h>
 #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/status_code_enum.h>
-#include <grpcpp/support/string_ref.h>
 
+#include "src/core/lib/gprpp/memory.h"
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
+#include "src/cpp/common/secure_auth_context.h"
 #include "src/proto/grpc/gcp/altscontext.upb.h"
 
 namespace grpc {

src/cpp/common/auth_property_iterator.cc

@@ -16,11 +16,8 @@
  *
  */
 
-#include <utility>
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
-#include <grpcpp/support/string_ref.h>
 
 namespace grpc {
 

src/cpp/common/channel_arguments.cc

@@ -15,20 +15,15 @@
  * limitations under the License.
  *
  */
-#include <algorithm>
-#include <list>
-#include <memory>
-#include <string>
-#include <vector>
+#include <sstream>
 
-#include <grpc/impl/codegen/compression_types.h>
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/log.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/config.h>
 
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
 

src/cpp/common/channel_filter.cc

@@ -18,17 +18,13 @@
 
 #include "src/cpp/common/channel_filter.h"
 
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
+#include <string.h>
 
-#include <grpc/support/log.h>
+#include <grpcpp/impl/codegen/slice.h>
 
-#include "src/core/lib/channel/channel_args.h"
 #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/slice/slice.h"
-#include "src/core/lib/surface/channel_init.h"
 
 namespace grpc {
 

src/cpp/common/channel_filter.h

@@ -19,30 +19,16 @@
 #ifndef GRPCXX_CHANNEL_FILTER_H
 #define GRPCXX_CHANNEL_FILTER_H
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include <functional>
-#include <new>
-#include <string>
-#include <utility>
+#include <vector>
 
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/grpc_types.h>
-#include <grpc/support/atm.h>
-#include <grpcpp/support/config.h>
+#include <grpc/support/alloc.h>
+#include <grpcpp/impl/codegen/config.h>
 
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/channel/channel_stack_builder.h"
-#include "src/core/lib/channel/context.h"
-#include "src/core/lib/gprpp/orphanable.h"
-#include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/iomgr/polling_entity.h"
-#include "src/core/lib/surface/channel_stack_type.h"
-#include "src/core/lib/transport/byte_stream.h"
+#include "src/core/lib/surface/channel_init.h"
 #include "src/core/lib/transport/metadata_batch.h"
-#include "src/core/lib/transport/transport.h"
 
 /// An interface to define filters.
 ///

src/cpp/common/completion_queue_cc.cc

@@ -15,22 +15,17 @@
  *
  */
 
-#include <vector>
-
-#include "absl/base/thread_annotations.h"
+#include <memory>
 
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/log.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
 #include <grpcpp/completion_queue.h>
-#include <grpcpp/impl/codegen/completion_queue_tag.h>
 #include <grpcpp/impl/grpc_library.h>
+#include <grpcpp/support/time.h>
 
 #include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/thd.h"
 

src/cpp/common/core_codegen.cc

@@ -21,18 +21,19 @@
 #include <stdlib.h>
 
 #include <grpc/byte_buffer.h>
+#include <grpc/byte_buffer_reader.h>
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
-#include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
-#include <grpc/support/time.h>
 #include <grpcpp/impl/codegen/core_codegen.h>
-#include <grpcpp/support/status.h>
+#include <grpcpp/support/config.h>
+
+#include "src/core/lib/profiling/timers.h"
+
+struct grpc_byte_buffer;
 
 namespace grpc {
 

src/cpp/common/insecure_create_auth_context.cc

@@ -17,7 +17,7 @@
  */
 #include <memory>
 
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc.h>
 #include <grpcpp/security/auth_context.h>
 
 namespace grpc {

src/cpp/common/resource_quota_cc.cc

@@ -16,13 +16,8 @@
  *
  */
 
-#include <stddef.h>
-
-#include <string>
-
 #include <grpc/grpc.h>
 #include <grpcpp/resource_quota.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 

src/cpp/common/secure_auth_context.cc

@@ -18,8 +18,6 @@
 
 #include "src/cpp/common/secure_auth_context.h"
 
-#include <algorithm>
-
 #include <grpc/grpc_security.h>
 
 namespace grpc {

src/cpp/common/secure_auth_context.h

@@ -19,13 +19,7 @@
 #ifndef GRPC_INTERNAL_CPP_COMMON_SECURE_AUTH_CONTEXT_H
 #define GRPC_INTERNAL_CPP_COMMON_SECURE_AUTH_CONTEXT_H
 
-#include <string>
-#include <vector>
-
-#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"
 #include "src/core/lib/security/context/security_context.h"

src/cpp/common/secure_channel_arguments.cc

@@ -16,13 +16,10 @@
  *
  */
 
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/grpc_security.h>
 #include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/config.h>
+
+#include "src/core/lib/channel/channel_args.h"
 
 namespace grpc {
 

src/cpp/common/secure_create_auth_context.cc

@@ -17,12 +17,11 @@
  */
 #include <memory>
 
+#include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpcpp/security/auth_context.h>
 
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/security/context/security_context.h"
 #include "src/cpp/common/secure_auth_context.h"
 
 namespace grpc {

src/cpp/common/tls_certificate_provider.cc

@@ -14,13 +14,11 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <vector>
+#include "absl/container/inlined_vector.h"
 
 #include <grpc/grpc_security.h>
-#include <grpc/support/log.h>
+#include <grpc/support/alloc.h>
 #include <grpcpp/security/tls_certificate_provider.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 namespace experimental {

src/cpp/common/tls_certificate_verifier.cc

@@ -14,27 +14,13 @@
 // limitations under the License.
 //
 
-#include <stddef.h>
-
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
+#include "absl/container/inlined_vector.h"
+#include "absl/status/status.h"
 
 #include <grpc/grpc_security.h>
-#include <grpc/status.h>
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
-#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/status_code_enum.h>
-#include <grpcpp/support/string_ref.h>
 
 namespace grpc {
 namespace experimental {

src/cpp/common/tls_credentials_options.cc

@@ -16,17 +16,11 @@
  *
  */
 
-#include <memory>
-#include <string>
-#include <utility>
+#include "absl/container/inlined_vector.h"
 
 #include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/log.h>
-#include <grpcpp/security/tls_certificate_provider.h>
-#include <grpcpp/security/tls_certificate_verifier.h>
+#include <grpc/support/alloc.h>
 #include <grpcpp/security/tls_credentials_options.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 namespace experimental {

src/cpp/common/validate_service_config.cc

@@ -16,13 +16,9 @@
  *
  */
 
-#include <string>
-
 #include <grpc/grpc.h>
-#include <grpcpp/support/config.h>
 #include <grpcpp/support/validate_service_config.h>
 
-#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/service_config/service_config_impl.h"
 
 namespace grpc {

src/cpp/common/version_cc.cc

@@ -17,12 +17,9 @@
  */
 
 /* This file is autogenerated from:
-   templates/src/cpp/common/version_cc.cc.template */
-
-#include <string>
+   templates/src/core/surface/version.c.template */
 
 #include <grpcpp/grpcpp.h>
-#include <grpcpp/support/config.h>
 
 namespace grpc {
 std::string Version() { return "1.47.0-dev"; }

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

@@ -21,10 +21,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/channel/channel_stack_builder.h"
-#include "src/core/lib/iomgr/error.h"
-#include "src/cpp/common/channel_filter.h"
+#include "src/cpp/ext/filters/census/context.h"
 
 namespace grpc {
 

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

@@ -20,41 +20,18 @@
 
 #include "src/cpp/ext/filters/census/client_filter.h"
 
-#include <stddef.h>
-#include <stdint.h>
-
-#include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
-#include "absl/types/optional.h"
 #include "opencensus/stats/stats.h"
+#include "opencensus/tags/context_util.h"
 #include "opencensus/tags/tag_key.h"
 #include "opencensus/tags/tag_map.h"
-#include "opencensus/trace/span.h"
-#include "opencensus/trace/span_context.h"
-#include "opencensus/trace/status_code.h"
-
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/slice.h>
-#include <grpc/support/log.h>
-#include <grpcpp/support/config.h>
 
-#include "src/core/lib/channel/context.h"
-#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/resource_quota/arena.h"
-#include "src/core/lib/slice/slice.h"
-#include "src/core/lib/slice/slice_refcount.h"
-#include "src/core/lib/transport/byte_stream.h"
-#include "src/core/lib/transport/metadata_batch.h"
-#include "src/core/lib/transport/transport.h"
-#include "src/cpp/ext/filters/census/context.h"
+#include "src/core/lib/surface/call.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/cpp/ext/filters/census/measures.h"
 

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

@@ -21,9 +21,10 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/iomgr/error.h"
-#include "src/cpp/common/channel_filter.h"
+#include "absl/strings/string_view.h"
+#include "absl/time/time.h"
+
+#include "src/cpp/ext/filters/census/channel_filter.h"
 #include "src/cpp/ext/filters/census/open_census_call_tracer.h"
 
 namespace grpc {

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

@@ -20,15 +20,10 @@
 
 #include "src/cpp/ext/filters/census/context.h"
 
-#include <new>
-
 #include "opencensus/tags/context_util.h"
 #include "opencensus/trace/context_util.h"
 #include "opencensus/trace/propagation/grpc_trace_bin.h"
 
-#include "src/core/lib/transport/transport.h"
-#include "src/cpp/ext/filters/census/rpc_encoding.h"
-
 namespace grpc {
 
 using ::opencensus::tags::TagMap;

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

@@ -21,22 +21,25 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stddef.h>
-#include <stdint.h>
-
+#include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
+#include "opencensus/context/context.h"
 #include "opencensus/tags/tag_map.h"
-#include "opencensus/trace/attribute_value_ref.h"
+#include "opencensus/trace/context_util.h"
 #include "opencensus/trace/span.h"
 #include "opencensus/trace/span_context.h"
+#include "opencensus/trace/trace_params.h"
 
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
 #include <grpc/status.h>
 
-#include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/slice/slice.h"
+#include "src/core/lib/slice/slice_internal.h"
+#include "src/cpp/common/channel_filter.h"
+#include "src/cpp/ext/filters/census/rpc_encoding.h"
+
+// This is needed because grpc has hardcoded CensusContext with a
+// forward declaration of 'struct census_context;'
+struct census_context;
 
 namespace grpc {
 

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

@@ -20,20 +20,13 @@
 
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 
-#include <limits.h>
-
-#include "absl/base/attributes.h"
 #include "opencensus/tags/tag_key.h"
 #include "opencensus/trace/span.h"
 
-#include <grpcpp/opencensus.h>
 #include <grpcpp/server_context.h>
 
-#include "src/core/lib/surface/channel_stack_type.h"
-#include "src/cpp/common/channel_filter.h"
 #include "src/cpp/ext/filters/census/channel_filter.h"
 #include "src/cpp/ext/filters/census/client_filter.h"
-#include "src/cpp/ext/filters/census/context.h"
 #include "src/cpp/ext/filters/census/measures.h"
 #include "src/cpp/ext/filters/census/server_filter.h"
 

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

@@ -25,6 +25,8 @@
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"
 
+#include <grpcpp/opencensus.h>
+
 namespace grpc {
 
 // The tag keys set when recording RPC stats.

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

@@ -23,6 +23,8 @@
 
 #include "opencensus/stats/stats.h"
 
+#include "src/cpp/ext/filters/census/grpc_plugin.h"
+
 namespace grpc {
 
 ::opencensus::stats::MeasureInt64 RpcClientSentMessagesPerRpc();

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

@@ -21,26 +21,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stdint.h>
-
-#include "absl/base/thread_annotations.h"
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-#include "absl/time/time.h"
-
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/support/atm.h>
-
 #include "src/core/lib/channel/call_tracer.h"
-#include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/channel/context.h"
-#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/resource_quota/arena.h"
-#include "src/core/lib/slice/slice.h"
-#include "src/core/lib/transport/byte_stream.h"
-#include "src/core/lib/transport/metadata_batch.h"
-#include "src/core/lib/transport/transport.h"
 #include "src/cpp/ext/filters/census/context.h"
 
 namespace grpc {

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

@@ -21,11 +21,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stdint.h>
 #include <string.h>
 
 #include "absl/base/internal/endian.h"
 #include "absl/strings/string_view.h"
+#include "opencensus/trace/span_context.h"
+#include "opencensus/trace/span_id.h"
+#include "opencensus/trace/trace_id.h"
 
 namespace grpc {
 

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

@@ -20,24 +20,13 @@
 
 #include "src/cpp/ext/filters/census/server_filter.h"
 
-#include <memory>
-#include <utility>
-
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-#include "absl/types/optional.h"
 #include "opencensus/stats/stats.h"
-#include "opencensus/tags/tag_key.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
 
-#include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/surface/call.h"
-#include "src/core/lib/transport/transport.h"
-#include "src/cpp/ext/filters/census/channel_filter.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/cpp/ext/filters/census/measures.h"
 

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

@@ -21,26 +21,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stdint.h>
-#include <string.h>
-
-#include <string>
-
 #include "absl/strings/string_view.h"
+#include "absl/time/clock.h"
 #include "absl/time/time.h"
 
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
-#include <grpcpp/support/config.h>
-
-#include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/gprpp/orphanable.h"
-#include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/slice/slice.h"
-#include "src/core/lib/transport/byte_stream.h"
-#include "src/core/lib/transport/metadata_batch.h"
-#include "src/cpp/common/channel_filter.h"
+
+#include "src/cpp/ext/filters/census/channel_filter.h"
 #include "src/cpp/ext/filters/census/context.h"
 
 namespace grpc {

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

@@ -18,15 +18,11 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <algorithm>
-
 #include "absl/time/time.h"
 #include "opencensus/stats/internal/aggregation_window.h"
 #include "opencensus/stats/internal/set_aggregation_window.h"
 #include "opencensus/stats/stats.h"
 
-#include <grpcpp/opencensus.h>
-
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 
 namespace grpc {

src/cpp/ext/proto_server_reflection.cc

@@ -21,11 +21,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include <google/protobuf/descriptor.h>
-
 #include <grpcpp/grpcpp.h>
-#include <grpcpp/support/interceptor.h>
-#include <grpcpp/support/status_code_enum.h>
 
 using grpc::Status;
 using grpc::StatusCode;

src/cpp/ext/proto_server_reflection.h

@@ -19,18 +19,12 @@
 #ifndef GRPC_INTERNAL_CPP_EXT_PROTO_SERVER_REFLECTION_H
 #define GRPC_INTERNAL_CPP_EXT_PROTO_SERVER_REFLECTION_H
 
-#include <string>
 #include <unordered_set>
 #include <vector>
 
 #include <grpcpp/grpcpp.h>
-#include <grpcpp/impl/codegen/config_protobuf.h>
-#include <grpcpp/support/config.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/sync_stream.h>
 
 #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h"
-#include "src/proto/grpc/reflection/v1alpha/reflection.pb.h"
 
 namespace grpc {
 

src/cpp/ext/proto_server_reflection_plugin.cc

@@ -19,7 +19,7 @@
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/impl/server_initializer.h>
-#include <grpcpp/server_builder.h>
+#include <grpcpp/server.h>
 
 #include "src/cpp/ext/proto_server_reflection.h"
 

src/cpp/server/admin/admin_services.cc

@@ -18,7 +18,10 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "absl/memory/memory.h"
+
 #include <grpcpp/ext/admin_services.h>
+#include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/server_builder.h>
 
 // TODO(lidiz) build a real registration system that can pull in services

src/cpp/server/async_generic_service.cc

@@ -16,7 +16,6 @@
  *
  */
 
-#include <grpcpp/completion_queue.h>
 #include <grpcpp/generic/async_generic_service.h>
 #include <grpcpp/server.h>
 

src/cpp/server/authorization_policy_provider.cc

@@ -12,16 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-#include <string>
-
 #include <grpc/grpc_security.h>
-#include <grpc/status.h>
 #include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
 #include <grpcpp/security/authorization_policy_provider.h>
-#include <grpcpp/support/config.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/status_code_enum.h>
 
 namespace grpc {
 namespace experimental {

src/cpp/server/channel_argument_option.cc

@@ -16,15 +16,7 @@
  *
  */
 
-#include <memory>
-#include <string>
-#include <vector>
-
 #include <grpcpp/impl/channel_argument_option.h>
-#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.cc

@@ -20,11 +20,8 @@
 
 #include "src/cpp/server/channelz/channelz_service.h"
 
-#include <google/protobuf/util/json_util.h>
-
+#include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
-#include <grpcpp/impl/codegen/config_protobuf.h>
-#include <grpcpp/support/status_code_enum.h>
 
 namespace grpc {
 

src/cpp/server/channelz/channelz_service.h

@@ -22,10 +22,8 @@
 #include <grpc/support/port_platform.h>
 
 #include <grpcpp/grpcpp.h>
-#include <grpcpp/support/status.h>
 
 #include "src/proto/grpc/channelz/channelz.grpc.pb.h"
-#include "src/proto/grpc/channelz/channelz.pb.h"
 
 namespace grpc {
 

src/cpp/server/channelz/channelz_service_plugin.cc

@@ -18,14 +18,10 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <memory>
-#include <string>
-
 #include <grpcpp/ext/channelz_service_plugin.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/impl/server_initializer.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/support/config.h>
+#include <grpcpp/server.h>
 
 #include "src/cpp/server/channelz/channelz_service.h"
 

src/cpp/server/create_default_thread_pool.cc

@@ -19,7 +19,6 @@
 #include <grpc/support/cpu.h>
 
 #include "src/cpp/server/dynamic_thread_pool.h"
-#include "src/cpp/server/thread_pool_interface.h"
 
 #ifndef GRPC_CUSTOM_DEFAULT_THREAD_POOL
 

src/cpp/server/csds/csds.cc

@@ -21,15 +21,14 @@
 #include "src/cpp/server/csds/csds.h"
 
 #include <string>
-#include <utility>
 
-#include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
-#include <grpc/slice.h>
-#include <grpcpp/support/config.h>
-#include <grpcpp/support/slice.h>
-#include <grpcpp/support/status_code_enum.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpcpp/impl/codegen/slice.h>
+
+#include "src/proto/grpc/testing/xds/v3/csds.grpc.pb.h"
 
 namespace grpc {
 namespace xds {

src/cpp/server/csds/csds.h

@@ -21,12 +21,11 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
+
 #include <grpcpp/grpcpp.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/sync_stream.h>
 
 #include "src/proto/grpc/testing/xds/v3/csds.grpc.pb.h"
-#include "src/proto/grpc/testing/xds/v3/csds.pb.h"
 
 namespace grpc {
 namespace xds {

src/cpp/server/dynamic_thread_pool.cc

@@ -18,6 +18,9 @@
 
 #include "src/cpp/server/dynamic_thread_pool.h"
 
+#include <grpc/support/log.h>
+#include <grpcpp/impl/codegen/sync.h>
+
 #include "src/core/lib/gprpp/thd.h"
 
 namespace grpc {

src/cpp/server/dynamic_thread_pool.h

@@ -19,10 +19,12 @@
 #ifndef GRPC_INTERNAL_CPP_DYNAMIC_THREAD_POOL_H
 #define GRPC_INTERNAL_CPP_DYNAMIC_THREAD_POOL_H
 
-#include <functional>
 #include <list>
+#include <memory>
 #include <queue>
 
+#include <grpcpp/support/config.h>
+
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/cpp/server/thread_pool_interface.h"

src/cpp/server/external_connection_acceptor_impl.cc

@@ -19,11 +19,8 @@
 #include "src/cpp/server/external_connection_acceptor_impl.h"
 
 #include <memory>
-#include <utility>
 
-#include <grpc/support/log.h>
 #include <grpcpp/server_builder.h>
-#include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/channel_arguments.h>
 
 namespace grpc {

src/cpp/server/external_connection_acceptor_impl.h

@@ -20,12 +20,11 @@
 #define SRC_CPP_SERVER_EXTERNAL_CONNECTION_ACCEPTOR_IMPL_H_
 
 #include <memory>
-#include <string>
 
+#include <grpc/impl/codegen/grpc_types.h>
 #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.cc

@@ -18,22 +18,15 @@
 
 #include "src/cpp/server/health/default_health_check_service.h"
 
-#include <stdint.h>
-
 #include <memory>
-#include <utility>
 
 #include "absl/memory/memory.h"
-#include "upb/upb.h"
 #include "upb/upb.hpp"
 
 #include <grpc/slice.h>
+#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpcpp/impl/codegen/server_callback_handlers.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/slice.h>
-#include <grpcpp/support/status_code_enum.h>
+#include <grpcpp/impl/codegen/method_handler.h>
 
 #include "src/proto/grpc/health/v1/health.upb.h"
 

src/cpp/server/health/default_health_check_service.h

@@ -19,22 +19,15 @@
 #ifndef GRPC_INTERNAL_CPP_SERVER_DEFAULT_HEALTH_CHECK_SERVICE_H
 #define GRPC_INTERNAL_CPP_SERVER_DEFAULT_HEALTH_CHECK_SERVICE_H
 
-#include <stddef.h>
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include "absl/base/thread_annotations.h"
+#include <set>
 
+#include <grpc/support/log.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/impl/codegen/server_callback_handlers.h>
+#include <grpcpp/impl/codegen/service_type.h>
 #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>
 
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

src/cpp/server/health/health_check_service_server_builder_option.cc

@@ -16,14 +16,7 @@
  *
  */
 
-#include <memory>
-#include <utility>
-#include <vector>
-
 #include <grpcpp/ext/health_check_service_server_builder_option.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/impl/server_builder_plugin.h>
-#include <grpcpp/support/channel_arguments.h>
 
 namespace grpc {
 

src/cpp/server/insecure_server_credentials.cc

@@ -16,16 +16,10 @@
  *
  */
 
-#include <memory>
-#include <string>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #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/constants.h

@@ -22,7 +22,6 @@
 #include <grpc/impl/codegen/port_platform.h>
 
 #include <stddef.h>
-#include <stdint.h>
 
 namespace grpc {
 namespace load_reporter {

src/cpp/server/load_reporter/get_cpu_stats.h

@@ -21,8 +21,6 @@
 
 #include <grpc/impl/codegen/port_platform.h>
 
-#include <stdint.h>
-
 #include <utility>
 
 namespace grpc {

src/cpp/server/load_reporter/get_cpu_stats_linux.cc

@@ -18,8 +18,6 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <utility>
-
 #ifdef GPR_LINUX
 
 #include <inttypes.h>

src/cpp/server/load_reporter/load_data_store.cc

@@ -20,18 +20,14 @@
 
 #include "src/cpp/server/load_reporter/load_data_store.h"
 
-#include <stdint.h>
 #include <stdio.h>
 
 #include <cstdlib>
-#include <iterator>
 #include <set>
 #include <unordered_map>
-
-#include <grpc/support/log.h>
+#include <vector>
 
 #include "src/core/lib/iomgr/socket_utils.h"
-#include "src/cpp/server/load_reporter/constants.h"
 
 namespace grpc {
 namespace load_reporter {

src/cpp/server/load_reporter/load_data_store.h

@@ -21,17 +21,14 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stddef.h>
-#include <stdint.h>
-
-#include <cstdint>
 #include <memory>
 #include <set>
-#include <string>
 #include <unordered_map>
-#include <utility>
 
-#include <grpcpp/support/config.h>
+#include <grpc/support/log.h>
+#include <grpcpp/impl/codegen/config.h>
+
+#include "src/cpp/server/load_reporter/constants.h"
 
 namespace grpc {
 namespace load_reporter {

src/cpp/server/load_reporter/load_reporter.cc

@@ -25,18 +25,12 @@
 #include <stdio.h>
 
 #include <chrono>
-#include <cstring>
+#include <ctime>
 #include <iterator>
-#include <set>
-#include <tuple>
-
-#include <google/protobuf/duration.pb.h>
 
 #include "opencensus/stats/internal/set_aggregation_window.h"
 #include "opencensus/tags/tag_key.h"
 
-#include <grpc/support/log.h>
-
 #include "src/cpp/server/load_reporter/constants.h"
 #include "src/cpp/server/load_reporter/get_cpu_stats.h"
 

src/cpp/server/load_reporter/load_reporter.h

@@ -21,29 +21,20 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include <atomic>
 #include <chrono>
-#include <cstdint>
 #include <deque>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <utility>
 #include <vector>
 
-#include <google/protobuf/repeated_ptr_field.h>
-
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"
 
-#include <grpcpp/support/config.h>
+#include <grpc/support/log.h>
+#include <grpcpp/impl/codegen/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"
+#include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h"
 
 namespace grpc {
 namespace load_reporter {

src/cpp/server/load_reporter/load_reporter_async_service_impl.cc

@@ -22,17 +22,8 @@
 
 #include <inttypes.h>
 
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/repeated_ptr_field.h>
-
 #include "absl/memory/memory.h"
 
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/support/time.h>
-#include <grpcpp/support/status.h>
-
-#include "src/cpp/server/load_reporter/constants.h"
-
 namespace grpc {
 namespace load_reporter {
 

src/cpp/server/load_reporter/load_reporter_async_service_impl.h

@@ -21,25 +21,13 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <stdint.h>
-
-#include <atomic>
-#include <functional>
-#include <memory>
-#include <string>
-#include <utility>
-
 #include <grpc/support/log.h>
 #include <grpcpp/alarm.h>
 #include <grpcpp/grpcpp.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/config.h>
 
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/cpp/server/load_reporter/load_reporter.h"
-#include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h"
-#include "src/proto/grpc/lb/v1/load_reporter.pb.h"
 
 namespace grpc {
 namespace load_reporter {

src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc

@@ -18,14 +18,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <algorithm>
-#include <memory>
-#include <vector>
-
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpcpp/ext/server_load_reporting.h>
-#include <grpcpp/impl/server_builder_plugin.h>
-#include <grpcpp/support/channel_arguments.h>
 
 #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h"
 

src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc

@@ -20,10 +20,7 @@
 
 #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h"
 
-#include <utility>
-
 #include <grpcpp/impl/server_initializer.h>
-#include <grpcpp/server_builder.h>
 
 namespace grpc {
 namespace load_reporter {

src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h

@@ -21,14 +21,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include <memory>
-#include <string>
-
-#include <grpcpp/grpcpp.h>
 #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

@@ -18,16 +18,10 @@
 
 #include <grpc/impl/codegen/port_platform.h>
 
-#include <string.h>
-
 #include <cmath>
-#include <string>
 
-#include <grpc/load_reporting.h>
 #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/orca_service.cc

@@ -14,41 +14,16 @@
 // limitations under the License.
 //
 
-#include <stddef.h>
-
-#include <map>
-#include <string>
-#include <utility>
-
-#include "absl/base/thread_annotations.h"
-#include "absl/time/time.h"
-#include "absl/types/optional.h"
 #include "google/protobuf/duration.upb.h"
-#include "upb/upb.h"
 #include "upb/upb.hpp"
 #include "xds/data/orca/v3/orca_load_report.upb.h"
 #include "xds/service/orca/v3/orca.upb.h"
 
-#include <grpc/support/log.h>
 #include <grpcpp/ext/orca_service.h>
 #include <grpcpp/impl/codegen/server_callback_handlers.h>
-#include <grpcpp/impl/codegen/sync.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/byte_buffer.h>
-#include <grpcpp/support/config.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/support/slice.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/status_code_enum.h>
 
 #include "src/core/lib/gprpp/ref_counted.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/time.h"
-#include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/timer.h"
 
 namespace grpc {

src/cpp/server/secure_server_credentials.cc

@@ -18,20 +18,13 @@
 
 #include "src/cpp/server/secure_server_credentials.h"
 
-#include <algorithm>
+#include <functional>
 #include <map>
 #include <memory>
-#include <utility>
-#include <vector>
 
-#include <grpc/grpc_security_constants.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
+#include <grpcpp/impl/codegen/slice.h>
+#include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/security/auth_metadata_processor.h>
-#include <grpcpp/security/tls_credentials_options.h>
-#include <grpcpp/support/slice.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/string_ref.h>
 
 #include "src/cpp/common/secure_auth_context.h"
 

src/cpp/server/secure_server_credentials.h

@@ -19,17 +19,11 @@
 #ifndef GRPC_INTERNAL_CPP_SERVER_SECURE_SERVER_CREDENTIALS_H
 #define GRPC_INTERNAL_CPP_SERVER_SECURE_SERVER_CREDENTIALS_H
 
-#include <stddef.h>
-
 #include <memory>
-#include <string>
 
-#include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/impl/codegen/grpc_types.h>
-#include <grpcpp/security/auth_metadata_processor.h>
 #include <grpcpp/security/server_credentials.h>
-#include <grpcpp/support/config.h>
+#include <grpcpp/security/tls_credentials_options.h>
 
 #include "src/cpp/server/thread_pool_interface.h"
 

src/cpp/server/server_builder.cc

@@ -16,42 +16,20 @@
  *
  */
 
-// IWYU pragma: no_include <ext/alloc_traits.h>
-
-#include <limits.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <algorithm>
-#include <memory>
-#include <string>
 #include <utility>
-#include <vector>
 
-#include <grpc/grpc.h>
-#include <grpc/impl/codegen/compression_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/support/cpu.h>
 #include <grpc/support/log.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/workaround_list.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/impl/codegen/server_interface.h>
-#include <grpcpp/impl/server_builder_option.h>
-#include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/impl/service_type.h>
 #include <grpcpp/resource_quota.h>
-#include <grpcpp/security/authorization_policy_provider.h>
-#include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/config.h>
-#include <grpcpp/support/server_interceptor.h>
 
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/cpp/server/external_connection_acceptor_impl.h"
+#include "src/cpp/server/thread_pool_interface.h"
 
 namespace grpc {
 

src/cpp/server/server_callback.cc

@@ -16,10 +16,8 @@
  */
 
 #include <grpcpp/impl/codegen/server_callback.h>
-#include <grpcpp/support/server_callback.h>
 
 #include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/executor.h"
 

src/cpp/server/server_cc.cc

@@ -15,68 +15,40 @@
  *
  */
 
-#include <limits.h>
-#include <string.h>
-
-#include <algorithm>
-#include <atomic>
 #include <cstdlib>
-#include <memory>
-#include <new>
 #include <sstream>
-#include <string>
 #include <type_traits>
 #include <utility>
-#include <vector>
 
 #include "absl/memory/memory.h"
 
-#include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/gpr_types.h>
 #include <grpc/impl/codegen/grpc_types.h>
-#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/impl/call.h>
-#include <grpcpp/impl/codegen/call_op_set.h>
-#include <grpcpp/impl/codegen/call_op_set_interface.h>
+#include <grpcpp/impl/codegen/async_unary_call.h>
+#include <grpcpp/impl/codegen/byte_buffer.h>
+#include <grpcpp/impl/codegen/call.h>
 #include <grpcpp/impl/codegen/completion_queue_tag.h>
-#include <grpcpp/impl/codegen/interceptor_common.h>
-#include <grpcpp/impl/codegen/metadata_map.h>
-#include <grpcpp/impl/codegen/server_callback_handlers.h>
-#include <grpcpp/impl/codegen/server_interface.h>
-#include <grpcpp/impl/codegen/sync.h>
+#include <grpcpp/impl/codegen/method_handler.h>
+#include <grpcpp/impl/codegen/server_interceptor.h>
 #include <grpcpp/impl/grpc_library.h>
-#include <grpcpp/impl/rpc_method.h>
 #include <grpcpp/impl/rpc_service_method.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/impl/service_type.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_context.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/client_interceptor.h>
-#include <grpcpp/support/config.h>
-#include <grpcpp/support/interceptor.h>
-#include <grpcpp/support/method_handler.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/time.h>
 
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/gprpp/manual_constructor.h"
-#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/profiling/timers.h"
-#include "src/core/lib/resource_quota/api.h"
+#include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/lib/surface/server.h"
 #include "src/cpp/client/create_channel_internal.h"

src/cpp/server/server_context.cc

@@ -16,44 +16,25 @@
  *
  */
 
-#include <assert.h>
-
+#include <algorithm>
 #include <atomic>
-#include <cstdlib>
-#include <functional>
-#include <map>
-#include <new>
-#include <string>
 #include <utility>
-#include <vector>
 
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
-#include <grpc/impl/codegen/compression_types.h>
-#include <grpc/impl/codegen/gpr_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/load_reporting.h>
-#include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/time.h>
-#include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/call.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/completion_queue_tag.h>
-#include <grpcpp/impl/codegen/interceptor_common.h>
-#include <grpcpp/impl/codegen/metadata_map.h>
+#include <grpcpp/impl/codegen/completion_queue.h>
+#include <grpcpp/impl/codegen/server_context.h>
 #include <grpcpp/impl/grpc_library.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/config.h>
-#include <grpcpp/support/interceptor.h>
 #include <grpcpp/support/server_callback.h>
-#include <grpcpp/support/server_interceptor.h>
+#include <grpcpp/support/time.h>
 
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/surface/call.h"
 
 namespace grpc {
 

src/cpp/server/server_posix.cc

@@ -16,10 +16,8 @@
  *
  */
 
-#include <grpc/grpc.h>
 #include <grpc/grpc_posix.h>
 #include <grpc/grpc_security.h>
-#include <grpcpp/server.h>
 #include <grpcpp/server_posix.h>
 
 namespace grpc {

src/cpp/server/xds_server_credentials.cc

@@ -16,13 +16,6 @@
 //
 //
 
-#include <memory>
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/log.h>
-#include <grpcpp/security/server_credentials.h>
-
 #include "src/cpp/server/secure_server_credentials.h"
 
 namespace grpc {

src/cpp/thread_manager/thread_manager.cc

@@ -18,15 +18,12 @@
 
 #include "src/cpp/thread_manager/thread_manager.h"
 
-#include <stdlib.h>
-
 #include <climits>
 
 #include <grpc/support/log.h>
 
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/thd.h"
-#include "src/core/lib/resource_quota/resource_quota.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
 
 namespace grpc {
 

src/cpp/thread_manager/thread_manager.h

@@ -20,11 +20,14 @@
 #define GRPC_INTERNAL_CPP_THREAD_MANAGER_H
 
 #include <list>
+#include <memory>
+
+#include <grpc/grpc.h>
+#include <grpcpp/support/config.h>
 
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/resource_quota/api.h"
-#include "src/core/lib/resource_quota/thread_quota.h"
 
 namespace grpc {
 

src/cpp/util/byte_buffer_cc.cc

@@ -16,18 +16,10 @@
  *
  */
 
-#include <vector>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
-#include <grpc/impl/codegen/compression_types.h>
-#include <grpc/impl/codegen/grpc_types.h>
-#include <grpc/slice.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/byte_buffer.h>
-#include <grpcpp/support/slice.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/status_code_enum.h>
 
 namespace grpc {
 

src/cpp/util/core_stats.cc

@@ -18,17 +18,8 @@
 
 #include "src/cpp/util/core_stats.h"
 
-#include <string.h>
-
-#include <string>
-
-#include <google/protobuf/repeated_ptr_field.h>
-
-#include <grpc/support/atm.h>
 #include <grpc/support/log.h>
 
-#include "src/core/lib/debug/stats_data.h"
-
 using grpc::core::Bucket;
 using grpc::core::Histogram;
 using grpc::core::Metric;

src/cpp/util/status.cc

@@ -17,7 +17,6 @@
  */
 
 #include <grpcpp/support/status.h>
-#include <grpcpp/support/status_code_enum.h>
 
 namespace grpc {
 

src/cpp/util/string_ref.cc

@@ -16,8 +16,6 @@
  *
  */
 
-#include <stddef.h>
-
 #include <grpcpp/support/string_ref.h>
 
 namespace grpc {