[iwyu] grpc++ (#29610)

* [iwyu] grpc++ * fix * fix * Automated change: Fix sanity tests * fix * fix * fix * [iwyu] Better script * eliminate race * fixes * Automated change: Fix sanity tests Co-authored-by: ctiller <ctiller@users.noreply.github.com>
3 years ago · c8159eabdf
parent b7034041de
commit c8159eabdf
106 changed files with 900 additions and 164 deletions
--- a/83
+++ b/83
@ -473,6 +473,17 @@ 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,
@ -481,6 +492,7 @@ grpc_cc_library(
        "protobuf_headers",
    ],
    visibility = ["@grpc:public"],
+    deps = ["grpc_public_hdrs"],
 )

 grpc_cc_library(
@ -549,11 +561,13 @@ 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",
@ -562,6 +576,7 @@ grpc_cc_library(
        "json",
        "ref_counted_ptr",
        "slice",
+        "slice_refcount",
    ],
 )

@ -658,6 +673,8 @@ grpc_cc_library(
    ],
    language = "c++",
    deps = [
+        "gpr",
+        "grpc",
        "grpc++_internals",
    ],
 )
@ -676,6 +693,8 @@ grpc_cc_library(
    ],
    visibility = ["@grpc:xds"],
    deps = [
+        "gpr",
+        "grpc",
        "grpc++_internals",
    ],
 )
@ -697,6 +716,7 @@ grpc_cc_library(
        "grpc++_codegen_base",
        "grpc++_codegen_base_src",
        "grpc++_codegen_proto",
+        "grpc_codegen",
        "grpc_insecure_credentials",
        "grpc_unsecure",
    ],
@ -730,6 +750,7 @@ grpc_cc_library(
        "include/grpcpp/security/alts_util.h",
    ],
    external_deps = [
+        "absl/memory",
        "upb_lib",
    ],
    language = "c++",
@ -3886,6 +3907,9 @@ 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",
@ -3900,10 +3924,15 @@ grpc_cc_library(
    hdrs = [
        "src/cpp/server/load_reporter/load_reporter_async_service_impl.h",
    ],
-    external_deps = ["absl/memory"],
+    external_deps = [
+        "absl/memory",
+        "protobuf_headers",
+    ],
    language = "c++",
    deps = [
        "gpr",
+        "gpr_codegen",
+        "grpc++",
        "lb_load_reporter",
    ],
 )
@ -3938,6 +3967,7 @@ grpc_cc_library(
    external_deps = [
        "opencensus-stats",
        "opencensus-tags",
+        "protobuf_headers",
    ],
    language = "c++",
    deps = [
@ -5414,6 +5444,8 @@ grpc_cc_library(
    srcs = GRPCXX_SRCS,
    hdrs = GRPCXX_HDRS,
    external_deps = [
+        "absl/base:core_headers",
+        "absl/strings",
        "absl/synchronization",
        "absl/memory",
        "upb_lib",
@ -5423,8 +5455,10 @@ 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",
@ -5438,6 +5472,10 @@ grpc_cc_library(
        "grpc_transport_inproc",
        "iomgr_timer",
        "ref_counted",
+        "ref_counted_ptr",
+        "resource_quota",
+        "slice",
+        "time",
        "useful",
    ],
 )
@ -5447,6 +5485,8 @@ grpc_cc_library(
    srcs = GRPCXX_SRCS,
    hdrs = GRPCXX_HDRS,
    external_deps = [
+        "absl/base:core_headers",
+        "absl/strings",
        "absl/synchronization",
        "absl/memory",
        "upb_lib",
@ -5457,8 +5497,10 @@ 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",
@ -5473,6 +5515,10 @@ grpc_cc_library(
        "grpc_unsecure",
        "iomgr_timer",
        "ref_counted",
+        "ref_counted_ptr",
+        "resource_quota",
+        "slice",
+        "time",
        "useful",
    ],
 )
@ -5572,6 +5618,7 @@ grpc_cc_library(
    language = "c++",
    deps = [
        "grpc++_codegen_base",
+        "grpc++_public_hdrs",
    ],
 )

@ -5616,6 +5663,9 @@ 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",
@ -5635,6 +5685,9 @@ 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++",
@ -5643,12 +5696,15 @@ 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",
@ -5665,6 +5721,9 @@ 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",
@ -5674,6 +5733,7 @@ grpc_cc_library(
        "gpr",
        "grpc",
        "grpc++",
+        "grpc++_config_proto",
        "//src/proto/grpc/channelz:channelz_proto",
    ],
    alwayslink = 1,
@ -5687,7 +5747,10 @@ grpc_cc_library(
    hdrs = [
        "src/cpp/server/csds/csds.h",
    ],
-    external_deps = ["absl/status:statusor"],
+    external_deps = [
+        "absl/status",
+        "absl/status:statusor",
+    ],
    language = "c++",
    deps = [
        "gpr",
@ -5762,10 +5825,14 @@ 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",
    ],
 )
@ -5796,10 +5863,14 @@ 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",
@ -5808,10 +5879,18 @@ 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",
    ],
 )

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3195,6 +3195,37 @@ 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
@ -3852,6 +3883,37 @@ 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
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -155,6 +155,11 @@ 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",
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -2564,6 +2564,37 @@ 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
@ -2951,6 +2982,37 @@ 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
--- a/src/cpp/client/channel_cc.cc
+++ b/src/cpp/client/channel_cc.cc
@ -16,31 +16,36 @@
 *
 */

+#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/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>
-#include <grpcpp/support/status.h>
+#include <grpcpp/support/slice.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 {

--- a/src/cpp/client/channel_test_peer.cc
+++ b/src/cpp/client/channel_test_peer.cc
@ -16,7 +16,6 @@
 *
 */

-#include <grpc/support/sync.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/test/channel_test_peer.h>

--- a/src/cpp/client/client_callback.cc
+++ b/src/cpp/client/client_callback.cc
@ -16,8 +16,10 @@
 */

 #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"
--- a/src/cpp/client/client_context.cc
+++ b/src/cpp/client/client_context.cc
@ -16,18 +16,32 @@
 *
 */

+#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/string_util.h>
+#include <grpc/support/time.h>
+#include <grpcpp/channel.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/time.h>
+#include <grpcpp/support/client_interceptor.h>
+#include <grpcpp/support/config.h>

 namespace grpc {

--- a/src/cpp/client/client_interceptor.cc
+++ b/src/cpp/client/client_interceptor.cc
@ -16,7 +16,8 @@
 *
 */

-#include <grpcpp/impl/codegen/client_interceptor.h>
+#include <grpc/support/log.h>
+#include <grpcpp/support/client_interceptor.h>

 namespace grpc {

--- a/src/cpp/client/create_channel.cc
+++ b/src/cpp/client/create_channel.cc
@ -17,12 +17,19 @@
 */

 #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"

--- a/src/cpp/client/create_channel_internal.cc
+++ b/src/cpp/client/create_channel_internal.cc
@ -25,8 +25,6 @@

 #include <grpcpp/channel.h>

-struct grpc_channel;
-
 namespace grpc {

 std::shared_ptr<Channel> CreateChannelInternal(
--- a/src/cpp/client/create_channel_internal.h
+++ b/src/cpp/client/create_channel_internal.h
@ -23,12 +23,11 @@
 #include <string>
 #include <vector>

+#include <grpc/impl/codegen/grpc_types.h>
 #include <grpcpp/channel.h>
-#include <grpcpp/impl/codegen/client_interceptor.h>
+#include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>

-struct grpc_channel;
-
 namespace grpc {

 std::shared_ptr<Channel> CreateChannelInternal(
--- a/src/cpp/client/create_channel_posix.cc
+++ b/src/cpp/client/create_channel_posix.cc
@ -16,13 +16,20 @@
 *
 */

+#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"

--- a/src/cpp/client/insecure_credentials.cc
+++ b/src/cpp/client/insecure_credentials.cc
@ -15,12 +15,18 @@
 * limitations under the License.
 *
 */
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/support/log.h>
+#include <grpc/impl/codegen/grpc_types.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"
--- a/src/cpp/client/secure_credentials.cc
+++ b/src/cpp/client/secure_credentials.cc
@ -18,26 +18,37 @@

 #include "src/cpp/client/secure_credentials.h"

+#include <string.h>
+
+#include <algorithm>
+#include <map>
+#include <utility>
+
 #include "absl/strings/str_join.h"

-#include <grpc/impl/codegen/slice.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/codegen/gpr_types.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"

--- a/src/cpp/client/secure_credentials.h
+++ b/src/cpp/client/secure_credentials.h
@ -19,13 +19,26 @@
 #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/security/tls_credentials_options.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"
 #include "src/cpp/server/thread_pool_interface.h"

--- a/src/cpp/client/xds_credentials.cc
+++ b/src/cpp/client/xds_credentials.cc
@ -16,6 +16,13 @@
 //
 //

+#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 {
--- a/src/cpp/codegen/codegen_init.cc
+++ b/src/cpp/codegen/codegen_init.cc
@ -17,7 +17,7 @@
 */

 #include <grpcpp/impl/codegen/core_codegen_interface.h>
-#include <grpcpp/impl/codegen/grpc_library.h>
+#include <grpcpp/impl/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
--- a/src/cpp/common/alarm.cc
+++ b/src/cpp/common/alarm.cc
@ -17,15 +17,21 @@

 #include <grpc/support/port_platform.h>

-#include <memory>
+#include <functional>
+#include <utility>

+#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/debug/trace.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/executor.h"
 #include "src/core/lib/iomgr/timer.h"
--- a/src/cpp/common/alts_context.cc
+++ b/src/cpp/common/alts_context.cc
@ -16,11 +16,19 @@
 *
 */

-#include <grpc/grpc_security.h>
+#include <stddef.h>
+
+#include <map>
+#include <string>
+
+#include "upb/upb.h"
+
+#include <grpc/grpc_security_constants.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 {
--- a/src/cpp/common/alts_util.cc
+++ b/src/cpp/common/alts_util.cc
@ -16,16 +16,25 @@
 *
 */

+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "absl/memory/memory.h"
 #include "upb/upb.hpp"

-#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.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 {
--- a/src/cpp/common/auth_property_iterator.cc
+++ b/src/cpp/common/auth_property_iterator.cc
@ -16,8 +16,11 @@
 *
 */

+#include <utility>
+
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
+#include <grpcpp/support/string_ref.h>

 namespace grpc {

--- a/src/cpp/common/channel_arguments.cc
+++ b/src/cpp/common/channel_arguments.cc
@ -15,15 +15,20 @@
 * limitations under the License.
 *
 */
-#include <sstream>
+#include <algorithm>
+#include <list>
+#include <memory>
+#include <string>
+#include <vector>

+#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"

--- a/src/cpp/common/channel_filter.cc
+++ b/src/cpp/common/channel_filter.cc
@ -18,13 +18,17 @@

 #include "src/cpp/common/channel_filter.h"

-#include <string.h>
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"

-#include <grpcpp/impl/codegen/slice.h>
+#include <grpc/support/log.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 {

--- a/src/cpp/common/channel_filter.h
+++ b/src/cpp/common/channel_filter.h
@ -19,16 +19,30 @@
 #ifndef GRPCXX_CHANNEL_FILTER_H
 #define GRPCXX_CHANNEL_FILTER_H

+#include <stddef.h>
+#include <stdint.h>
+
 #include <functional>
-#include <vector>
+#include <new>
+#include <string>
+#include <utility>

 #include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpcpp/impl/codegen/config.h>
+#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/support/atm.h>
+#include <grpcpp/support/config.h>

 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/surface/channel_init.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/transport/metadata_batch.h"
+#include "src/core/lib/transport/transport.h"

 /// An interface to define filters.
 ///
--- a/src/cpp/common/completion_queue_cc.cc
+++ b/src/cpp/common/completion_queue_cc.cc
@ -15,17 +15,22 @@
 *
 */

-#include <memory>
+#include <vector>
+
+#include "absl/base/thread_annotations.h"

 #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"

--- a/src/cpp/common/core_codegen.cc
+++ b/src/cpp/common/core_codegen.cc
@ -21,19 +21,18 @@
 #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/config.h>
-
-#include "src/core/lib/profiling/timers.h"
-
-struct grpc_byte_buffer;
+#include <grpcpp/support/status.h>

 namespace grpc {

--- a/src/cpp/common/insecure_create_auth_context.cc
+++ b/src/cpp/common/insecure_create_auth_context.cc
@ -17,7 +17,7 @@
 */
 #include <memory>

-#include <grpc/grpc.h>
+#include <grpc/impl/codegen/grpc_types.h>
 #include <grpcpp/security/auth_context.h>

 namespace grpc {
--- a/src/cpp/common/resource_quota_cc.cc
+++ b/src/cpp/common/resource_quota_cc.cc
@ -16,8 +16,13 @@
 *
 */

+#include <stddef.h>
+
+#include <string>
+
 #include <grpc/grpc.h>
 #include <grpcpp/resource_quota.h>
+#include <grpcpp/support/config.h>

 namespace grpc {

--- a/src/cpp/common/secure_auth_context.cc
+++ b/src/cpp/common/secure_auth_context.cc
@ -18,6 +18,8 @@

 #include "src/cpp/common/secure_auth_context.h"

+#include <algorithm>
+
 #include <grpc/grpc_security.h>

 namespace grpc {
--- a/src/cpp/common/secure_auth_context.h
+++ b/src/cpp/common/secure_auth_context.h
@ -19,7 +19,13 @@
 #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"
--- a/src/cpp/common/secure_channel_arguments.cc
+++ b/src/cpp/common/secure_channel_arguments.cc
@ -16,10 +16,13 @@
 *
 */

-#include <grpc/grpc_security.h>
-#include <grpcpp/support/channel_arguments.h>
+#include <memory>
+#include <string>
+#include <vector>

-#include "src/core/lib/channel/channel_args.h"
+#include <grpc/impl/codegen/grpc_types.h>
+#include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/config.h>

 namespace grpc {

--- a/src/cpp/common/secure_create_auth_context.cc
+++ b/src/cpp/common/secure_create_auth_context.cc
@ -17,11 +17,12 @@
 */
 #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 {
--- a/src/cpp/common/tls_certificate_provider.cc
+++ b/src/cpp/common/tls_certificate_provider.cc
@ -14,11 +14,13 @@
 // limitations under the License.
 //

-#include "absl/container/inlined_vector.h"
+#include <string>
+#include <vector>

 #include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
 #include <grpcpp/security/tls_certificate_provider.h>
+#include <grpcpp/support/config.h>

 namespace grpc {
 namespace experimental {
--- a/src/cpp/common/tls_certificate_verifier.cc
+++ b/src/cpp/common/tls_certificate_verifier.cc
@ -14,13 +14,27 @@
 // limitations under the License.
 //

-#include "absl/container/inlined_vector.h"
-#include "absl/status/status.h"
+#include <stddef.h>
+
+#include <algorithm>
+#include <functional>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>

 #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 {
--- a/src/cpp/common/tls_credentials_options.cc
+++ b/src/cpp/common/tls_credentials_options.cc
@ -16,11 +16,17 @@
 *
 */

-#include "absl/container/inlined_vector.h"
+#include <memory>
+#include <string>
+#include <utility>

 #include <grpc/grpc_security.h>
-#include <grpc/support/alloc.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 <grpcpp/security/tls_credentials_options.h>
+#include <grpcpp/support/config.h>

 namespace grpc {
 namespace experimental {
--- a/src/cpp/common/validate_service_config.cc
+++ b/src/cpp/common/validate_service_config.cc
@ -16,9 +16,13 @@
 *
 */

+#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 {
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@ -17,9 +17,12 @@
 */

 /* This file is autogenerated from:
-   templates/src/core/surface/version.c.template */
+   templates/src/cpp/common/version_cc.cc.template */
+
+#include <string>

 #include <grpcpp/grpcpp.h>
+#include <grpcpp/support/config.h>

 namespace grpc {
 std::string Version() { return "1.47.0-dev"; }
--- a/src/cpp/ext/filters/census/channel_filter.h
+++ b/src/cpp/ext/filters/census/channel_filter.h
@ -21,7 +21,10 @@

 #include <grpc/support/port_platform.h>

-#include "src/cpp/ext/filters/census/context.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"

 namespace grpc {

--- a/src/cpp/ext/filters/census/client_filter.cc
+++ b/src/cpp/ext/filters/census/client_filter.cc
@ -20,18 +20,41 @@

 #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/surface/call.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/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/cpp/ext/filters/census/measures.h"

--- a/src/cpp/ext/filters/census/client_filter.h
+++ b/src/cpp/ext/filters/census/client_filter.h
@ -21,10 +21,9 @@

 #include <grpc/support/port_platform.h>

-#include "absl/strings/string_view.h"
-#include "absl/time/time.h"
-
-#include "src/cpp/ext/filters/census/channel_filter.h"
+#include "src/core/lib/channel/channel_stack.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/cpp/common/channel_filter.h"
 #include "src/cpp/ext/filters/census/open_census_call_tracer.h"

 namespace grpc {
--- a/src/cpp/ext/filters/census/context.cc
+++ b/src/cpp/ext/filters/census/context.cc
@ -20,10 +20,15 @@

 #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;
--- a/src/cpp/ext/filters/census/context.h
+++ b/src/cpp/ext/filters/census/context.h
@ -21,25 +21,22 @@

 #include <grpc/support/port_platform.h>

-#include "absl/memory/memory.h"
+#include <stddef.h>
+#include <stdint.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/context_util.h"
+#include "opencensus/trace/attribute_value_ref.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/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;
+#include "src/core/lib/channel/channel_stack.h"
+#include "src/core/lib/slice/slice.h"

 namespace grpc {

--- a/src/cpp/ext/filters/census/grpc_plugin.cc
+++ b/src/cpp/ext/filters/census/grpc_plugin.cc
@ -20,13 +20,20 @@

 #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"

--- a/src/cpp/ext/filters/census/grpc_plugin.h
+++ b/src/cpp/ext/filters/census/grpc_plugin.h
@ -25,8 +25,6 @@
 #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.
--- a/src/cpp/ext/filters/census/measures.h
+++ b/src/cpp/ext/filters/census/measures.h
@ -23,8 +23,6 @@

 #include "opencensus/stats/stats.h"

-#include "src/cpp/ext/filters/census/grpc_plugin.h"
-
 namespace grpc {

 ::opencensus::stats::MeasureInt64 RpcClientSentMessagesPerRpc();
--- a/src/cpp/ext/filters/census/open_census_call_tracer.h
+++ b/src/cpp/ext/filters/census/open_census_call_tracer.h
@ -21,7 +21,26 @@

 #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 {
--- a/src/cpp/ext/filters/census/rpc_encoding.h
+++ b/src/cpp/ext/filters/census/rpc_encoding.h
@ -21,13 +21,11 @@

 #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 {

--- a/src/cpp/ext/filters/census/server_filter.cc
+++ b/src/cpp/ext/filters/census/server_filter.cc
@ -20,13 +20,24 @@

 #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"

--- a/src/cpp/ext/filters/census/server_filter.h
+++ b/src/cpp/ext/filters/census/server_filter.h
@ -21,13 +21,26 @@

 #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 "src/cpp/ext/filters/census/channel_filter.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/context.h"

 namespace grpc {
--- a/src/cpp/ext/filters/census/views.cc
+++ b/src/cpp/ext/filters/census/views.cc
@ -18,11 +18,15 @@

 #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 {
--- a/src/cpp/ext/proto_server_reflection.cc
+++ b/src/cpp/ext/proto_server_reflection.cc
@ -21,7 +21,11 @@
 #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;
--- a/src/cpp/ext/proto_server_reflection.h
+++ b/src/cpp/ext/proto_server_reflection.h
@ -19,12 +19,18 @@
 #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 {

--- a/src/cpp/ext/proto_server_reflection_plugin.cc
+++ b/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.h>
+#include <grpcpp/server_builder.h>

 #include "src/cpp/ext/proto_server_reflection.h"

--- a/src/cpp/server/admin/admin_services.cc
+++ b/src/cpp/server/admin/admin_services.cc
@ -18,10 +18,7 @@

 #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
--- a/src/cpp/server/async_generic_service.cc
+++ b/src/cpp/server/async_generic_service.cc
@ -16,6 +16,7 @@
 *
 */

+#include <grpcpp/completion_queue.h>
 #include <grpcpp/generic/async_generic_service.h>
 #include <grpcpp/server.h>

--- a/src/cpp/server/authorization_policy_provider.cc
+++ b/src/cpp/server/authorization_policy_provider.cc
@ -12,10 +12,16 @@
 // 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 {
--- a/src/cpp/server/channel_argument_option.cc
+++ b/src/cpp/server/channel_argument_option.cc
@ -16,7 +16,15 @@
 *
 */

+#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 {

--- a/src/cpp/server/channelz/channelz_service.cc
+++ b/src/cpp/server/channelz/channelz_service.cc
@ -20,8 +20,11 @@

 #include "src/cpp/server/channelz/channelz_service.h"

-#include <grpc/grpc.h>
+#include <google/protobuf/util/json_util.h>
+
 #include <grpc/support/alloc.h>
+#include <grpcpp/impl/codegen/config_protobuf.h>
+#include <grpcpp/support/status_code_enum.h>

 namespace grpc {

--- a/src/cpp/server/channelz/channelz_service.h
+++ b/src/cpp/server/channelz/channelz_service.h
@ -22,8 +22,10 @@
 #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 {

--- a/src/cpp/server/channelz/channelz_service_plugin.cc
+++ b/src/cpp/server/channelz/channelz_service_plugin.cc
@ -18,10 +18,14 @@

 #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.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/support/config.h>

 #include "src/cpp/server/channelz/channelz_service.h"

--- a/src/cpp/server/create_default_thread_pool.cc
+++ b/src/cpp/server/create_default_thread_pool.cc
@ -19,6 +19,7 @@
 #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

--- a/src/cpp/server/csds/csds.cc
+++ b/src/cpp/server/csds/csds.cc
@ -21,14 +21,15 @@
 #include "src/cpp/server/csds/csds.h"

 #include <string>
+#include <utility>

+#include "absl/status/status.h"
 #include "absl/status/statusor.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"
+#include <grpc/slice.h>
+#include <grpcpp/support/config.h>
+#include <grpcpp/support/slice.h>
+#include <grpcpp/support/status_code_enum.h>

 namespace grpc {
 namespace xds {
--- a/src/cpp/server/csds/csds.h
+++ b/src/cpp/server/csds/csds.h
@ -21,11 +21,12 @@

 #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 {
--- a/src/cpp/server/dynamic_thread_pool.cc
+++ b/src/cpp/server/dynamic_thread_pool.cc
@ -18,9 +18,6 @@

 #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 {
--- a/src/cpp/server/dynamic_thread_pool.h
+++ b/src/cpp/server/dynamic_thread_pool.h
@ -19,12 +19,10 @@
 #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"
--- a/src/cpp/server/external_connection_acceptor_impl.cc
+++ b/src/cpp/server/external_connection_acceptor_impl.cc
@ -19,8 +19,11 @@
 #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 {
--- a/src/cpp/server/external_connection_acceptor_impl.h
+++ b/src/cpp/server/external_connection_acceptor_impl.h
@ -20,11 +20,12 @@
 #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"
--- a/src/cpp/server/health/default_health_check_service.cc
+++ b/src/cpp/server/health/default_health_check_service.cc
@ -18,15 +18,22 @@

 #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/method_handler.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 "src/proto/grpc/health/v1/health.upb.h"

--- a/src/cpp/server/health/default_health_check_service.h
+++ b/src/cpp/server/health/default_health_check_service.h
@ -19,15 +19,22 @@
 #ifndef GRPC_INTERNAL_CPP_SERVER_DEFAULT_HEALTH_CHECK_SERVICE_H
 #define GRPC_INTERNAL_CPP_SERVER_DEFAULT_HEALTH_CHECK_SERVICE_H

-#include <set>
+#include <stddef.h>
+
+#include <map>
+#include <memory>
+#include <string>
+
+#include "absl/base/thread_annotations.h"

-#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"
--- a/src/cpp/server/health/health_check_service_server_builder_option.cc
+++ b/src/cpp/server/health/health_check_service_server_builder_option.cc
@ -16,7 +16,14 @@
 *
 */

+#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 {

--- a/src/cpp/server/insecure_server_credentials.cc
+++ b/src/cpp/server/insecure_server_credentials.cc
@ -16,10 +16,16 @@
 *
 */

+#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 {
--- a/src/cpp/server/load_reporter/constants.h
+++ b/src/cpp/server/load_reporter/constants.h
@ -22,6 +22,7 @@
 #include <grpc/impl/codegen/port_platform.h>

 #include <stddef.h>
+#include <stdint.h>

 namespace grpc {
 namespace load_reporter {
--- a/src/cpp/server/load_reporter/get_cpu_stats.h
+++ b/src/cpp/server/load_reporter/get_cpu_stats.h
@ -21,6 +21,8 @@

 #include <grpc/impl/codegen/port_platform.h>

+#include <stdint.h>
+
 #include <utility>

 namespace grpc {
--- a/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
+++ b/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
@ -18,6 +18,8 @@

 #include <grpc/support/port_platform.h>

+#include <utility>
+
 #ifdef GPR_LINUX

 #include <inttypes.h>
--- a/src/cpp/server/load_reporter/load_data_store.cc
+++ b/src/cpp/server/load_reporter/load_data_store.cc
@ -20,14 +20,18 @@

 #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 <vector>
+
+#include <grpc/support/log.h>

 #include "src/core/lib/iomgr/socket_utils.h"
+#include "src/cpp/server/load_reporter/constants.h"

 namespace grpc {
 namespace load_reporter {
--- a/src/cpp/server/load_reporter/load_data_store.h
+++ b/src/cpp/server/load_reporter/load_data_store.h
@ -21,14 +21,17 @@

 #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 <grpc/support/log.h>
-#include <grpcpp/impl/codegen/config.h>
-
-#include "src/cpp/server/load_reporter/constants.h"
+#include <grpcpp/support/config.h>

 namespace grpc {
 namespace load_reporter {
--- a/src/cpp/server/load_reporter/load_reporter.cc
+++ b/src/cpp/server/load_reporter/load_reporter.cc
@ -25,12 +25,18 @@
 #include <stdio.h>

 #include <chrono>
-#include <ctime>
+#include <cstring>
 #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"

--- a/src/cpp/server/load_reporter/load_reporter.h
+++ b/src/cpp/server/load_reporter/load_reporter.h
@ -21,20 +21,29 @@

 #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 <grpc/support/log.h>
-#include <grpcpp/impl/codegen/config.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.grpc.pb.h"
+#include "src/proto/grpc/lb/v1/load_reporter.pb.h"

 namespace grpc {
 namespace load_reporter {
--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
@ -22,8 +22,17 @@

 #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 {

--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
@ -21,13 +21,25 @@

 #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 {
--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc
@ -18,7 +18,14 @@

 #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"

--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc
@ -20,7 +20,10 @@

 #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 {
--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h
@ -21,7 +21,14 @@

 #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"

--- a/src/cpp/server/load_reporter/util.cc
+++ b/src/cpp/server/load_reporter/util.cc
@ -18,10 +18,16 @@

 #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 {
--- a/src/cpp/server/orca/orca_service.cc
+++ b/src/cpp/server/orca/orca_service.cc
@ -14,16 +14,41 @@
 // 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 {
--- a/src/cpp/server/secure_server_credentials.cc
+++ b/src/cpp/server/secure_server_credentials.cc
@ -18,13 +18,20 @@

 #include "src/cpp/server/secure_server_credentials.h"

-#include <functional>
+#include <algorithm>
 #include <map>
 #include <memory>
+#include <utility>
+#include <vector>

-#include <grpcpp/impl/codegen/slice.h>
-#include <grpcpp/impl/grpc_library.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/slice.h>
+#include <grpc/status.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"

--- a/src/cpp/server/secure_server_credentials.h
+++ b/src/cpp/server/secure_server_credentials.h
@ -19,11 +19,17 @@
 #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/security/tls_credentials_options.h>
+#include <grpcpp/support/config.h>

 #include "src/cpp/server/thread_pool_interface.h"

--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@ -16,20 +16,42 @@
 *
 */

+// 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/support/cpu.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/codegen/compression_types.h>
+#include <grpc/impl/codegen/grpc_types.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 {

--- a/src/cpp/server/server_callback.cc
+++ b/src/cpp/server/server_callback.cc
@ -16,8 +16,10 @@
 */

 #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"

--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@ -15,40 +15,68 @@
 *
 */

+#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/support/alloc.h>
+#include <grpc/slice.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/impl/codegen/async_unary_call.h>
-#include <grpcpp/impl/codegen/byte_buffer.h>
-#include <grpcpp/impl/codegen/call.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/completion_queue_tag.h>
-#include <grpcpp/impl/codegen/method_handler.h>
-#include <grpcpp/impl/codegen/server_interceptor.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/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/time.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 "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/surface/call.h"
+#include "src/core/lib/resource_quota/api.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/lib/surface/server.h"
 #include "src/cpp/client/create_channel_internal.h"
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@ -16,25 +16,44 @@
 *
 */

-#include <algorithm>
+#include <assert.h>
+
 #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/completion_queue.h>
-#include <grpcpp/impl/codegen/server_context.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/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/time.h>
+#include <grpcpp/support/server_interceptor.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 {

--- a/src/cpp/server/server_posix.cc
+++ b/src/cpp/server/server_posix.cc
@ -16,8 +16,10 @@
 *
 */

+#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 {
--- a/src/cpp/server/xds_server_credentials.cc
+++ b/src/cpp/server/xds_server_credentials.cc
@ -16,6 +16,13 @@
 //
 //

+#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 {
--- a/src/cpp/thread_manager/thread_manager.cc
+++ b/src/cpp/thread_manager/thread_manager.cc
@ -18,12 +18,15 @@

 #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/iomgr/exec_ctx.h"
+#include "src/core/lib/resource_quota/resource_quota.h"

 namespace grpc {

--- a/src/cpp/thread_manager/thread_manager.h
+++ b/src/cpp/thread_manager/thread_manager.h
@ -20,14 +20,11 @@
 #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 {

--- a/src/cpp/util/byte_buffer_cc.cc
+++ b/src/cpp/util/byte_buffer_cc.cc
@ -16,10 +16,18 @@
 *
 */

+#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 {

--- a/src/cpp/util/core_stats.cc
+++ b/src/cpp/util/core_stats.cc
@ -18,8 +18,17 @@

 #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;
--- a/src/cpp/util/status.cc
+++ b/src/cpp/util/status.cc
@ -17,6 +17,7 @@
 */

 #include <grpcpp/support/status.h>
+#include <grpcpp/support/status_code_enum.h>

 namespace grpc {

--- a/src/cpp/util/string_ref.cc
+++ b/src/cpp/util/string_ref.cc
@ -16,6 +16,8 @@
 *
 */

+#include <stddef.h>
+
 #include <grpcpp/support/string_ref.h>

 namespace grpc {
--- a/Show More
+++ b/Show More