diff --git a/.clang-format b/.clang-format
index 5f150ef6edb..6c6c4548e80 100644
--- a/.clang-format
+++ b/.clang-format
@@ -8,36 +8,6 @@ IncludeCategories:
   # ruby.h is even more first if it's included
   - Regex: '^<ruby/ruby.h>'
     Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
 ---
 Language: ObjC
 BasedOnStyle: Google
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc
index fe7d910f1b4..3cb8637eb69 100644
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc
+++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc
@@ -13,14 +13,13 @@
 // limitations under the License.
 
 #include <android/log.h>
+#include <grpcpp/create_channel_binder.h>
+#include <grpcpp/security/binder_security_policy.h>
 #include <jni.h>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "examples/protos/helloworld.pb.h"
 
-#include <grpcpp/create_channel_binder.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 extern "C" JNIEXPORT jstring JNICALL
 Java_io_grpc_binder_cpp_exampleclient_ButtonPressHandler_native_1entry(
     JNIEnv* env, jobject /*this*/, jobject application) {
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
index 8b2e546ab2c..0f220c1066c 100644
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
+++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
@@ -13,15 +13,14 @@
 // limitations under the License.
 
 #include <android/log.h>
-#include <jni.h>
-
-#include "examples/protos/helloworld.grpc.pb.h"
-#include "examples/protos/helloworld.pb.h"
-
 #include <grpcpp/create_channel_binder.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/security/binder_credentials.h>
 #include <grpcpp/security/binder_security_policy.h>
+#include <jni.h>
+
+#include "examples/protos/helloworld.grpc.pb.h"
+#include "examples/protos/helloworld.pb.h"
 
 namespace {
 class GreeterService : public helloworld::Greeter::Service {
diff --git a/examples/cpp/auth/ssl_client.cc b/examples/cpp/auth/ssl_client.cc
index 95e94eb1dbe..9a0efcadaac 100644
--- a/examples/cpp/auth/ssl_client.cc
+++ b/examples/cpp/auth/ssl_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -26,8 +28,6 @@
 #include "absl/flags/parse.h"
 #include "helper.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/auth/ssl_server.cc b/examples/cpp/auth/ssl_server.cc
index dc76ecdc093..e9bf94cf890 100644
--- a/examples/cpp/auth/ssl_server.cc
+++ b/examples/cpp/auth/ssl_server.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -21,8 +23,6 @@
 #include "absl/strings/str_format.h"
 #include "helper.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/cancellation/client.cc b/examples/cpp/cancellation/client.cc
index 97c9f1fac48..d78c9da25ac 100644
--- a/examples/cpp/cancellation/client.cc
+++ b/examples/cpp/cancellation/client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -23,8 +25,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/cancellation/server.cc b/examples/cpp/cancellation/server.cc
index 7c537976508..f2a468d6ad2 100644
--- a/examples/cpp/cancellation/server.cc
+++ b/examples/cpp/cancellation/server.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -21,8 +23,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/compression/greeter_client.cc b/examples/cpp/compression/greeter_client.cc
index b1ef4546d8a..95aa5a9c152 100644
--- a/examples/cpp/compression/greeter_client.cc
+++ b/examples/cpp/compression/greeter_client.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/compression/greeter_server.cc b/examples/cpp/compression/greeter_server.cc
index dc1b1f6530f..f27447b13d9 100644
--- a/examples/cpp/compression/greeter_server.cc
+++ b/examples/cpp/compression/greeter_server.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/csm/csm_greeter_client.cc b/examples/cpp/csm/csm_greeter_client.cc
index a689fdfa0d2..90d550a9928 100644
--- a/examples/cpp/csm/csm_greeter_client.cc
+++ b/examples/cpp/csm/csm_greeter_client.cc
@@ -16,6 +16,9 @@
  *
  */
 
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/string_ref.h>
 #include <sys/types.h>
 
 #include <chrono>
@@ -34,10 +37,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/string_ref.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/csm/csm_greeter_server.cc b/examples/cpp/csm/csm_greeter_server.cc
index 7f66a5cc9a9..0c6a47446b5 100644
--- a/examples/cpp/csm/csm_greeter_server.cc
+++ b/examples/cpp/csm/csm_greeter_server.cc
@@ -16,6 +16,13 @@
  *
  */
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -27,14 +34,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/core/util/gethostname.h"
 
 #ifdef BAZEL_BUILD
diff --git a/examples/cpp/csm/observability/csm_greeter_client.cc b/examples/cpp/csm/observability/csm_greeter_client.cc
index 7040bc13f90..6d08d901e5a 100644
--- a/examples/cpp/csm/observability/csm_greeter_client.cc
+++ b/examples/cpp/csm/observability/csm_greeter_client.cc
@@ -16,6 +16,9 @@
  *
  */
 
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/string_ref.h>
 #include <sys/types.h>
 
 #include <chrono>
@@ -32,10 +35,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/string_ref.h>
-
 ABSL_FLAG(std::string, target, "xds:///helloworld:50051", "Target string");
 ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464",
           "Prometheus exporter endpoint");
diff --git a/examples/cpp/csm/observability/csm_greeter_server.cc b/examples/cpp/csm/observability/csm_greeter_server.cc
index a3d7eccd978..cfae25d4c3d 100644
--- a/examples/cpp/csm/observability/csm_greeter_server.cc
+++ b/examples/cpp/csm/observability/csm_greeter_server.cc
@@ -16,6 +16,13 @@
  *
  */
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -31,13 +38,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/xds_server_builder.h>
-
 ABSL_FLAG(int32_t, port, 50051, "Server port for service.");
 ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464",
           "Prometheus exporter endpoint");
diff --git a/examples/cpp/deadline/client.cc b/examples/cpp/deadline/client.cc
index 398be745733..7971ab77f45 100644
--- a/examples/cpp/deadline/client.cc
+++ b/examples/cpp/deadline/client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -23,8 +25,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/deadline/server.cc b/examples/cpp/deadline/server.cc
index eae5c0e1d08..14f2bfafe8b 100644
--- a/examples/cpp/deadline/server.cc
+++ b/examples/cpp/deadline/server.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <chrono>
 #include <condition_variable>
 #include <iostream>
@@ -25,8 +27,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/debugging/crashing_greeter_client.cc b/examples/cpp/debugging/crashing_greeter_client.cc
index 732535539f1..490ebcec98e 100644
--- a/examples/cpp/debugging/crashing_greeter_client.cc
+++ b/examples/cpp/debugging/crashing_greeter_client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -19,8 +21,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/debugging/greeter_callback_server_admin.cc b/examples/cpp/debugging/greeter_callback_server_admin.cc
index 397503f4e6d..c2c776fa707 100644
--- a/examples/cpp/debugging/greeter_callback_server_admin.cc
+++ b/examples/cpp/debugging/greeter_callback_server_admin.cc
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -20,11 +25,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/error_details/greeter_client.cc b/examples/cpp/error_details/greeter_client.cc
index a86756d01ec..08e960c6fb5 100644
--- a/examples/cpp/error_details/greeter_client.cc
+++ b/examples/cpp/error_details/greeter_client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -22,12 +24,9 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "google/rpc/error_details.pb.h"
-
 #include "src/proto/grpc/status/status.pb.h"
 #else
 #include "error_details.pb.h"
diff --git a/examples/cpp/error_details/greeter_server.cc b/examples/cpp/error_details/greeter_server.cc
index 41f844ab5c1..30a2c2bdebe 100644
--- a/examples/cpp/error_details/greeter_server.cc
+++ b/examples/cpp/error_details/greeter_server.cc
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -22,14 +26,9 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "google/rpc/error_details.pb.h"
-
 #include "src/proto/grpc/status/status.pb.h"
 #else
 #include "error_details.pb.h"
diff --git a/examples/cpp/error_handling/greeter_client.cc b/examples/cpp/error_handling/greeter_client.cc
index 551d8f66607..10824339bf3 100644
--- a/examples/cpp/error_handling/greeter_client.cc
+++ b/examples/cpp/error_handling/greeter_client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -22,8 +24,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/error_handling/greeter_server.cc b/examples/cpp/error_handling/greeter_server.cc
index 79a527a516b..701530b1fa4 100644
--- a/examples/cpp/error_handling/greeter_server.cc
+++ b/examples/cpp/error_handling/greeter_server.cc
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -22,10 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/flow_control/client_flow_control_client.cc b/examples/cpp/flow_control/client_flow_control_client.cc
index 933489d7d04..053a0c120f4 100644
--- a/examples/cpp/flow_control/client_flow_control_client.cc
+++ b/examples/cpp/flow_control/client_flow_control_client.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <cstddef>
 #include <ostream>
 #include <string>
@@ -23,10 +27,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpc/grpc.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/flow_control/client_flow_control_server.cc b/examples/cpp/flow_control/client_flow_control_server.cc
index 31de9275d7c..c19e40693fb 100644
--- a/examples/cpp/flow_control/client_flow_control_server.cc
+++ b/examples/cpp/flow_control/client_flow_control_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <cstddef>
 #include <cstdint>
 #include <iostream>
@@ -25,10 +29,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/flow_control/server_flow_control_client.cc b/examples/cpp/flow_control/server_flow_control_client.cc
index 2c9b5938a48..82df2dc463b 100644
--- a/examples/cpp/flow_control/server_flow_control_client.cc
+++ b/examples/cpp/flow_control/server_flow_control_client.cc
@@ -16,16 +16,16 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <string>
 
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpc/grpc.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/flow_control/server_flow_control_server.cc b/examples/cpp/flow_control/server_flow_control_server.cc
index 75b71eb1e1a..f04a84e1969 100644
--- a/examples/cpp/flow_control/server_flow_control_server.cc
+++ b/examples/cpp/flow_control/server_flow_control_server.cc
@@ -15,6 +15,11 @@
  * limitations under the License.
  *
  */
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/support/status.h>
+
 #include <cstddef>
 #include <iostream>
 #include <memory>
@@ -24,11 +29,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/support/status.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/gcp_observability/helloworld/greeter_client.cc b/examples/cpp/gcp_observability/helloworld/greeter_client.cc
index 7b4d79fab1f..1412cf07cf3 100644
--- a/examples/cpp/gcp_observability/helloworld/greeter_client.cc
+++ b/examples/cpp/gcp_observability/helloworld/greeter_client.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpcpp/ext/gcp_observability.h>
+#include <grpcpp/grpcpp.h>
+
 #include <chrono>
 #include <iostream>
 #include <memory>
@@ -25,9 +28,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/ext/gcp_observability.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/gcp_observability/helloworld/greeter_server.cc b/examples/cpp/gcp_observability/helloworld/greeter_server.cc
index 5312d68708a..02570a1bfbd 100644
--- a/examples/cpp/gcp_observability/helloworld/greeter_server.cc
+++ b/examples/cpp/gcp_observability/helloworld/greeter_server.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpcpp/ext/gcp_observability.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <chrono>
 #include <csignal>
 #include <iostream>
@@ -27,11 +32,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/gcp_observability.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/generic_api/greeter_client.cc b/examples/cpp/generic_api/greeter_client.cc
index 8435ad6c2e3..7afd5377e45 100644
--- a/examples/cpp/generic_api/greeter_client.cc
+++ b/examples/cpp/generic_api/greeter_client.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/generic/generic_stub.h>
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -22,9 +25,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/generic/generic_stub.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/generic_api/greeter_server.cc b/examples/cpp/generic_api/greeter_server.cc
index e2a9b3f8976..d4e9a837829 100644
--- a/examples/cpp/generic_api/greeter_server.cc
+++ b/examples/cpp/generic_api/greeter_server.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -22,9 +25,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/health/health_client.cc b/examples/cpp/health/health_client.cc
index 488dbdf4d31..15e04b84216 100644
--- a/examples/cpp/health/health_client.cc
+++ b/examples/cpp/health/health_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,11 +27,8 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
-
 #include "src/proto/grpc/health/v1/health.grpc.pb.h"
 #else
 #include "health.grpc.pb.h"
diff --git a/examples/cpp/health/health_server.cc b/examples/cpp/health/health_server.cc
index ac78435ea1e..aae879c027b 100644
--- a/examples/cpp/health/health_server.cc
+++ b/examples/cpp/health/health_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,10 +28,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_async_client.cc b/examples/cpp/helloworld/greeter_async_client.cc
index 25417269085..e798c92bc0a 100644
--- a/examples/cpp/helloworld/greeter_async_client.cc
+++ b/examples/cpp/helloworld/greeter_async_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,8 +26,6 @@
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_async_client2.cc b/examples/cpp/helloworld/greeter_async_client2.cc
index 83662761837..fd43fa2bb64 100644
--- a/examples/cpp/helloworld/greeter_async_client2.cc
+++ b/examples/cpp/helloworld/greeter_async_client2.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -25,8 +27,6 @@
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_async_server.cc b/examples/cpp/helloworld/greeter_async_server.cc
index 9adefedf7d9..72267b3e822 100644
--- a/examples/cpp/helloworld/greeter_async_server.cc
+++ b/examples/cpp/helloworld/greeter_async_server.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -26,8 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_callback_client.cc b/examples/cpp/helloworld/greeter_callback_client.cc
index ae09066c0f6..547120918c2 100644
--- a/examples/cpp/helloworld/greeter_callback_client.cc
+++ b/examples/cpp/helloworld/greeter_callback_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,8 +27,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_callback_server.cc b/examples/cpp/helloworld/greeter_callback_server.cc
index 0a1b4ea9318..d8363c8d493 100644
--- a/examples/cpp/helloworld/greeter_callback_server.cc
+++ b/examples/cpp/helloworld/greeter_callback_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,10 +28,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_client.cc b/examples/cpp/helloworld/greeter_client.cc
index b97f0bd1da3..a022fa628a4 100644
--- a/examples/cpp/helloworld/greeter_client.cc
+++ b/examples/cpp/helloworld/greeter_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -23,8 +25,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_server.cc b/examples/cpp/helloworld/greeter_server.cc
index e35c4ac9eb9..1bdc84acdb3 100644
--- a/examples/cpp/helloworld/greeter_server.cc
+++ b/examples/cpp/helloworld/greeter_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,10 +28,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/xds_greeter_client.cc b/examples/cpp/helloworld/xds_greeter_client.cc
index 093204ec3e0..455ba5c2de8 100644
--- a/examples/cpp/helloworld/xds_greeter_client.cc
+++ b/examples/cpp/helloworld/xds_greeter_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -23,8 +25,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/xds_greeter_server.cc b/examples/cpp/helloworld/xds_greeter_server.cc
index c0bed68ff7a..f7266b81581 100644
--- a/examples/cpp/helloworld/xds_greeter_server.cc
+++ b/examples/cpp/helloworld/xds_greeter_server.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -25,12 +31,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/xds_server_builder.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/interceptors/caching_interceptor.h b/examples/cpp/interceptors/caching_interceptor.h
index b461524f6f4..cd979752e8f 100644
--- a/examples/cpp/interceptors/caching_interceptor.h
+++ b/examples/cpp/interceptors/caching_interceptor.h
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/support/client_interceptor.h>
+
 #include <map>
 
 #include "absl/log/check.h"
 
-#include <grpcpp/support/client_interceptor.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/keyvaluestore.grpc.pb.h"
 #else
diff --git a/examples/cpp/interceptors/client.cc b/examples/cpp/interceptors/client.cc
index 9c63c86c172..cc815db9698 100644
--- a/examples/cpp/interceptors/client.cc
+++ b/examples/cpp/interceptors/client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,8 +27,6 @@
 
 #include "caching_interceptor.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/keyvaluestore.grpc.pb.h"
 #else
diff --git a/examples/cpp/interceptors/server.cc b/examples/cpp/interceptors/server.cc
index e865bbe02fe..f1d3941c10f 100644
--- a/examples/cpp/interceptors/server.cc
+++ b/examples/cpp/interceptors/server.cc
@@ -16,14 +16,14 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/server_interceptor.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/server_interceptor.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/keyvaluestore.grpc.pb.h"
 #else
diff --git a/examples/cpp/keepalive/greeter_callback_client.cc b/examples/cpp/keepalive/greeter_callback_client.cc
index 3df307b44b0..0e123155815 100644
--- a/examples/cpp/keepalive/greeter_callback_client.cc
+++ b/examples/cpp/keepalive/greeter_callback_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -26,8 +28,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/keepalive/greeter_callback_server.cc b/examples/cpp/keepalive/greeter_callback_server.cc
index 17c3c402d75..9a34a5a65ae 100644
--- a/examples/cpp/keepalive/greeter_callback_server.cc
+++ b/examples/cpp/keepalive/greeter_callback_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,10 +28,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/load_balancing/greeter_client.cc b/examples/cpp/load_balancing/greeter_client.cc
index 25322dbfc95..f09598f350e 100644
--- a/examples/cpp/load_balancing/greeter_client.cc
+++ b/examples/cpp/load_balancing/greeter_client.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/load_balancing/greeter_server.cc b/examples/cpp/load_balancing/greeter_server.cc
index d021b54c4d1..93b8c91e0a0 100644
--- a/examples/cpp/load_balancing/greeter_server.cc
+++ b/examples/cpp/load_balancing/greeter_server.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/metadata/greeter_client.cc b/examples/cpp/metadata/greeter_client.cc
index 3784d2fa26a..f7592501f19 100644
--- a/examples/cpp/metadata/greeter_client.cc
+++ b/examples/cpp/metadata/greeter_client.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/metadata/greeter_server.cc b/examples/cpp/metadata/greeter_server.cc
index 19d8bb0d01d..d2a742f400f 100644
--- a/examples/cpp/metadata/greeter_server.cc
+++ b/examples/cpp/metadata/greeter_server.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/multiplex/multiplex_client.cc b/examples/cpp/multiplex/multiplex_client.cc
index 085d1334a8c..31b125047de 100644
--- a/examples/cpp/multiplex/multiplex_client.cc
+++ b/examples/cpp/multiplex/multiplex_client.cc
@@ -15,6 +15,8 @@
  * limitations under the License.
  *
  */
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,8 +27,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "examples/protos/route_guide.grpc.pb.h"
diff --git a/examples/cpp/multiplex/multiplex_server.cc b/examples/cpp/multiplex/multiplex_server.cc
index e4cdc54ec1f..7c08e9e8b59 100644
--- a/examples/cpp/multiplex/multiplex_server.cc
+++ b/examples/cpp/multiplex/multiplex_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <map>
 #include <memory>
@@ -25,10 +29,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "examples/protos/route_guide.grpc.pb.h"
diff --git a/examples/cpp/orca/orca_server.cc b/examples/cpp/orca/orca_server.cc
index d05d763a6a5..9feac2636d1 100644
--- a/examples/cpp/orca/orca_server.cc
+++ b/examples/cpp/orca/orca_server.cc
@@ -15,6 +15,12 @@
  * limitations under the License.
  *
  */
+#include <grpcpp/ext/call_metric_recorder.h>
+#include <grpcpp/ext/orca_service.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/support/status.h>
+
 #include <cstddef>
 #include <iostream>
 #include <memory>
@@ -25,12 +31,6 @@
 #include "absl/strings/str_format.h"
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/ext/call_metric_recorder.h>
-#include <grpcpp/ext/orca_service.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/support/status.h>
-
 using grpc::CallbackServerContext;
 using grpc::Server;
 using grpc::ServerBuilder;
diff --git a/examples/cpp/otel/codelab/greeter_callback_client.cc b/examples/cpp/otel/codelab/greeter_callback_client.cc
index d9eab4e9edd..2f2f0fa3d27 100644
--- a/examples/cpp/otel/codelab/greeter_callback_client.cc
+++ b/examples/cpp/otel/codelab/greeter_callback_client.cc
@@ -23,6 +23,9 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <mutex>
 #include <string>
@@ -33,9 +36,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/codelab/greeter_callback_client_solution.cc b/examples/cpp/otel/codelab/greeter_callback_client_solution.cc
index b7b507c509d..83015949e19 100644
--- a/examples/cpp/otel/codelab/greeter_callback_client_solution.cc
+++ b/examples/cpp/otel/codelab/greeter_callback_client_solution.cc
@@ -23,6 +23,9 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <mutex>
 #include <string>
@@ -33,9 +36,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/codelab/greeter_callback_server.cc b/examples/cpp/otel/codelab/greeter_callback_server.cc
index bba7c9ce072..7abd5ff716d 100644
--- a/examples/cpp/otel/codelab/greeter_callback_server.cc
+++ b/examples/cpp/otel/codelab/greeter_callback_server.cc
@@ -23,6 +23,11 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -34,11 +39,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/codelab/greeter_callback_server_solution.cc b/examples/cpp/otel/codelab/greeter_callback_server_solution.cc
index a53ab288af4..8a8373e35db 100644
--- a/examples/cpp/otel/codelab/greeter_callback_server_solution.cc
+++ b/examples/cpp/otel/codelab/greeter_callback_server_solution.cc
@@ -23,6 +23,11 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -34,11 +39,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/codelab/util.cc b/examples/cpp/otel/codelab/util.cc
index a8fcce95663..35a1fe35c8e 100644
--- a/examples/cpp/otel/codelab/util.cc
+++ b/examples/cpp/otel/codelab/util.cc
@@ -23,12 +23,12 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/grpcpp.h>
+
 #include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h"
 #include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
 #include "opentelemetry/sdk/metrics/view/view_factory.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/greeter_callback_client.cc b/examples/cpp/otel/greeter_callback_client.cc
index f166bd9f5e6..0e4cf644779 100644
--- a/examples/cpp/otel/greeter_callback_client.cc
+++ b/examples/cpp/otel/greeter_callback_client.cc
@@ -23,6 +23,8 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <string>
 
 #include "absl/flags/flag.h"
@@ -31,8 +33,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
diff --git a/examples/cpp/otel/greeter_callback_server.cc b/examples/cpp/otel/greeter_callback_server.cc
index 408b52d685d..60fec863a4e 100644
--- a/examples/cpp/otel/greeter_callback_server.cc
+++ b/examples/cpp/otel/greeter_callback_server.cc
@@ -23,6 +23,8 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -34,8 +36,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
diff --git a/examples/cpp/otel/ostream/greeter_callback_client.cc b/examples/cpp/otel/ostream/greeter_callback_client.cc
index 24e141fd7b5..1437d57e522 100644
--- a/examples/cpp/otel/ostream/greeter_callback_client.cc
+++ b/examples/cpp/otel/ostream/greeter_callback_client.cc
@@ -23,6 +23,8 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <string>
 
 #include "absl/flags/flag.h"
@@ -33,8 +35,6 @@
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
diff --git a/examples/cpp/otel/ostream/greeter_callback_server.cc b/examples/cpp/otel/ostream/greeter_callback_server.cc
index ab539efd305..13ae436cbb4 100644
--- a/examples/cpp/otel/ostream/greeter_callback_server.cc
+++ b/examples/cpp/otel/ostream/greeter_callback_server.cc
@@ -23,6 +23,8 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -35,8 +37,6 @@
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
diff --git a/examples/cpp/otel/util.cc b/examples/cpp/otel/util.cc
index f844a044a6e..e75b4ec4e05 100644
--- a/examples/cpp/otel/util.cc
+++ b/examples/cpp/otel/util.cc
@@ -23,6 +23,10 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <condition_variable>
 #include <mutex>
 
@@ -30,10 +34,6 @@
 #include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
 #include "opentelemetry/sdk/metrics/view/view_factory.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/reflection/reflection_server.cc b/examples/cpp/reflection/reflection_server.cc
index 8ef327bbee8..1b3a4f2fbe5 100644
--- a/examples/cpp/reflection/reflection_server.cc
+++ b/examples/cpp/reflection/reflection_server.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 
 #include "absl/flags/flag.h"
@@ -19,9 +22,6 @@
 #include "absl/strings/str_format.h"
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 using grpc::CallbackServerContext;
 using grpc::Server;
 using grpc::ServerBuilder;
diff --git a/examples/cpp/retry/client.cc b/examples/cpp/retry/client.cc
index 3d490f25d5c..94417f61a70 100644
--- a/examples/cpp/retry/client.cc
+++ b/examples/cpp/retry/client.cc
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/status.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "absl/strings/string_view.h"
 
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/status.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/retry/server.cc b/examples/cpp/retry/server.cc
index f6a8c602473..66d809d7972 100644
--- a/examples/cpp/retry/server.cc
+++ b/examples/cpp/retry/server.cc
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <iostream>
-#include <memory>
-#include <string>
-
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
 
+#include <iostream>
+#include <memory>
+#include <string>
+
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/route_guide/route_guide_callback_client.cc b/examples/cpp/route_guide/route_guide_callback_client.cc
index d44e9fae2d3..8e0624fddae 100644
--- a/examples/cpp/route_guide/route_guide_callback_client.cc
+++ b/examples/cpp/route_guide/route_guide_callback_client.cc
@@ -16,6 +16,13 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+
 #include <chrono>
 #include <condition_variable>
 #include <iostream>
@@ -26,13 +33,6 @@
 #include <thread>
 
 #include "helper.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/route_guide.grpc.pb.h"
 #else
diff --git a/examples/cpp/route_guide/route_guide_callback_server.cc b/examples/cpp/route_guide/route_guide_callback_server.cc
index c9ff97c8174..f97884e7b96 100644
--- a/examples/cpp/route_guide/route_guide_callback_server.cc
+++ b/examples/cpp/route_guide/route_guide_callback_server.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+
 #include <algorithm>
 #include <chrono>
 #include <cmath>
@@ -29,12 +35,6 @@
 #include "absl/log/initialize.h"
 #include "absl/log/log.h"
 #include "helper.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/route_guide.grpc.pb.h"
 #else
diff --git a/examples/cpp/route_guide/route_guide_client.cc b/examples/cpp/route_guide/route_guide_client.cc
index fd29a31e373..73983f458d9 100644
--- a/examples/cpp/route_guide/route_guide_client.cc
+++ b/examples/cpp/route_guide/route_guide_client.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+
 #include <chrono>
 #include <iostream>
 #include <memory>
@@ -24,12 +30,6 @@
 #include <thread>
 
 #include "helper.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/route_guide.grpc.pb.h"
 #else
diff --git a/examples/cpp/route_guide/route_guide_server.cc b/examples/cpp/route_guide/route_guide_server.cc
index 0e29125881f..7a6a1c8ecaa 100644
--- a/examples/cpp/route_guide/route_guide_server.cc
+++ b/examples/cpp/route_guide/route_guide_server.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+
 #include <algorithm>
 #include <chrono>
 #include <cmath>
@@ -24,12 +30,6 @@
 #include <string>
 
 #include "helper.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/route_guide.grpc.pb.h"
 #else
diff --git a/examples/cpp/systemd_socket_activation/client.cc b/examples/cpp/systemd_socket_activation/client.cc
index 46cdb53defe..6d25f4abffe 100644
--- a/examples/cpp/systemd_socket_activation/client.cc
+++ b/examples/cpp/systemd_socket_activation/client.cc
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/grpcpp.h>
-
 using grpc::Channel;
 using grpc::ClientContext;
 using grpc::Status;
diff --git a/examples/cpp/systemd_socket_activation/server.cc b/examples/cpp/systemd_socket_activation/server.cc
index 28ec68114a4..bdd19a873f3 100644
--- a/examples/cpp/systemd_socket_activation/server.cc
+++ b/examples/cpp/systemd_socket_activation/server.cc
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerContext;
diff --git a/examples/cpp/unix_abstract_sockets/client.cc b/examples/cpp/unix_abstract_sockets/client.cc
index 36f561e7cdb..d86202ec433 100644
--- a/examples/cpp/unix_abstract_sockets/client.cc
+++ b/examples/cpp/unix_abstract_sockets/client.cc
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/grpcpp.h>
-
 using grpc::Channel;
 using grpc::ClientContext;
 using grpc::Status;
diff --git a/examples/cpp/unix_abstract_sockets/server.cc b/examples/cpp/unix_abstract_sockets/server.cc
index 6d941a6fcc6..53fe378f9c2 100644
--- a/examples/cpp/unix_abstract_sockets/server.cc
+++ b/examples/cpp/unix_abstract_sockets/server.cc
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerContext;
diff --git a/examples/cpp/wait_for_ready/greeter_callback_client.cc b/examples/cpp/wait_for_ready/greeter_callback_client.cc
index 1c7865ed2bf..546a5d7f503 100644
--- a/examples/cpp/wait_for_ready/greeter_callback_client.cc
+++ b/examples/cpp/wait_for_ready/greeter_callback_client.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -26,8 +28,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/xds/xds_greeter_client.cc b/examples/cpp/xds/xds_greeter_client.cc
index 4bf47e1057c..d60e3f17d81 100644
--- a/examples/cpp/xds/xds_greeter_client.cc
+++ b/examples/cpp/xds/xds_greeter_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,8 +27,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/xds/xds_greeter_server.cc b/examples/cpp/xds/xds_greeter_server.cc
index c35166c819e..1eb65162ac6 100644
--- a/examples/cpp/xds/xds_greeter_server.cc
+++ b/examples/cpp/xds/xds_greeter_server.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -25,12 +31,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/xds_server_builder.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/include/grpc++/impl/.clang-format b/include/grpc++/impl/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpc++/impl/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpc/.clang-format b/include/grpc/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpc/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpc/compression.h b/include/grpc/compression.h
index 0f07a514b2b..0db81a2593a 100644
--- a/include/grpc/compression.h
+++ b/include/grpc/compression.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_COMPRESSION_H
 #define GRPC_COMPRESSION_H
 
-#include <stdlib.h>
-
 #include <grpc/impl/compression_types.h>  // IWYU pragma: export
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdlib.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/credentials.h b/include/grpc/credentials.h
index b5814b913c4..8875dd115b6 100644
--- a/include/grpc/credentials.h
+++ b/include/grpc/credentials.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_CREDENTIALS_H
 #define GRPC_CREDENTIALS_H
 
-#include <stdbool.h>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/event_engine/endpoint_config.h b/include/grpc/event_engine/endpoint_config.h
index ea1699afc52..68dae44caee 100644
--- a/include/grpc/event_engine/endpoint_config.h
+++ b/include/grpc/event_engine/endpoint_config.h
@@ -14,13 +14,13 @@
 #ifndef GRPC_EVENT_ENGINE_ENDPOINT_CONFIG_H
 #define GRPC_EVENT_ENGINE_ENDPOINT_CONFIG_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/event_engine.h b/include/grpc/event_engine/event_engine.h
index 21a0c1c4826..410c109dfc2 100644
--- a/include/grpc/event_engine/event_engine.h
+++ b/include/grpc/event_engine/event_engine.h
@@ -14,12 +14,6 @@
 #ifndef GRPC_EVENT_ENGINE_EVENT_ENGINE_H
 #define GRPC_EVENT_ENGINE_EVENT_ENGINE_H
 
-#include <vector>
-
-#include "absl/functional/any_invocable.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/extensible.h>
 #include <grpc/event_engine/memory_allocator.h>
@@ -27,6 +21,12 @@
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/support/port_platform.h>
 
+#include <vector>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+
 // TODO(vigneshbabu): Define the Endpoint::Write metrics collection system
 namespace grpc_event_engine {
 namespace experimental {
diff --git a/include/grpc/event_engine/extensible.h b/include/grpc/event_engine/extensible.h
index 9af4f37682b..2923bb6a077 100644
--- a/include/grpc/event_engine/extensible.h
+++ b/include/grpc/event_engine/extensible.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_EVENT_ENGINE_EXTENSIBLE_H
 #define GRPC_EVENT_ENGINE_EXTENSIBLE_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/internal/memory_allocator_impl.h b/include/grpc/event_engine/internal/memory_allocator_impl.h
index 91cba5a9491..721da86d0ac 100644
--- a/include/grpc/event_engine/internal/memory_allocator_impl.h
+++ b/include/grpc/event_engine/internal/memory_allocator_impl.h
@@ -14,15 +14,15 @@
 #ifndef GRPC_EVENT_ENGINE_INTERNAL_MEMORY_ALLOCATOR_IMPL_H
 #define GRPC_EVENT_ENGINE_INTERNAL_MEMORY_ALLOCATOR_IMPL_H
 
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <type_traits>
 #include <vector>
 
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/memory_allocator.h b/include/grpc/event_engine/memory_allocator.h
index 3a347c3b5cf..d50404c71ab 100644
--- a/include/grpc/event_engine/memory_allocator.h
+++ b/include/grpc/event_engine/memory_allocator.h
@@ -14,6 +14,9 @@
 #ifndef GRPC_EVENT_ENGINE_MEMORY_ALLOCATOR_H
 #define GRPC_EVENT_ENGINE_MEMORY_ALLOCATOR_H
 
+#include <grpc/event_engine/internal/memory_allocator_impl.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>  // for abort()
 
 #include <algorithm>
@@ -21,10 +24,6 @@
 #include <type_traits>
 #include <vector>
 
-#include <grpc/event_engine/internal/memory_allocator_impl.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/memory_request.h b/include/grpc/event_engine/memory_request.h
index 2ea7bc5c1ab..b705f030c50 100644
--- a/include/grpc/event_engine/memory_request.h
+++ b/include/grpc/event_engine/memory_request.h
@@ -14,12 +14,11 @@
 #ifndef GRPC_EVENT_ENGINE_MEMORY_REQUEST_H
 #define GRPC_EVENT_ENGINE_MEMORY_REQUEST_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/slice.h b/include/grpc/event_engine/slice.h
index f4009648dc1..7e4b2f08f7a 100644
--- a/include/grpc/event_engine/slice.h
+++ b/include/grpc/event_engine/slice.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_EVENT_ENGINE_SLICE_H
 #define GRPC_EVENT_ENGINE_SLICE_H
 
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,10 +26,6 @@
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 // This public slice definition largely based of the internal grpc_core::Slice
 // implementation. Changes to this implementation might warrant changes to the
 // internal grpc_core::Slice type as well.
diff --git a/include/grpc/event_engine/slice_buffer.h b/include/grpc/event_engine/slice_buffer.h
index 724c3d07292..f6d23d72e09 100644
--- a/include/grpc/event_engine/slice_buffer.h
+++ b/include/grpc/event_engine/slice_buffer.h
@@ -15,6 +15,12 @@
 #ifndef GRPC_EVENT_ENGINE_SLICE_BUFFER_H
 #define GRPC_EVENT_ENGINE_SLICE_BUFFER_H
 
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/impl/codegen/slice.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,13 +29,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/utility/utility.h"
 
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/impl/codegen/slice.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h
index d293907eac0..2b681889d10 100644
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@@ -19,8 +19,6 @@
 #ifndef GRPC_GRPC_H
 #define GRPC_GRPC_H
 
-#include <stddef.h>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/impl/connectivity_state.h>  // IWYU pragma: export
 #include <grpc/impl/grpc_types.h>          // IWYU pragma: export
@@ -29,6 +27,7 @@
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/grpc_audit_logging.h b/include/grpc/grpc_audit_logging.h
index 4c30593f2fd..229df79165d 100644
--- a/include/grpc/grpc_audit_logging.h
+++ b/include/grpc/grpc_audit_logging.h
@@ -19,15 +19,15 @@
 #ifndef GRPC_GRPC_AUDIT_LOGGING_H
 #define GRPC_GRPC_AUDIT_LOGGING_H
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/include/grpc/grpc_crl_provider.h b/include/grpc/grpc_crl_provider.h
index 968d10b0600..e9a6db95cd9 100644
--- a/include/grpc/grpc_crl_provider.h
+++ b/include/grpc/grpc_crl_provider.h
@@ -19,16 +19,16 @@
 #ifndef GRPC_GRPC_CRL_PROVIDER_H
 #define GRPC_GRPC_CRL_PROVIDER_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/include/grpc/grpc_posix.h b/include/grpc/grpc_posix.h
index 3f59a4423d3..864ba979a9e 100644
--- a/include/grpc/grpc_posix.h
+++ b/include/grpc/grpc_posix.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_GRPC_POSIX_H
 #define GRPC_GRPC_POSIX_H
 
-#include <stddef.h>
-
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h
index 11e08a6f4a1..f9a2d9d555d 100644
--- a/include/grpc/grpc_security.h
+++ b/include/grpc/grpc_security.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_GRPC_SECURITY_H
 #define GRPC_GRPC_SECURITY_H
 
-#include <stdbool.h>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/impl/call.h b/include/grpc/impl/call.h
index ea298f2ef5c..43b44b195f5 100644
--- a/include/grpc/impl/call.h
+++ b/include/grpc/impl/call.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_IMPL_CALL_H
 #define GRPC_IMPL_CALL_H
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
+
 // Run a callback in the call's EventEngine.
 // Internal-only
 void grpc_call_run_in_event_engine(const grpc_call* call,
diff --git a/include/grpc/impl/grpc_types.h b/include/grpc/impl/grpc_types.h
index b1305114eb1..02c79532939 100644
--- a/include/grpc/impl/grpc_types.h
+++ b/include/grpc/impl/grpc_types.h
@@ -21,14 +21,13 @@
 
 // IWYU pragma: private, include <grpc/grpc.h>
 
-#include <stddef.h>
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/impl/slice_type.h b/include/grpc/impl/slice_type.h
index 5e35446ef93..6d23f8abf4c 100644
--- a/include/grpc/impl/slice_type.h
+++ b/include/grpc/impl/slice_type.h
@@ -21,9 +21,8 @@
 
 // IWYU pragma: private, include <grpc/slice.h>
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 typedef struct grpc_slice grpc_slice;
 
diff --git a/include/grpc/passive_listener.h b/include/grpc/passive_listener.h
index fffc789dba0..234ac5d8364 100644
--- a/include/grpc/passive_listener.h
+++ b/include/grpc/passive_listener.h
@@ -14,10 +14,10 @@
 #ifndef GRPC_PASSIVE_LISTENER_H
 #define GRPC_PASSIVE_LISTENER_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
+
+#include <memory>
 // #include <grpc/support/port_platform.h>
 
 namespace grpc_core {
diff --git a/include/grpc/support/alloc.h b/include/grpc/support/alloc.h
index fdfa63c8e88..1ffd1966e7c 100644
--- a/include/grpc/support/alloc.h
+++ b/include/grpc/support/alloc.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SUPPORT_ALLOC_H
 #define GRPC_SUPPORT_ALLOC_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/support/json.h b/include/grpc/support/json.h
index 7b850e1cc28..2c96a7fb5ab 100644
--- a/include/grpc/support/json.h
+++ b/include/grpc/support/json.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SUPPORT_JSON_H
 #define GRPC_SUPPORT_JSON_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <map>
@@ -27,8 +28,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/variant.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h
index 92a41f0066e..10b3e6ff67a 100644
--- a/include/grpc/support/log.h
+++ b/include/grpc/support/log.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SUPPORT_LOG_H
 #define GRPC_SUPPORT_LOG_H
 
+#include <grpc/support/port_platform.h>
 #include <stdarg.h>
 #include <stdlib.h> /* for abort() */
 
-#include <grpc/support/port_platform.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/grpc/support/metrics.h b/include/grpc/support/metrics.h
index 829db0a404f..62525756620 100644
--- a/include/grpc/support/metrics.h
+++ b/include/grpc/support/metrics.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SUPPORT_METRICS_H
 #define GRPC_SUPPORT_METRICS_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_core {
 namespace experimental {
 
diff --git a/include/grpc/support/sync_posix.h b/include/grpc/support/sync_posix.h
index 5348bac951f..18b049d418d 100644
--- a/include/grpc/support/sync_posix.h
+++ b/include/grpc/support/sync_posix.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SUPPORT_SYNC_POSIX_H
 #define GRPC_SUPPORT_SYNC_POSIX_H
 
-#include <pthread.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync_generic.h>
+#include <pthread.h>
 
 #ifdef GRPC_ASAN_ENABLED
 /* The member |leak_checker| is used to check whether there is a memory leak
diff --git a/include/grpc/support/time.h b/include/grpc/support/time.h
index 7adbfcedd1f..9fc786d8f41 100644
--- a/include/grpc/support/time.h
+++ b/include/grpc/support/time.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SUPPORT_TIME_H
 #define GRPC_SUPPORT_TIME_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <time.h>
 
-#include <grpc/support/port_platform.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/grpcpp/.clang-format b/include/grpcpp/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/alarm.h b/include/grpcpp/alarm.h
index bace15ec89c..86356909afd 100644
--- a/include/grpcpp/alarm.h
+++ b/include/grpcpp/alarm.h
@@ -21,8 +21,6 @@
 #ifndef GRPCPP_ALARM_H
 #define GRPCPP_ALARM_H
 
-#include <functional>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpcpp/completion_queue.h>
@@ -30,6 +28,8 @@
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/time.h>
 
+#include <functional>
+
 namespace grpc {
 
 /// Trigger a \a CompletionQueue event, or asynchronous callback execution,
diff --git a/include/grpcpp/channel.h b/include/grpcpp/channel.h
index aef567390d9..dacd27c38a4 100644
--- a/include/grpcpp/channel.h
+++ b/include/grpcpp/channel.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_CHANNEL_H
 #define GRPCPP_CHANNEL_H
 
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/call.h>
@@ -30,6 +28,8 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 struct grpc_channel;
 
 namespace grpc {
diff --git a/include/grpcpp/client_context.h b/include/grpcpp/client_context.h
index af3b533ed1b..7226fce06de 100644
--- a/include/grpcpp/client_context.h
+++ b/include/grpcpp/client_context.h
@@ -34,12 +34,6 @@
 #ifndef GRPCPP_CLIENT_CONTEXT_H
 #define GRPCPP_CLIENT_CONTEXT_H
 
-#include <map>
-#include <memory>
-#include <string>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/impl/compression_types.h>
 #include <grpc/impl/propagation_bits.h>
 #include <grpcpp/impl/create_auth_context.h>
@@ -54,6 +48,12 @@
 #include <grpcpp/support/string_ref.h>
 #include <grpcpp/support/time.h>
 
+#include <map>
+#include <memory>
+#include <string>
+
+#include "absl/log/absl_check.h"
+
 struct census_context;
 struct grpc_call;
 
diff --git a/include/grpcpp/completion_queue.h b/include/grpcpp/completion_queue.h
index 2bb391fccfc..2216dabb096 100644
--- a/include/grpcpp/completion_queue.h
+++ b/include/grpcpp/completion_queue.h
@@ -32,10 +32,6 @@
 #ifndef GRPCPP_COMPLETION_QUEUE_H
 #define GRPCPP_COMPLETION_QUEUE_H
 
-#include <list>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/time.h>
@@ -47,6 +43,10 @@
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/impl/sync.h>
 
+#include <list>
+
+#include "absl/log/absl_check.h"
+
 struct grpc_completion_queue;
 
 namespace grpc {
diff --git a/include/grpcpp/create_channel.h b/include/grpcpp/create_channel.h
index 83f905e776f..7b765b8966a 100644
--- a/include/grpcpp/create_channel.h
+++ b/include/grpcpp/create_channel.h
@@ -19,14 +19,14 @@
 #ifndef GRPCPP_CREATE_CHANNEL_H
 #define GRPCPP_CREATE_CHANNEL_H
 
-#include <memory>
-
 #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 <memory>
+
 namespace grpc {
 /// Create a new \a Channel pointing to \a target.
 ///
diff --git a/include/grpcpp/create_channel_binder.h b/include/grpcpp/create_channel_binder.h
index 16616f31ca9..f19792a184a 100644
--- a/include/grpcpp/create_channel_binder.h
+++ b/include/grpcpp/create_channel_binder.h
@@ -19,16 +19,15 @@
 
 #ifdef GPR_ANDROID
 
+#include <grpcpp/channel.h>
+#include <grpcpp/security/binder_security_policy.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <jni.h>
 
 #include <memory>
 
 #include "absl/strings/string_view.h"
 
-#include <grpcpp/channel.h>
-#include <grpcpp/security/binder_security_policy.h>
-#include <grpcpp/support/channel_arguments.h>
-
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/create_channel_posix.h b/include/grpcpp/create_channel_posix.h
index c4eb30c8d87..b6b06e8412a 100644
--- a/include/grpcpp/create_channel_posix.h
+++ b/include/grpcpp/create_channel_posix.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_CREATE_CHANNEL_POSIX_H
 #define GRPCPP_CREATE_CHANNEL_POSIX_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+
 namespace grpc {
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
diff --git a/include/grpcpp/ext/call_metric_recorder.h b/include/grpcpp/ext/call_metric_recorder.h
index 303a35db14d..443f5e4e67e 100644
--- a/include/grpcpp/ext/call_metric_recorder.h
+++ b/include/grpcpp/ext/call_metric_recorder.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_EXT_CALL_METRIC_RECORDER_H
 #define GRPCPP_EXT_CALL_METRIC_RECORDER_H
 
+#include <grpcpp/impl/sync.h>
+#include <grpcpp/support/slice.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpcpp/impl/sync.h>
-#include <grpcpp/support/slice.h>
-
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/ext/csm_observability.h b/include/grpcpp/ext/csm_observability.h
index af7b42f4d1b..265d91949cd 100644
--- a/include/grpcpp/ext/csm_observability.h
+++ b/include/grpcpp/ext/csm_observability.h
@@ -19,6 +19,9 @@
 #ifndef GRPCPP_EXT_CSM_OBSERVABILITY_H
 #define GRPCPP_EXT_CSM_OBSERVABILITY_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
@@ -26,9 +29,6 @@
 #include "absl/strings/string_view.h"
 #include "opentelemetry/metrics/meter_provider.h"
 
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/otel_plugin.h>
-
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/ext/gcp_observability.h b/include/grpcpp/ext/gcp_observability.h
index df270bec887..96d1aee2680 100644
--- a/include/grpcpp/ext/gcp_observability.h
+++ b/include/grpcpp/ext/gcp_observability.h
@@ -17,12 +17,12 @@
 #ifndef GRPCPP_EXT_GCP_OBSERVABILITY_H
 #define GRPCPP_EXT_GCP_OBSERVABILITY_H
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/grpc_library.h>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+
 namespace grpc {
 
 // GcpObservability objects follow the RAII idiom and help manage the lifetime
diff --git a/include/grpcpp/ext/health_check_service_server_builder_option.h b/include/grpcpp/ext/health_check_service_server_builder_option.h
index 85b661ee515..e328f434d1f 100644
--- a/include/grpcpp/ext/health_check_service_server_builder_option.h
+++ b/include/grpcpp/ext/health_check_service_server_builder_option.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_EXT_HEALTH_CHECK_SERVICE_SERVER_BUILDER_OPTION_H
 #define GRPCPP_EXT_HEALTH_CHECK_SERVICE_SERVER_BUILDER_OPTION_H
 
-#include <memory>
-
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/impl/server_builder_option.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 namespace grpc {
 
 class HealthCheckServiceServerBuilderOption : public ServerBuilderOption {
diff --git a/include/grpcpp/ext/orca_service.h b/include/grpcpp/ext/orca_service.h
index 83a676095dc..3a2dd1a84ae 100644
--- a/include/grpcpp/ext/orca_service.h
+++ b/include/grpcpp/ext/orca_service.h
@@ -17,12 +17,6 @@
 #ifndef GRPCPP_EXT_ORCA_SERVICE_H
 #define GRPCPP_EXT_ORCA_SERVICE_H
 
-#include <map>
-#include <string>
-
-#include "absl/time/time.h"
-#include "absl/types/optional.h"
-
 #include <grpcpp/ext/server_metric_recorder.h>
 #include <grpcpp/impl/service_type.h>
 #include <grpcpp/impl/sync.h>
@@ -30,6 +24,12 @@
 #include <grpcpp/support/server_callback.h>
 #include <grpcpp/support/slice.h>
 
+#include <map>
+#include <string>
+
+#include "absl/time/time.h"
+#include "absl/types/optional.h"
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/ext/otel_plugin.h b/include/grpcpp/ext/otel_plugin.h
index 9de57fbb496..ffd6f6647c4 100644
--- a/include/grpcpp/ext/otel_plugin.h
+++ b/include/grpcpp/ext/otel_plugin.h
@@ -19,6 +19,10 @@
 #ifndef GRPCPP_EXT_OTEL_PLUGIN_H
 #define GRPCPP_EXT_OTEL_PLUGIN_H
 
+#include <grpc/support/metrics.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -30,11 +34,6 @@
 #include "absl/strings/string_view.h"
 #include "opentelemetry/metrics/meter_provider.h"
 
-#include <grpc/support/metrics.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/support/channel_arguments.h>
-
 namespace grpc {
 namespace internal {
 class OpenTelemetryPluginBuilderImpl;
diff --git a/include/grpcpp/ext/proto_server_reflection_plugin.h b/include/grpcpp/ext/proto_server_reflection_plugin.h
index b1cbb5a67c2..fd10c3acfbd 100644
--- a/include/grpcpp/ext/proto_server_reflection_plugin.h
+++ b/include/grpcpp/ext/proto_server_reflection_plugin.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_EXT_PROTO_SERVER_REFLECTION_PLUGIN_H
 #define GRPCPP_EXT_PROTO_SERVER_REFLECTION_PLUGIN_H
 
-#include <memory>
-
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 namespace grpc {
 class ProtoServerReflection;
 class ProtoServerReflectionBackend;
diff --git a/include/grpcpp/ext/server_metric_recorder.h b/include/grpcpp/ext/server_metric_recorder.h
index d2ddaae9367..4741572c44c 100644
--- a/include/grpcpp/ext/server_metric_recorder.h
+++ b/include/grpcpp/ext/server_metric_recorder.h
@@ -19,13 +19,13 @@
 #ifndef GRPCPP_EXT_SERVER_METRIC_RECORDER_H
 #define GRPCPP_EXT_SERVER_METRIC_RECORDER_H
 
+#include <grpcpp/impl/sync.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <functional>
 #include <map>
 #include <memory>
 
-#include <grpcpp/impl/sync.h>
-#include <grpcpp/support/string_ref.h>
-
 namespace grpc_core {
 struct BackendMetricData;
 }  // namespace grpc_core
diff --git a/include/grpcpp/impl/.clang-format b/include/grpcpp/impl/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/impl/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/impl/call_op_set.h b/include/grpcpp/impl/call_op_set.h
index 5afa8272aa2..3ed80330e4b 100644
--- a/include/grpcpp/impl/call_op_set.h
+++ b/include/grpcpp/impl/call_op_set.h
@@ -19,13 +19,6 @@
 #ifndef GRPCPP_IMPL_CALL_OP_SET_H
 #define GRPCPP_IMPL_CALL_OP_SET_H
 
-#include <cstring>
-#include <map>
-#include <memory>
-
-#include "absl/log/absl_check.h"
-#include "absl/log/absl_log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/impl/grpc_types.h>
@@ -45,6 +38,13 @@
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <cstring>
+#include <map>
+#include <memory>
+
+#include "absl/log/absl_check.h"
+#include "absl/log/absl_log.h"
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/impl/channel_argument_option.h b/include/grpcpp/impl/channel_argument_option.h
index d1bf931c578..b4f411e3c51 100644
--- a/include/grpcpp/impl/channel_argument_option.h
+++ b/include/grpcpp/impl/channel_argument_option.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_IMPL_CHANNEL_ARGUMENT_OPTION_H
 #define GRPCPP_IMPL_CHANNEL_ARGUMENT_OPTION_H
 
-#include <map>
-#include <memory>
-
 #include <grpcpp/impl/server_builder_option.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <map>
+#include <memory>
+
 namespace grpc {
 
 std::unique_ptr<ServerBuilderOption> MakeChannelArgumentOption(
diff --git a/include/grpcpp/impl/codegen/.clang-format b/include/grpcpp/impl/codegen/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/impl/codegen/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/impl/create_auth_context.h b/include/grpcpp/impl/create_auth_context.h
index 10844bec92c..892da261a23 100644
--- a/include/grpcpp/impl/create_auth_context.h
+++ b/include/grpcpp/impl/create_auth_context.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_CREATE_AUTH_CONTEXT_H
 #define GRPCPP_IMPL_CREATE_AUTH_CONTEXT_H
 
-#include <memory>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/security/auth_context.h>
 
+#include <memory>
+
 namespace grpc {
 
 /// TODO(ctiller): not sure we want to make this a permanent thing
diff --git a/include/grpcpp/impl/delegating_channel.h b/include/grpcpp/impl/delegating_channel.h
index 802237f2efd..add88a23bb0 100644
--- a/include/grpcpp/impl/delegating_channel.h
+++ b/include/grpcpp/impl/delegating_channel.h
@@ -19,10 +19,10 @@
 #ifndef GRPCPP_IMPL_DELEGATING_CHANNEL_H
 #define GRPCPP_IMPL_DELEGATING_CHANNEL_H
 
-#include <memory>
-
 #include <grpcpp/impl/channel_interface.h>
 
+#include <memory>
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/impl/generic_stub_internal.h b/include/grpcpp/impl/generic_stub_internal.h
index ba8c929d8fe..efc57417713 100644
--- a/include/grpcpp/impl/generic_stub_internal.h
+++ b/include/grpcpp/impl/generic_stub_internal.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_IMPL_GENERIC_STUB_INTERNAL_H
 #define GRPCPP_IMPL_GENERIC_STUB_INTERNAL_H
 
-#include <functional>
-
 #include <grpcpp/client_context.h>
 #include <grpcpp/impl/rpc_method.h>
 #include <grpcpp/support/byte_buffer.h>
@@ -28,6 +26,8 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/stub_options.h>
 
+#include <functional>
+
 namespace grpc {
 
 template <class RequestType, class ResponseType>
diff --git a/include/grpcpp/impl/grpc_library.h b/include/grpcpp/impl/grpc_library.h
index 6f20d2bf413..728dda84624 100644
--- a/include/grpcpp/impl/grpc_library.h
+++ b/include/grpcpp/impl/grpc_library.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_GRPC_LIBRARY_H
 #define GRPCPP_IMPL_GRPC_LIBRARY_H
 
-#include <iostream>
-
 #include <grpc/grpc.h>
 #include <grpcpp/impl/codegen/config.h>
 
+#include <iostream>
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/impl/interceptor_common.h b/include/grpcpp/impl/interceptor_common.h
index 2d4c56701d2..5686c792b77 100644
--- a/include/grpcpp/impl/interceptor_common.h
+++ b/include/grpcpp/impl/interceptor_common.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_IMPL_INTERCEPTOR_COMMON_H
 #define GRPCPP_IMPL_INTERCEPTOR_COMMON_H
 
-#include <array>
-#include <functional>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/call_op_set_interface.h>
@@ -31,6 +26,11 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/server_interceptor.h>
 
+#include <array>
+#include <functional>
+
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 namespace internal {
 
diff --git a/include/grpcpp/impl/metadata_map.h b/include/grpcpp/impl/metadata_map.h
index 6241df0c259..c6407eaa208 100644
--- a/include/grpcpp/impl/metadata_map.h
+++ b/include/grpcpp/impl/metadata_map.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_METADATA_MAP_H
 #define GRPCPP_IMPL_METADATA_MAP_H
 
-#include <map>
-
 #include <grpc/grpc.h>
 #include <grpcpp/support/slice.h>
 
+#include <map>
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/impl/proto_utils.h b/include/grpcpp/impl/proto_utils.h
index d738ff3ab67..4a101ebe113 100644
--- a/include/grpcpp/impl/proto_utils.h
+++ b/include/grpcpp/impl/proto_utils.h
@@ -19,10 +19,6 @@
 #ifndef GRPCPP_IMPL_PROTO_UTILS_H
 #define GRPCPP_IMPL_PROTO_UTILS_H
 
-#include <type_traits>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/slice.h>
@@ -34,6 +30,10 @@
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
 
+#include <type_traits>
+
+#include "absl/log/absl_check.h"
+
 /// This header provides serialization and deserialization between gRPC
 /// messages serialized using protobuf and the C++ objects they represent.
 
diff --git a/include/grpcpp/impl/rpc_method.h b/include/grpcpp/impl/rpc_method.h
index e1dcd003367..bb47f45ec10 100644
--- a/include/grpcpp/impl/rpc_method.h
+++ b/include/grpcpp/impl/rpc_method.h
@@ -19,10 +19,10 @@
 #ifndef GRPCPP_IMPL_RPC_METHOD_H
 #define GRPCPP_IMPL_RPC_METHOD_H
 
-#include <memory>
-
 #include <grpcpp/impl/codegen/channel_interface.h>
 
+#include <memory>
+
 namespace grpc {
 namespace internal {
 /// Descriptor of an RPC method
diff --git a/include/grpcpp/impl/rpc_service_method.h b/include/grpcpp/impl/rpc_service_method.h
index 6ab92c978e3..1b9911eca41 100644
--- a/include/grpcpp/impl/rpc_service_method.h
+++ b/include/grpcpp/impl/rpc_service_method.h
@@ -19,6 +19,11 @@
 #ifndef GRPCPP_IMPL_RPC_SERVICE_METHOD_H
 #define GRPCPP_IMPL_RPC_SERVICE_METHOD_H
 
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/byte_buffer.h>
+#include <grpcpp/support/config.h>
+#include <grpcpp/support/status.h>
+
 #include <climits>
 #include <functional>
 #include <map>
@@ -28,11 +33,6 @@
 #include "absl/log/absl_check.h"
 #include "absl/log/absl_log.h"
 
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/byte_buffer.h>
-#include <grpcpp/support/config.h>
-#include <grpcpp/support/status.h>
-
 namespace grpc {
 class ServerContextBase;
 namespace internal {
diff --git a/include/grpcpp/impl/server_builder_option.h b/include/grpcpp/impl/server_builder_option.h
index d5745c6fb0c..22a94fd6833 100644
--- a/include/grpcpp/impl/server_builder_option.h
+++ b/include/grpcpp/impl/server_builder_option.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_IMPL_SERVER_BUILDER_OPTION_H
 #define GRPCPP_IMPL_SERVER_BUILDER_OPTION_H
 
-#include <map>
-#include <memory>
-
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <map>
+#include <memory>
+
 namespace grpc {
 
 /// Interface to pass an option to a \a ServerBuilder.
diff --git a/include/grpcpp/impl/server_builder_plugin.h b/include/grpcpp/impl/server_builder_plugin.h
index d7ef0be5c29..bf4397b37ba 100644
--- a/include/grpcpp/impl/server_builder_plugin.h
+++ b/include/grpcpp/impl/server_builder_plugin.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_SERVER_BUILDER_PLUGIN_H
 #define GRPCPP_IMPL_SERVER_BUILDER_PLUGIN_H
 
-#include <memory>
-
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 namespace grpc {
 
 class ServerBuilder;
diff --git a/include/grpcpp/impl/server_callback_handlers.h b/include/grpcpp/impl/server_callback_handlers.h
index 7a4b6cf9aef..1c6104a51a8 100644
--- a/include/grpcpp/impl/server_callback_handlers.h
+++ b/include/grpcpp/impl/server_callback_handlers.h
@@ -18,8 +18,6 @@
 #ifndef GRPCPP_IMPL_SERVER_CALLBACK_HANDLERS_H
 #define GRPCPP_IMPL_SERVER_CALLBACK_HANDLERS_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/call.h>
 #include <grpcpp/impl/rpc_service_method.h>
@@ -28,6 +26,8 @@
 #include <grpcpp/support/server_callback.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 namespace internal {
 
diff --git a/include/grpcpp/impl/server_initializer.h b/include/grpcpp/impl/server_initializer.h
index c2ad90bd269..2624681d165 100644
--- a/include/grpcpp/impl/server_initializer.h
+++ b/include/grpcpp/impl/server_initializer.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_SERVER_INITIALIZER_H
 #define GRPCPP_IMPL_SERVER_INITIALIZER_H
 
+#include <grpcpp/server.h>
+
 #include <memory>
 #include <vector>
 
-#include <grpcpp/server.h>
-
 namespace grpc {
 class Server;
 class Service;
diff --git a/include/grpcpp/impl/service_type.h b/include/grpcpp/impl/service_type.h
index b6af6e1fc98..f29f499f4e1 100644
--- a/include/grpcpp/impl/service_type.h
+++ b/include/grpcpp/impl/service_type.h
@@ -19,14 +19,14 @@
 #ifndef GRPCPP_IMPL_SERVICE_TYPE_H
 #define GRPCPP_IMPL_SERVICE_TYPE_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpcpp/impl/rpc_service_method.h>
 #include <grpcpp/impl/serialization_traits.h>
 #include <grpcpp/server_interface.h>
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 class CompletionQueue;
diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h
index c4aa00bc07d..dcd4dcd1e86 100644
--- a/include/grpcpp/impl/sync.h
+++ b/include/grpcpp/impl/sync.h
@@ -25,14 +25,14 @@
 #include <pthread.h>
 #endif
 
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+
 #include <mutex>
 
 #include "absl/log/absl_check.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 // The core library is not accessible in C++ codegen headers, and vice versa.
 // Thus, we need to have duplicate headers with similar functionality.
 // Make sure any change to this file is also reflected in
diff --git a/include/grpcpp/security/.clang-format b/include/grpcpp/security/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/security/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/security/alts_context.h b/include/grpcpp/security/alts_context.h
index 2f2de4e8824..04f1a0501c1 100644
--- a/include/grpcpp/security/alts_context.h
+++ b/include/grpcpp/security/alts_context.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_SECURITY_ALTS_CONTEXT_H
 #define GRPCPP_SECURITY_ALTS_CONTEXT_H
 
-#include <map>
-#include <memory>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/security/auth_context.h>
 
+#include <map>
+#include <memory>
+
 struct grpc_gcp_AltsContext;
 
 namespace grpc {
diff --git a/include/grpcpp/security/alts_util.h b/include/grpcpp/security/alts_util.h
index c196823d1a8..a3df6474589 100644
--- a/include/grpcpp/security/alts_util.h
+++ b/include/grpcpp/security/alts_util.h
@@ -19,13 +19,13 @@
 #ifndef GRPCPP_SECURITY_ALTS_UTIL_H
 #define GRPCPP_SECURITY_ALTS_UTIL_H
 
-#include <memory>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/security/alts_context.h>
 #include <grpcpp/security/auth_context.h>
 #include <grpcpp/support/status.h>
 
+#include <memory>
+
 struct grpc_gcp_AltsContext;
 
 namespace grpc {
diff --git a/include/grpcpp/security/audit_logging.h b/include/grpcpp/security/audit_logging.h
index b29464a6907..cec7aa23c90 100644
--- a/include/grpcpp/security/audit_logging.h
+++ b/include/grpcpp/security/audit_logging.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_SECURITY_AUDIT_LOGGING_H
 #define GRPCPP_SECURITY_AUDIT_LOGGING_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "absl/status/statusor.h"
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpcpp/support/string_ref.h>
-
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/security/auth_context.h b/include/grpcpp/security/auth_context.h
index f6e3fae481b..90dbb5535fa 100644
--- a/include/grpcpp/security/auth_context.h
+++ b/include/grpcpp/security/auth_context.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_SECURITY_AUTH_CONTEXT_H
 #define GRPCPP_SECURITY_AUTH_CONTEXT_H
 
-#include <iterator>
-#include <vector>
-
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <iterator>
+#include <vector>
+
 struct grpc_auth_context;
 struct grpc_auth_property;
 struct grpc_auth_property_iterator;
diff --git a/include/grpcpp/security/auth_metadata_processor.h b/include/grpcpp/security/auth_metadata_processor.h
index c491a13b198..aab59056bab 100644
--- a/include/grpcpp/security/auth_metadata_processor.h
+++ b/include/grpcpp/security/auth_metadata_processor.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_SECURITY_AUTH_METADATA_PROCESSOR_H
 #define GRPCPP_SECURITY_AUTH_METADATA_PROCESSOR_H
 
-#include <map>
-
 #include <grpcpp/security/auth_context.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <map>
+
 namespace grpc {
 
 /// Interface allowing custom server-side authorization based on credentials
diff --git a/include/grpcpp/security/authorization_policy_provider.h b/include/grpcpp/security/authorization_policy_provider.h
index fe4f2c19f23..9bd916ff4b6 100644
--- a/include/grpcpp/security/authorization_policy_provider.h
+++ b/include/grpcpp/security/authorization_policy_provider.h
@@ -15,12 +15,12 @@
 #ifndef GRPCPP_SECURITY_AUTHORIZATION_POLICY_PROVIDER_H
 #define GRPCPP_SECURITY_AUTHORIZATION_POLICY_PROVIDER_H
 
-#include <memory>
-
 #include <grpc/grpc_security.h>
 #include <grpc/status.h>
 #include <grpcpp/impl/codegen/status.h>
 
+#include <memory>
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/security/binder_credentials.h b/include/grpcpp/security/binder_credentials.h
index f511837ef2e..3c38b5129d5 100644
--- a/include/grpcpp/security/binder_credentials.h
+++ b/include/grpcpp/security/binder_credentials.h
@@ -15,11 +15,11 @@
 #ifndef GRPCPP_SECURITY_BINDER_CREDENTIALS_H
 #define GRPCPP_SECURITY_BINDER_CREDENTIALS_H
 
-#include <memory>
-
 #include <grpcpp/security/binder_security_policy.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
 namespace grpc {
 
 class ChannelCredentials;
diff --git a/include/grpcpp/security/credentials.h b/include/grpcpp/security/credentials.h
index d1f8c22846a..d3ff3c830d0 100644
--- a/include/grpcpp/security/credentials.h
+++ b/include/grpcpp/security/credentials.h
@@ -19,10 +19,6 @@
 #ifndef GRPCPP_SECURITY_CREDENTIALS_H
 #define GRPCPP_SECURITY_CREDENTIALS_H
 
-#include <map>
-#include <memory>
-#include <vector>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/impl/grpc_library.h>
@@ -33,6 +29,10 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <map>
+#include <memory>
+#include <vector>
+
 struct grpc_call;
 
 namespace grpc {
diff --git a/include/grpcpp/security/server_credentials.h b/include/grpcpp/security/server_credentials.h
index aa602cf4e64..d75c62bd648 100644
--- a/include/grpcpp/security/server_credentials.h
+++ b/include/grpcpp/security/server_credentials.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_SECURITY_SERVER_CREDENTIALS_H
 #define GRPCPP_SECURITY_SERVER_CREDENTIALS_H
 
-#include <memory>
-#include <vector>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/security/auth_metadata_processor.h>
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <vector>
+
 struct grpc_server;
 
 namespace grpc {
diff --git a/include/grpcpp/security/tls_certificate_provider.h b/include/grpcpp/security/tls_certificate_provider.h
index fc34d67a6d5..7912e4ccd26 100644
--- a/include/grpcpp/security/tls_certificate_provider.h
+++ b/include/grpcpp/security/tls_certificate_provider.h
@@ -17,12 +17,6 @@
 #ifndef GRPCPP_SECURITY_TLS_CERTIFICATE_PROVIDER_H
 #define GRPCPP_SECURITY_TLS_CERTIFICATE_PROVIDER_H
 
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "absl/status/statusor.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
@@ -30,6 +24,12 @@
 #include <grpc/support/port_platform.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "absl/status/statusor.h"
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/security/tls_certificate_verifier.h b/include/grpcpp/security/tls_certificate_verifier.h
index 5b87b1a42c6..34fbd998794 100644
--- a/include/grpcpp/security/tls_certificate_verifier.h
+++ b/include/grpcpp/security/tls_certificate_verifier.h
@@ -17,12 +17,6 @@
 #ifndef GRPCPP_SECURITY_TLS_CERTIFICATE_VERIFIER_H
 #define GRPCPP_SECURITY_TLS_CERTIFICATE_VERIFIER_H
 
-#include <functional>
-#include <map>
-#include <memory>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
 #include <grpcpp/impl/grpc_library.h>
@@ -31,6 +25,12 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <functional>
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
+
 // TODO(yihuazhang): remove the forward declaration here and include
 // <grpc/grpc_security.h> directly once the insecure builds are cleaned up.
 typedef struct grpc_tls_custom_verification_check_request
diff --git a/include/grpcpp/security/tls_credentials_options.h b/include/grpcpp/security/tls_credentials_options.h
index c47f348ccaa..b509af05c69 100644
--- a/include/grpcpp/security/tls_credentials_options.h
+++ b/include/grpcpp/security/tls_credentials_options.h
@@ -19,9 +19,6 @@
 #ifndef GRPCPP_SECURITY_TLS_CREDENTIALS_OPTIONS_H
 #define GRPCPP_SECURITY_TLS_CREDENTIALS_OPTIONS_H
 
-#include <memory>
-#include <vector>
-
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
@@ -30,6 +27,9 @@
 #include <grpcpp/security/tls_crl_provider.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <vector>
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/server.h b/include/grpcpp/server.h
index 3c56b6a06a2..37f71ff7d62 100644
--- a/include/grpcpp/server.h
+++ b/include/grpcpp/server.h
@@ -19,10 +19,6 @@
 #ifndef GRPCPP_SERVER_H
 #define GRPCPP_SERVER_H
 
-#include <list>
-#include <memory>
-#include <vector>
-
 #include <grpc/compression.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
@@ -39,6 +35,10 @@
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 
+#include <list>
+#include <memory>
+#include <vector>
+
 struct grpc_server;
 
 namespace grpc {
diff --git a/include/grpcpp/server_builder.h b/include/grpcpp/server_builder.h
index 787cb20af7d..118861fa063 100644
--- a/include/grpcpp/server_builder.h
+++ b/include/grpcpp/server_builder.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_SERVER_BUILDER_H
 #define GRPCPP_SERVER_BUILDER_H
 
-#include <climits>
-#include <map>
-#include <memory>
-#include <vector>
-
 #include <grpc/compression.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/passive_listener.h>
@@ -40,6 +35,11 @@
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/server_interceptor.h>
 
+#include <climits>
+#include <map>
+#include <memory>
+#include <vector>
+
 struct grpc_resource_quota;
 
 namespace grpc {
diff --git a/include/grpcpp/server_context.h b/include/grpcpp/server_context.h
index eb72e36b4af..00a3709f1dc 100644
--- a/include/grpcpp/server_context.h
+++ b/include/grpcpp/server_context.h
@@ -19,13 +19,6 @@
 #ifndef GRPCPP_SERVER_CONTEXT_H
 #define GRPCPP_SERVER_CONTEXT_H
 
-#include <atomic>
-#include <cassert>
-#include <map>
-#include <memory>
-#include <type_traits>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/impl/call.h>
 #include <grpc/impl/compression_types.h>
@@ -47,6 +40,13 @@
 #include <grpcpp/support/string_ref.h>
 #include <grpcpp/support/time.h>
 
+#include <atomic>
+#include <cassert>
+#include <map>
+#include <memory>
+#include <type_traits>
+#include <vector>
+
 struct grpc_metadata;
 struct grpc_call;
 struct census_context;
diff --git a/include/grpcpp/server_interface.h b/include/grpcpp/server_interface.h
index 9791ee3589c..3e6680f1767 100644
--- a/include/grpcpp/server_interface.h
+++ b/include/grpcpp/server_interface.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SERVER_INTERFACE_H
 #define GRPCPP_SERVER_INTERFACE_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
@@ -33,6 +31,8 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/byte_buffer.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 class AsyncGenericService;
diff --git a/include/grpcpp/server_posix.h b/include/grpcpp/server_posix.h
index 8132c01cf94..0ccf560e063 100644
--- a/include/grpcpp/server_posix.h
+++ b/include/grpcpp/server_posix.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_SERVER_POSIX_H
 #define GRPCPP_SERVER_POSIX_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/server.h>
 
+#include <memory>
+
 namespace grpc {
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
diff --git a/include/grpcpp/support/.clang-format b/include/grpcpp/support/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/support/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/support/async_stream.h b/include/grpcpp/support/async_stream.h
index c4cbb9dbb43..931d321a982 100644
--- a/include/grpcpp/support/async_stream.h
+++ b/include/grpcpp/support/async_stream.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SUPPORT_ASYNC_STREAM_H
 #define GRPCPP_SUPPORT_ASYNC_STREAM_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/channel_interface.h>
@@ -28,6 +26,8 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/support/async_unary_call.h b/include/grpcpp/support/async_unary_call.h
index a03a9b28382..b50798ae7cf 100644
--- a/include/grpcpp/support/async_unary_call.h
+++ b/include/grpcpp/support/async_unary_call.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SUPPORT_ASYNC_UNARY_CALL_H
 #define GRPCPP_SUPPORT_ASYNC_UNARY_CALL_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/impl/call.h>
@@ -31,6 +29,8 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 // Forward declaration for use in Helper class
diff --git a/include/grpcpp/support/byte_buffer.h b/include/grpcpp/support/byte_buffer.h
index 676d3cfad7e..c60326f036a 100644
--- a/include/grpcpp/support/byte_buffer.h
+++ b/include/grpcpp/support/byte_buffer.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SUPPORT_BYTE_BUFFER_H
 #define GRPCPP_SUPPORT_BYTE_BUFFER_H
 
-#include <vector>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpcpp/impl/serialization_traits.h>
@@ -28,6 +26,8 @@
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
 
+#include <vector>
+
 namespace grpc {
 
 class ServerInterface;
diff --git a/include/grpcpp/support/callback_common.h b/include/grpcpp/support/callback_common.h
index 49eaa56172a..b4ba1e7baa5 100644
--- a/include/grpcpp/support/callback_common.h
+++ b/include/grpcpp/support/callback_common.h
@@ -19,10 +19,6 @@
 #ifndef GRPCPP_SUPPORT_CALLBACK_COMMON_H
 #define GRPCPP_SUPPORT_CALLBACK_COMMON_H
 
-#include <functional>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/impl/call.h>
@@ -32,6 +28,10 @@
 #include <grpcpp/support/global_callback_hook.h>
 #include <grpcpp/support/status.h>
 
+#include <functional>
+
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 namespace internal {
 
diff --git a/include/grpcpp/support/channel_arguments.h b/include/grpcpp/support/channel_arguments.h
index a149a6d72ba..c0858dbc623 100644
--- a/include/grpcpp/support/channel_arguments.h
+++ b/include/grpcpp/support/channel_arguments.h
@@ -19,14 +19,14 @@
 #ifndef GRPCPP_SUPPORT_CHANNEL_ARGUMENTS_H
 #define GRPCPP_SUPPORT_CHANNEL_ARGUMENTS_H
 
-#include <list>
-#include <vector>
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/support/config.h>
 
+#include <list>
+#include <vector>
+
 namespace grpc {
 class ChannelCredentials;
 namespace testing {
diff --git a/include/grpcpp/support/client_callback.h b/include/grpcpp/support/client_callback.h
index 82a404e2c87..88de62b6d9a 100644
--- a/include/grpcpp/support/client_callback.h
+++ b/include/grpcpp/support/client_callback.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_SUPPORT_CLIENT_CALLBACK_H
 #define GRPCPP_SUPPORT_CLIENT_CALLBACK_H
 
-#include <atomic>
-#include <functional>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/call.h>
 #include <grpcpp/impl/call.h>
@@ -33,6 +28,11 @@
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 
+#include <atomic>
+#include <functional>
+
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 class Channel;
 class ClientContext;
diff --git a/include/grpcpp/support/client_interceptor.h b/include/grpcpp/support/client_interceptor.h
index fbf554437bf..b00101f9b5c 100644
--- a/include/grpcpp/support/client_interceptor.h
+++ b/include/grpcpp/support/client_interceptor.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_SUPPORT_CLIENT_INTERCEPTOR_H
 #define GRPCPP_SUPPORT_CLIENT_INTERCEPTOR_H
 
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/interceptor.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <memory>
 #include <vector>
 
 #include "absl/log/absl_check.h"
 
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/interceptor.h>
-#include <grpcpp/support/string_ref.h>
-
 namespace grpc {
 
 class Channel;
diff --git a/include/grpcpp/support/interceptor.h b/include/grpcpp/support/interceptor.h
index 1e4d66610f6..04a4b34c4e2 100644
--- a/include/grpcpp/support/interceptor.h
+++ b/include/grpcpp/support/interceptor.h
@@ -19,16 +19,16 @@
 #ifndef GRPCPP_SUPPORT_INTERCEPTOR_H
 #define GRPCPP_SUPPORT_INTERCEPTOR_H
 
-#include <map>
-#include <memory>
-#include <string>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/impl/metadata_map.h>
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <map>
+#include <memory>
+#include <string>
+
 namespace grpc {
 
 class ChannelInterface;
diff --git a/include/grpcpp/support/method_handler.h b/include/grpcpp/support/method_handler.h
index 081401b187b..a61843bdb86 100644
--- a/include/grpcpp/support/method_handler.h
+++ b/include/grpcpp/support/method_handler.h
@@ -19,13 +19,13 @@
 #ifndef GRPCPP_SUPPORT_METHOD_HANDLER_H
 #define GRPCPP_SUPPORT_METHOD_HANDLER_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpcpp/impl/rpc_service_method.h>
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/sync_stream.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/support/proto_buffer_reader.h b/include/grpcpp/support/proto_buffer_reader.h
index 7bdf8d13d72..5f5be2cd0d9 100644
--- a/include/grpcpp/support/proto_buffer_reader.h
+++ b/include/grpcpp/support/proto_buffer_reader.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_SUPPORT_PROTO_BUFFER_READER_H
 #define GRPCPP_SUPPORT_PROTO_BUFFER_READER_H
 
-#include <type_traits>
-
-#include "absl/log/absl_check.h"
-#include "absl/strings/cord.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/impl/grpc_types.h>
@@ -33,6 +28,11 @@
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/status.h>
 
+#include <type_traits>
+
+#include "absl/log/absl_check.h"
+#include "absl/strings/cord.h"
+
 /// This header provides an object that reads bytes directly from a
 /// grpc::ByteBuffer, via the ZeroCopyInputStream interface
 
diff --git a/include/grpcpp/support/proto_buffer_writer.h b/include/grpcpp/support/proto_buffer_writer.h
index 1417a619911..225c8555fb9 100644
--- a/include/grpcpp/support/proto_buffer_writer.h
+++ b/include/grpcpp/support/proto_buffer_writer.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_SUPPORT_PROTO_BUFFER_WRITER_H
 #define GRPCPP_SUPPORT_PROTO_BUFFER_WRITER_H
 
-#include <type_traits>
-
-#include "absl/log/absl_check.h"
-#include "absl/strings/cord.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/slice.h>
@@ -33,6 +28,11 @@
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/status.h>
 
+#include <type_traits>
+
+#include "absl/log/absl_check.h"
+#include "absl/strings/cord.h"
+
 /// This header provides an object that writes bytes directly into a
 /// grpc::ByteBuffer, via the ZeroCopyOutputStream interface
 
diff --git a/include/grpcpp/support/server_callback.h b/include/grpcpp/support/server_callback.h
index e5fd910701a..378e88006bf 100644
--- a/include/grpcpp/support/server_callback.h
+++ b/include/grpcpp/support/server_callback.h
@@ -19,12 +19,6 @@
 #ifndef GRPCPP_SUPPORT_SERVER_CALLBACK_H
 #define GRPCPP_SUPPORT_SERVER_CALLBACK_H
 
-#include <atomic>
-#include <functional>
-#include <type_traits>
-
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/impl/call.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/call_op_set.h>
@@ -34,6 +28,12 @@
 #include <grpcpp/support/message_allocator.h>
 #include <grpcpp/support/status.h>
 
+#include <atomic>
+#include <functional>
+#include <type_traits>
+
+#include "absl/functional/any_invocable.h"
+
 namespace grpc {
 
 // Declare base class of all reactors as internal
diff --git a/include/grpcpp/support/server_interceptor.h b/include/grpcpp/support/server_interceptor.h
index de875a347f1..d705e740334 100644
--- a/include/grpcpp/support/server_interceptor.h
+++ b/include/grpcpp/support/server_interceptor.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_SUPPORT_SERVER_INTERCEPTOR_H
 #define GRPCPP_SUPPORT_SERVER_INTERCEPTOR_H
 
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/interceptor.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <atomic>
 #include <vector>
 
 #include "absl/log/absl_check.h"
 
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/interceptor.h>
-#include <grpcpp/support/string_ref.h>
-
 namespace grpc {
 class ServerContextBase;
 namespace internal {
diff --git a/include/grpcpp/support/string_ref.h b/include/grpcpp/support/string_ref.h
index 380ceee2ffb..deb96b90d9f 100644
--- a/include/grpcpp/support/string_ref.h
+++ b/include/grpcpp/support/string_ref.h
@@ -19,6 +19,7 @@
 #ifndef GRPCPP_SUPPORT_STRING_REF_H
 #define GRPCPP_SUPPORT_STRING_REF_H
 
+#include <grpcpp/support/config.h>
 #include <string.h>
 
 #include <algorithm>
@@ -26,8 +27,6 @@
 #include <iostream>
 #include <iterator>
 
-#include <grpcpp/support/config.h>
-
 namespace grpc {
 
 /// This class is a non owning reference to a string.
diff --git a/include/grpcpp/support/sync_stream.h b/include/grpcpp/support/sync_stream.h
index 7479adb25c1..cacf605a979 100644
--- a/include/grpcpp/support/sync_stream.h
+++ b/include/grpcpp/support/sync_stream.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SUPPORT_SYNC_STREAM_H
 #define GRPCPP_SUPPORT_SYNC_STREAM_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpcpp/client_context.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/call.h>
@@ -29,6 +27,8 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/support/time.h b/include/grpcpp/support/time.h
index 5397eb6ba24..41edfb5fd90 100644
--- a/include/grpcpp/support/time.h
+++ b/include/grpcpp/support/time.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_SUPPORT_TIME_H
 #define GRPCPP_SUPPORT_TIME_H
 
-#include <chrono>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/support/config.h>
 
+#include <chrono>
+
 namespace grpc {
 
 /// If you are trying to use CompletionQueue::AsyncNext with a time class that
diff --git a/include/grpcpp/test/client_context_test_peer.h b/include/grpcpp/test/client_context_test_peer.h
index 9cb1f683787..632575b6314 100644
--- a/include/grpcpp/test/client_context_test_peer.h
+++ b/include/grpcpp/test/client_context_test_peer.h
@@ -19,10 +19,10 @@
 #ifndef GRPCPP_TEST_CLIENT_CONTEXT_TEST_PEER_H
 #define GRPCPP_TEST_CLIENT_CONTEXT_TEST_PEER_H
 
-#include <map>
-
 #include <grpcpp/client_context.h>
 
+#include <map>
+
 namespace grpc {
 namespace testing {
 
diff --git a/include/grpcpp/test/mock_stream.h b/include/grpcpp/test/mock_stream.h
index 7c39358d949..6ab61ff0dba 100644
--- a/include/grpcpp/test/mock_stream.h
+++ b/include/grpcpp/test/mock_stream.h
@@ -19,14 +19,12 @@
 #ifndef GRPCPP_TEST_MOCK_STREAM_H
 #define GRPCPP_TEST_MOCK_STREAM_H
 
-#include <stdint.h>
-
 #include <gmock/gmock.h>
-
 #include <grpcpp/impl/call.h>
 #include <grpcpp/support/async_stream.h>
 #include <grpcpp/support/async_unary_call.h>
 #include <grpcpp/support/sync_stream.h>
+#include <stdint.h>
 
 namespace grpc {
 namespace testing {
diff --git a/include/grpcpp/test/server_context_test_spouse.h b/include/grpcpp/test/server_context_test_spouse.h
index 88dc7205588..c68f1a94cc7 100644
--- a/include/grpcpp/test/server_context_test_spouse.h
+++ b/include/grpcpp/test/server_context_test_spouse.h
@@ -19,10 +19,10 @@
 #ifndef GRPCPP_TEST_SERVER_CONTEXT_TEST_SPOUSE_H
 #define GRPCPP_TEST_SERVER_CONTEXT_TEST_SPOUSE_H
 
-#include <map>
-
 #include <grpcpp/server_context.h>
 
+#include <map>
+
 namespace grpc {
 namespace testing {
 
diff --git a/src/.clang-format b/src/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/compiler/.clang-format b/src/compiler/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/compiler/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc
index 2a2a9ebc0d2..530dfddedf5 100644
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@@ -18,12 +18,12 @@
 
 #include "src/compiler/objective_c_generator.h"
 
+#include <google/protobuf/compiler/objectivec/names.h>
+
 #include <map>
 #include <set>
 #include <sstream>
 
-#include <google/protobuf/compiler/objectivec/names.h>
-
 #include "src/compiler/config.h"
 #include "src/compiler/objective_c_generator_helpers.h"
 
diff --git a/src/compiler/objective_c_generator_helpers.h b/src/compiler/objective_c_generator_helpers.h
index 8490ecf6a0c..1337863f9dd 100644
--- a/src/compiler/objective_c_generator_helpers.h
+++ b/src/compiler/objective_c_generator_helpers.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H
 #define GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H
 
-#include <map>
-
 #include <google/protobuf/compiler/objectivec/names.h>
 
+#include <map>
+
 #include "src/compiler/config.h"
 #include "src/compiler/generator_helpers.h"
 
diff --git a/src/compiler/objective_c_plugin.cc b/src/compiler/objective_c_plugin.cc
index 4b0f2964212..1d886fcf1d5 100644
--- a/src/compiler/objective_c_plugin.cc
+++ b/src/compiler/objective_c_plugin.cc
@@ -18,10 +18,10 @@
 
 // Generates Objective C gRPC service interface out of Protobuf IDL.
 
-#include <memory>
-
 #include <google/protobuf/compiler/objectivec/names.h>
 
+#include <memory>
+
 #include "src/compiler/config.h"
 #include "src/compiler/objective_c_generator.h"
 #include "src/compiler/objective_c_generator_helpers.h"
diff --git a/src/compiler/php_generator.cc b/src/compiler/php_generator.cc
index 7ef2891c488..338b5b602cf 100644
--- a/src/compiler/php_generator.cc
+++ b/src/compiler/php_generator.cc
@@ -16,10 +16,10 @@
  *
  */
 
-#include <map>
-
 #include <google/protobuf/compiler/php/php_generator.h>
 
+#include <map>
+
 #include "src/compiler/config.h"
 #include "src/compiler/generator_helpers.h"
 #include "src/compiler/php_generator_helpers.h"
diff --git a/src/core/.clang-format b/src/core/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/channelz/channel_trace.cc b/src/core/channelz/channel_trace.cc
index ee1de5e87c5..78d7e049009 100644
--- a/src/core/channelz/channel_trace.cc
+++ b/src/core/channelz/channel_trace.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/channelz/channel_trace.h"
 
-#include <memory>
-#include <utility>
-
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <utility>
+
+#include "absl/strings/str_cat.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/channelz/channel_trace.h b/src/core/channelz/channel_trace.h
index 82ac733e4c7..c9e42094379 100644
--- a/src/core/channelz/channel_trace.h
+++ b/src/core/channelz/channel_trace.h
@@ -19,15 +19,13 @@
 #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNEL_TRACE_H
 #define GRPC_SRC_CORE_CHANNELZ_CHANNEL_TRACE_H
 
-#include <stddef.h>
-#include <stdint.h>
-
-#include "absl/base/thread_annotations.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
+#include <stdint.h>
 
+#include "absl/base/thread_annotations.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/channelz/channelz.cc b/src/core/channelz/channelz.cc
index ef27e51ffbf..1a8aa222a72 100644
--- a/src/core/channelz/channelz.cc
+++ b/src/core/channelz/channelz.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/channelz/channelz.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <algorithm>
 #include <atomic>
 #include <cstdint>
@@ -27,11 +31,6 @@
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz_registry.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/src/core/channelz/channelz.h b/src/core/channelz/channelz.h
index 6938ec99437..316e96fba74 100644
--- a/src/core/channelz/channelz.h
+++ b/src/core/channelz/channelz.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNELZ_H
 #define GRPC_SRC_CORE_CHANNELZ_CHANNELZ_H
 
+#include <grpc/grpc.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -31,12 +35,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/per_cpu.h"
diff --git a/src/core/channelz/channelz_registry.cc b/src/core/channelz/channelz_registry.cc
index 4393675c831..6db28fa7514 100644
--- a/src/core/channelz/channelz_registry.cc
+++ b/src/core/channelz/channelz_registry.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/channelz/channelz_registry.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
@@ -26,12 +31,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/channelz/channelz_registry.h b/src/core/channelz/channelz_registry.h
index f849ac1ac84..eeb6a47d788 100644
--- a/src/core/channelz/channelz_registry.h
+++ b/src/core/channelz/channelz_registry.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNELZ_REGISTRY_H
 #define GRPC_SRC_CORE_CHANNELZ_CHANNELZ_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <map>
 #include <string>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/client_channel/.clang-format b/src/core/client_channel/.clang-format
deleted file mode 100644
index 64387e9e515..00000000000
--- a/src/core/client_channel/.clang-format
+++ /dev/null
@@ -1,53 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # port_platform.h is before almost everything
-  - Regex: '^<grpc/(support|impl/codegen)/port_platform.h>'
-    Priority: -100
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/client_channel/backup_poller.cc b/src/core/client_channel/backup_poller.cc
index 37914688a7e..43b485dc7ef 100644
--- a/src/core/client_channel/backup_poller.cc
+++ b/src/core/client_channel/backup_poller.cc
@@ -16,18 +16,15 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/backup_poller.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <inttypes.h>
 
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc
index 0d12c4b292a..315befd72ef 100644
--- a/src/core/client_channel/client_channel.cc
+++ b/src/core/client_channel/client_channel.cc
@@ -12,10 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/metrics.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <limits.h>
 
@@ -38,16 +45,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpc/support/metrics.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/client_channel_service_config.h"
 #include "src/core/client_channel/config_selector.h"
diff --git a/src/core/client_channel/client_channel.h b/src/core/client_channel/client_channel.h
index a7f7d75c705..662274446ad 100644
--- a/src/core/client_channel/client_channel.h
+++ b/src/core/client_channel/client_channel.h
@@ -22,7 +22,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/config_selector.h"
 #include "src/core/client_channel/subchannel.h"
diff --git a/src/core/client_channel/client_channel_factory.cc b/src/core/client_channel/client_channel_factory.cc
index 39b5c20e97e..615950a599e 100644
--- a/src/core/client_channel/client_channel_factory.cc
+++ b/src/core/client_channel/client_channel_factory.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_factory.h"
 
+#include <grpc/support/port_platform.h>
+
 // Channel arg key for client channel factory.
 #define GRPC_ARG_CLIENT_CHANNEL_FACTORY "grpc.client_channel_factory"
 
diff --git a/src/core/client_channel/client_channel_factory.h b/src/core/client_channel/client_channel_factory.h
index fee6cd9f628..9e8ca146e0e 100644
--- a/src/core/client_channel/client_channel_factory.h
+++ b/src/core/client_channel/client_channel_factory.h
@@ -20,7 +20,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc
index 82caeb27ffc..6b87eb436c7 100644
--- a/src/core/client_channel/client_channel_filter.cc
+++ b/src/core/client_channel/client_channel_filter.cc
@@ -14,10 +14,16 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <limits.h>
 
@@ -41,15 +47,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/client_channel/client_channel_internal.h"
diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h
index 0ca401df455..c2318360fba 100644
--- a/src/core/client_channel/client_channel_filter.h
+++ b/src/core/client_channel/client_channel_filter.h
@@ -17,8 +17,9 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H
 
+#include <grpc/grpc.h>
+#include <grpc/impl/connectivity_state.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <atomic>
@@ -33,10 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/config_selector.h"
diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h
index 1806bf057c9..99e045c0047 100644
--- a/src/core/client_channel/client_channel_internal.h
+++ b/src/core/client_channel/client_channel_internal.h
@@ -23,7 +23,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/call_destination.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/src/core/client_channel/client_channel_plugin.cc b/src/core/client_channel/client_channel_plugin.cc
index ccec049b6eb..afb99741950 100644
--- a/src/core/client_channel/client_channel_plugin.cc
+++ b/src/core/client_channel/client_channel_plugin.cc
@@ -16,12 +16,10 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/client_channel_service_config.h"
 #include "src/core/client_channel/retry_service_config.h"
diff --git a/src/core/client_channel/client_channel_service_config.cc b/src/core/client_channel/client_channel_service_config.cc
index af08f54a956..07d34b12d44 100644
--- a/src/core/client_channel/client_channel_service_config.cc
+++ b/src/core/client_channel/client_channel_service_config.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_service_config.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <utility>
 
@@ -26,7 +26,6 @@
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
 #include "src/core/load_balancing/lb_policy_registry.h"
 
 // As per the retry design, we do not allow more than 5 retry attempts.
diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h
index e985b8e92e0..6d33d11b170 100644
--- a/src/core/client_channel/client_channel_service_config.h
+++ b/src/core/client_channel/client_channel_service_config.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <memory>
@@ -26,7 +25,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/src/core/client_channel/config_selector.h b/src/core/client_channel/config_selector.h
index 76572369fe4..2901ee471bd 100644
--- a/src/core/client_channel/config_selector.h
+++ b/src/core/client_channel/config_selector.h
@@ -17,8 +17,8 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H
 
+#include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
-
 #include <string.h>
 
 #include <utility>
@@ -27,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc
index c2825925fa4..93a3c49d957 100644
--- a/src/core/client_channel/dynamic_filters.cc
+++ b/src/core/client_channel/dynamic_filters.cc
@@ -14,10 +14,9 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/dynamic_filters.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <new>
@@ -26,7 +25,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.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_impl.h"
diff --git a/src/core/client_channel/dynamic_filters.h b/src/core/client_channel/dynamic_filters.h
index 30a5354f935..505ca293ead 100644
--- a/src/core/client_channel/dynamic_filters.h
+++ b/src/core/client_channel/dynamic_filters.h
@@ -17,13 +17,12 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
 
+#include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
 
 #include <utility>
 #include <vector>
 
-#include <grpc/slice.h>
-
 #include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/client_channel/global_subchannel_pool.cc b/src/core/client_channel/global_subchannel_pool.cc
index 2f3ecf9faeb..5b6ffe85a22 100644
--- a/src/core/client_channel/global_subchannel_pool.cc
+++ b/src/core/client_channel/global_subchannel_pool.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/global_subchannel_pool.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "src/core/client_channel/subchannel.h"
diff --git a/src/core/client_channel/global_subchannel_pool.h b/src/core/client_channel/global_subchannel_pool.h
index 76ef31af385..79ea6672796 100644
--- a/src/core/client_channel/global_subchannel_pool.h
+++ b/src/core/client_channel/global_subchannel_pool.h
@@ -24,7 +24,6 @@
 #include <map>
 
 #include "absl/base/thread_annotations.h"
-
 #include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/client_channel/lb_metadata.h b/src/core/client_channel/lb_metadata.h
index f1c5e7e429f..f41510120a5 100644
--- a/src/core/client_channel/lb_metadata.h
+++ b/src/core/client_channel/lb_metadata.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H
 
+#include <grpc/event_engine/slice.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/slice.h>
-
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/load_balancing/lb_policy.h"
 
diff --git a/src/core/client_channel/load_balanced_call_destination.cc b/src/core/client_channel/load_balanced_call_destination.cc
index 5d7c0b3c66c..2415e367ccc 100644
--- a/src/core/client_channel/load_balanced_call_destination.cc
+++ b/src/core/client_channel/load_balanced_call_destination.cc
@@ -15,7 +15,6 @@
 #include "src/core/client_channel/load_balanced_call_destination.h"
 
 #include "absl/log/log.h"
-
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/lb_metadata.h"
diff --git a/src/core/client_channel/load_balanced_call_destination.h b/src/core/client_channel/load_balanced_call_destination.h
index 2adbdbe3dc3..904ff47e1ec 100644
--- a/src/core/client_channel/load_balanced_call_destination.h
+++ b/src/core/client_channel/load_balanced_call_destination.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_LOAD_BALANCED_CALL_DESTINATION_H
 
 #include "absl/functional/any_invocable.h"
-
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/transport/call_destination.h"
diff --git a/src/core/client_channel/local_subchannel_pool.cc b/src/core/client_channel/local_subchannel_pool.cc
index 878d3547b96..428db14bdf9 100644
--- a/src/core/client_channel/local_subchannel_pool.cc
+++ b/src/core/client_channel/local_subchannel_pool.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/local_subchannel_pool.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
-
 #include "src/core/client_channel/subchannel.h"
 
 namespace grpc_core {
diff --git a/src/core/client_channel/retry_filter.cc b/src/core/client_channel/retry_filter.cc
index 73de1a4ebe1..f4bf99d5c5c 100644
--- a/src/core/client_channel/retry_filter.cc
+++ b/src/core/client_channel/retry_filter.cc
@@ -14,18 +14,16 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/retry_filter.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/retry_filter_legacy_call_data.h"
 #include "src/core/client_channel/retry_service_config.h"
diff --git a/src/core/client_channel/retry_filter.h b/src/core/client_channel/retry_filter.h
index 402fa047691..1ed87fbc989 100644
--- a/src/core/client_channel/retry_filter.h
+++ b/src/core/client_channel/retry_filter.h
@@ -17,8 +17,10 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
-
 #include <limits.h>
 #include <stddef.h>
 
@@ -26,11 +28,6 @@
 
 #include "absl/log/check.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/retry_service_config.h"
 #include "src/core/client_channel/retry_throttle.h"
diff --git a/src/core/client_channel/retry_filter_legacy_call_data.cc b/src/core/client_channel/retry_filter_legacy_call_data.cc
index dda37fd4c62..7e3abc4a5a8 100644
--- a/src/core/client_channel/retry_filter_legacy_call_data.cc
+++ b/src/core/client_channel/retry_filter_legacy_call_data.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/retry_filter_legacy_call_data.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <memory>
@@ -25,7 +24,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/retry_service_config.h"
 #include "src/core/client_channel/retry_throttle.h"
diff --git a/src/core/client_channel/retry_filter_legacy_call_data.h b/src/core/client_channel/retry_filter_legacy_call_data.h
index a4336072f1b..b121a8735bc 100644
--- a/src/core/client_channel/retry_filter_legacy_call_data.h
+++ b/src/core/client_channel/retry_filter_legacy_call_data.h
@@ -15,8 +15,10 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -25,11 +27,6 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/retry_filter.h"
 #include "src/core/client_channel/retry_service_config.h"
diff --git a/src/core/client_channel/retry_service_config.cc b/src/core/client_channel/retry_service_config.cc
index e0ee89ce140..01e4c867ea9 100644
--- a/src/core/client_channel/retry_service_config.cc
+++ b/src/core/client_channel/retry_service_config.cc
@@ -14,10 +14,13 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/retry_service_config.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 #include <utility>
@@ -27,11 +30,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h
index 237e3b93bcc..91c6fe52dc9 100644
--- a/src/core/client_channel/retry_service_config.h
+++ b/src/core/client_channel/retry_service_config.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,7 +25,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/client_channel/retry_throttle.cc b/src/core/client_channel/retry_throttle.cc
index c9671832309..a631a8c47dd 100644
--- a/src/core/client_channel/retry_throttle.cc
+++ b/src/core/client_channel/retry_throttle.cc
@@ -16,16 +16,15 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/retry_throttle.h"
 
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 #include <utility>
 
-#include <grpc/support/atm.h>
-
 namespace grpc_core {
 namespace internal {
 
diff --git a/src/core/client_channel/retry_throttle.h b/src/core/client_channel/retry_throttle.h
index 3cb32604277..fd01471d673 100644
--- a/src/core/client_channel/retry_throttle.h
+++ b/src/core/client_channel/retry_throttle.h
@@ -19,17 +19,14 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_THROTTLE_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_THROTTLE_H
 
+#include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <map>
 #include <string>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/atm.h>
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc
index 26f76b77709..56918f0f294 100644
--- a/src/core/client_channel/subchannel.cc
+++ b/src/core/client_channel/subchannel.cc
@@ -14,10 +14,12 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <limits.h>
 
@@ -33,11 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_internal.h"
diff --git a/src/core/client_channel/subchannel.h b/src/core/client_channel/subchannel.h
index 06a414363b1..41928e95300 100644
--- a/src/core/client_channel/subchannel.h
+++ b/src/core/client_channel/subchannel.h
@@ -17,8 +17,9 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <functional>
@@ -27,10 +28,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-
 #include "src/core/client_channel/connector.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/src/core/client_channel/subchannel_pool_interface.cc b/src/core/client_channel/subchannel_pool_interface.cc
index 7b083a8b47a..bc55e478008 100644
--- a/src/core/client_channel/subchannel_pool_interface.cc
+++ b/src/core/client_channel/subchannel_pool_interface.cc
@@ -16,16 +16,14 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel_pool_interface.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 
diff --git a/src/core/client_channel/subchannel_pool_interface.h b/src/core/client_channel/subchannel_pool_interface.h
index d7cab8f1e99..ca385d1e591 100644
--- a/src/core/client_channel/subchannel_pool_interface.h
+++ b/src/core/client_channel/subchannel_pool_interface.h
@@ -24,7 +24,6 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/src/core/client_channel/subchannel_stream_client.cc b/src/core/client_channel/subchannel_stream_client.cc
index a01165e3d11..205daac3d96 100644
--- a/src/core/client_channel/subchannel_stream_client.cc
+++ b/src/core/client_channel/subchannel_stream_client.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel_stream_client.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdio.h>
 
@@ -25,9 +25,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/src/core/client_channel/subchannel_stream_client.h b/src/core/client_channel/subchannel_stream_client.h
index f50314e0ace..0f530c17f36 100644
--- a/src/core/client_channel/subchannel_stream_client.h
+++ b/src/core/client_channel/subchannel_stream_client.h
@@ -17,6 +17,10 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 
 #include <atomic>
@@ -26,12 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/ext/.clang-format b/src/core/ext/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/ext/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/filters/.clang-format b/src/core/ext/filters/.clang-format
deleted file mode 100644
index 64387e9e515..00000000000
--- a/src/core/ext/filters/.clang-format
+++ /dev/null
@@ -1,53 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # port_platform.h is before almost everything
-  - Regex: '^<grpc/(support|impl/codegen)/port_platform.h>'
-    Priority: -100
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
index da589a303b7..8d5e559e7a5 100644
--- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
+++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/backend_metrics/backend_metric_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -26,12 +26,6 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-#include "xds/data/orca/v3/orca_load_report.upb.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/config/core_configuration.h"
@@ -44,6 +38,9 @@
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/util/latent_see.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
+#include "xds/data/orca/v3/orca_load_report.upb.h"
 
 namespace grpc_core {
 
diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.h b/src/core/ext/filters/backend_metrics/backend_metric_filter.h
index 02ee8611dce..c2d630a155a 100644
--- a/src/core/ext/filters/backend_metrics/backend_metric_filter.h
+++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.h
@@ -21,7 +21,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
 #include "src/core/ext/filters/backend_metrics/backend_metric_provider.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/ext/filters/census/grpc_context.cc b/src/core/ext/filters/census/grpc_context.cc
index 77965df7ecd..42d72df6523 100644
--- a/src/core/ext/filters/census/grpc_context.cc
+++ b/src/core/ext/filters/census/grpc_context.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/census.h>
 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/surface/call.h"
diff --git a/src/core/ext/filters/channel_idle/idle_filter_state.cc b/src/core/ext/filters/channel_idle/idle_filter_state.cc
index 72b5448a1e5..2fbc8365067 100644
--- a/src/core/ext/filters/channel_idle/idle_filter_state.cc
+++ b/src/core/ext/filters/channel_idle/idle_filter_state.cc
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/channel_idle/idle_filter_state.h"
 
 #include <assert.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_core {
 
diff --git a/src/core/ext/filters/channel_idle/idle_filter_state.h b/src/core/ext/filters/channel_idle/idle_filter_state.h
index f921e082fcd..772d4a0b6c3 100644
--- a/src/core/ext/filters/channel_idle/idle_filter_state.h
+++ b/src/core/ext/filters/channel_idle/idle_filter_state.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_IDLE_FILTER_STATE_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <atomic>
diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
index bc4e834a10d..968386bec8a 100644
--- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
+++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
@@ -15,10 +15,11 @@
 // TODO(ctiller): Add a unit test suite for these filters once it's practical to
 // mock transport operations.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <utility>
 
@@ -27,9 +28,6 @@
 #include "absl/random/random.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
index b4b61f10bb3..b903b41f766 100644
--- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
+++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
@@ -15,15 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_LEGACY_CHANNEL_IDLE_FILTER_H
 #define GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_LEGACY_CHANNEL_IDLE_FILTER_H
 
+#include <grpc/impl/connectivity_state.h>
 #include <grpc/support/port_platform.h>
 
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/impl/connectivity_state.h>
-
 #include "src/core/ext/filters/channel_idle/idle_filter_state.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc
index e0e4d3e031b..72429fea9d6 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc
+++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -35,9 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/status.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/status_util.h"
diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.h b/src/core/ext/filters/fault_injection/fault_injection_filter.h
index 40b839c1033..c7e04a470fd 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_filter.h
+++ b/src/core/ext/filters/fault_injection/fault_injection_filter.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <memory>
@@ -26,7 +25,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/random/random.h"
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc
index 9e12ce0b093..6ecb24f856b 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc
+++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <vector>
 
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/status_util.h"
 
diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h
index 0016c552c8e..f2c4769ccc6 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h
+++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h
@@ -17,8 +17,8 @@
 #ifndef GRPC_SRC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_SERVICE_CONFIG_PARSER_H
 #define GRPC_SRC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_SERVICE_CONFIG_PARSER_H
 
+#include <grpc/status.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -28,9 +28,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
index e301ed62154..61a6a84a64e 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
@@ -22,7 +22,6 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
index a3136ebd460..66f8d13d4da 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
@@ -23,7 +23,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
 #include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc
index 4af33e528f7..2fb9fd2f55c 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <vector>
 
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h
index 2c64a694485..36637d580b3 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h
@@ -25,7 +25,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc
index f46b3641b61..cd91e931e56 100644
--- a/src/core/ext/filters/http/client/http_client_filter.cc
+++ b/src/core/ext/filters/http/client/http_client_filter.cc
@@ -15,10 +15,13 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <functional>
 #include <memory>
@@ -33,11 +36,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/promise/context.h"
diff --git a/src/core/ext/filters/http/client/http_client_filter.h b/src/core/ext/filters/http/client/http_client_filter.h
index 0b319cec303..05f6c14fe90 100644
--- a/src/core/ext/filters/http/client/http_client_filter.h
+++ b/src/core/ext/filters/http/client/http_client_filter.h
@@ -21,7 +21,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc
index b43e6a65b2b..924a54d469f 100644
--- a/src/core/ext/filters/http/client_authority_filter.cc
+++ b/src/core/ext/filters/http/client_authority_filter.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/http/client_authority_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/transport/auth_filters.h"
diff --git a/src/core/ext/filters/http/client_authority_filter.h b/src/core/ext/filters/http/client_authority_filter.h
index c3b817527c1..0137c21bc62 100644
--- a/src/core/ext/filters/http/client_authority_filter.h
+++ b/src/core/ext/filters/http/client_authority_filter.h
@@ -24,7 +24,6 @@
 #include <utility>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc
index b662737ebae..b791e454b33 100644
--- a/src/core/ext/filters/http/http_filters_plugin.cc
+++ b/src/core/ext/filters/http/http_filters_plugin.cc
@@ -19,7 +19,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/strings/match.h"
-
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/ext/filters/http/message_compress/compression_filter.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
diff --git a/src/core/ext/filters/http/message_compress/compression_filter.cc b/src/core/ext/filters/http/message_compress/compression_filter.cc
index 85a67690206..fe7123db78f 100644
--- a/src/core/ext/filters/http/message_compress/compression_filter.cc
+++ b/src/core/ext/filters/http/message_compress/compression_filter.cc
@@ -12,10 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/http/message_compress/compression_filter.h"
 
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -27,12 +30,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
-
-#include <grpc/compression.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/compression_types.h>
-
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/ext/filters/http/message_compress/compression_filter.h b/src/core/ext/filters/http/message_compress/compression_filter.h
index ae3a9ee317e..fbd28d309f7 100644
--- a/src/core/ext/filters/http/message_compress/compression_filter.h
+++ b/src/core/ext/filters/http/message_compress/compression_filter.h
@@ -19,17 +19,14 @@
 #ifndef GRPC_SRC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_COMPRESSION_FILTER_H
 #define GRPC_SRC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_COMPRESSION_FILTER_H
 
+#include <grpc/impl/compression_types.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/compression_types.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc
index 92e541775e5..35c73ba7be7 100644
--- a/src/core/ext/filters/http/server/http_server_filter.cc
+++ b/src/core/ext/filters/http/server/http_server_filter.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <utility>
@@ -28,10 +30,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/ext/filters/http/server/http_server_filter.h b/src/core/ext/filters/http/server/http_server_filter.h
index 8f933865d7d..c84e619bfb4 100644
--- a/src/core/ext/filters/http/server/http_server_filter.h
+++ b/src/core/ext/filters/http/server/http_server_filter.h
@@ -22,7 +22,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/load_reporting/registered_opencensus_objects.h b/src/core/ext/filters/load_reporting/registered_opencensus_objects.h
index cb17a04109d..0df3ce181fc 100644
--- a/src/core/ext/filters/load_reporting/registered_opencensus_objects.h
+++ b/src/core/ext/filters/load_reporting/registered_opencensus_objects.h
@@ -23,7 +23,6 @@
 
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"
-
 #include "src/cpp/server/load_reporter/constants.h"
 
 namespace grpc {
diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
index 48cb742e505..a7d9eeccdd9 100644
--- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
+++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
@@ -16,10 +16,13 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/load_reporting/server_load_reporting_filter.h"
 
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -38,12 +41,6 @@
 #include "absl/types/optional.h"
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/call_finalization.h"
diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h
index 41f66ec948d..d5a5eb96bf5 100644
--- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h
+++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h
@@ -20,13 +20,11 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_LOAD_REPORTING_SERVER_LOAD_REPORTING_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <string>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/promise/arena_promise.h"
diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc
index cf12d8bb6ac..b8563872eb4 100644
--- a/src/core/ext/filters/logging/logging_filter.cc
+++ b/src/core/ext/filters/logging/logging_filter.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -42,11 +44,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/ext/filters/logging/logging_sink.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/ext/filters/logging/logging_filter.h b/src/core/ext/filters/logging/logging_filter.h
index 5d8b77752cd..9acc80e99c2 100644
--- a/src/core/ext/filters/logging/logging_filter.h
+++ b/src/core/ext/filters/logging/logging_filter.h
@@ -25,7 +25,6 @@
 #include <utility>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/ext/filters/logging/logging_sink.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/ext/filters/logging/logging_sink.h b/src/core/ext/filters/logging/logging_sink.h
index 71720799e4d..8b7914e0110 100644
--- a/src/core/ext/filters/logging/logging_sink.h
+++ b/src/core/ext/filters/logging/logging_sink.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_LOGGING_LOGGING_SINK_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <map>
@@ -29,7 +28,6 @@
 #include "absl/numeric/int128.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/time.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc
index 01cc9a3a9d7..813cd04dbf3 100644
--- a/src/core/ext/filters/message_size/message_size_filter.cc
+++ b/src/core/ext/filters/message_size/message_size_filter.cc
@@ -14,10 +14,11 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -25,10 +26,6 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h
index 2bc36cfde31..ff6dc5837df 100644
--- a/src/core/ext/filters/message_size/message_size_filter.h
+++ b/src/core/ext/filters/message_size/message_size_filter.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,7 +26,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc
index c7a8d139b17..0385b865c7c 100644
--- a/src/core/ext/filters/rbac/rbac_filter.cc
+++ b/src/core/ext/filters/rbac/rbac_filter.cc
@@ -14,18 +14,16 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/rbac/rbac_filter.h"
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
-
-#include <grpc/grpc_security.h>
-
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/ext/filters/rbac/rbac_filter.h b/src/core/ext/filters/rbac/rbac_filter.h
index f41e8490ccf..16489f47f02 100644
--- a/src/core/ext/filters/rbac/rbac_filter.h
+++ b/src/core/ext/filters/rbac/rbac_filter.h
@@ -18,11 +18,9 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.cc b/src/core/ext/filters/rbac/rbac_service_config_parser.cc
index 56195fe4625..5c1fce9748c 100644
--- a/src/core/ext/filters/rbac/rbac_service_config_parser.cc
+++ b/src/core/ext/filters/rbac/rbac_service_config_parser.cc
@@ -14,10 +14,11 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <map>
 #include <memory>
@@ -27,9 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_audit_logging.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/json/json_args.h"
diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.h b/src/core/ext/filters/rbac/rbac_service_config_parser.h
index f9a4c29c34e..0bd3bc465e6 100644
--- a/src/core/ext/filters/rbac/rbac_service_config_parser.h
+++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_SERVICE_CONFIG_PARSER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,7 +26,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc
index 3852c7155bb..22b3177c08f 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc
+++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc
@@ -14,10 +14,9 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -36,7 +35,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.h b/src/core/ext/filters/stateful_session/stateful_session_filter.h
index b7bde679c17..ce4e1dc801e 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_filter.h
+++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h
@@ -18,14 +18,12 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <utility>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
index 3be9785ac7c..1dc24ac99ce 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
+++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <vector>
 
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h
index edf6f55a79d..59ee3bd7069 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h
+++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_SERVICE_CONFIG_PARSER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <memory>
@@ -27,7 +26,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/ext/transport/.clang-format b/src/core/ext/transport/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/ext/transport/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/transport/binder/.clang-format b/src/core/ext/transport/binder/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/ext/transport/binder/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/transport/binder/client/binder_connector.cc b/src/core/ext/transport/binder/client/binder_connector.cc
index 725c5ad8a39..1317219a173 100644
--- a/src/core/ext/transport/binder/client/binder_connector.cc
+++ b/src/core/ext/transport/binder/client/binder_connector.cc
@@ -30,14 +30,13 @@
 #endif  // GPR_WINDOWS
 #endif
 
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <functional>
 #include <map>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/client_channel/connector.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
diff --git a/src/core/ext/transport/binder/client/binder_connector.h b/src/core/ext/transport/binder/client/binder_connector.h
index e054e3555c5..5ce6d86e583 100644
--- a/src/core/ext/transport/binder/client/binder_connector.h
+++ b/src/core/ext/transport/binder/client/binder_connector.h
@@ -15,17 +15,16 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_BINDER_CONNECTOR_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_BINDER_CONNECTOR_H
 
-#include <memory>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-#include "absl/strings/strip.h"
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <utility>
+
+#include "absl/strings/string_view.h"
+#include "absl/strings/strip.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/client_channel_filter.h"
 
diff --git a/src/core/ext/transport/binder/client/channel_create.cc b/src/core/ext/transport/binder/client/channel_create.cc
index 6ccf25f5b9b..483d488afaa 100644
--- a/src/core/ext/transport/binder/client/channel_create.cc
+++ b/src/core/ext/transport/binder/client/channel_create.cc
@@ -33,16 +33,15 @@
 
 #ifdef GPR_SUPPORT_BINDER_TRANSPORT
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/impl/grpc_library.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/substitute.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/impl/grpc_library.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/ext/transport/binder/client/channel_create_impl.h"
 #include "src/core/ext/transport/binder/client/connection_id_generator.h"
diff --git a/src/core/ext/transport/binder/client/channel_create_impl.cc b/src/core/ext/transport/binder/client/channel_create_impl.cc
index cf3a0caab69..1234c7c80fc 100644
--- a/src/core/ext/transport/binder/client/channel_create_impl.cc
+++ b/src/core/ext/transport/binder/client/channel_create_impl.cc
@@ -22,7 +22,6 @@
 #include <utility>
 
 #include "absl/log/check.h"
-
 #include "src/core/ext/transport/binder/client/binder_connector.h"
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
diff --git a/src/core/ext/transport/binder/client/connection_id_generator.h b/src/core/ext/transport/binder/client/connection_id_generator.h
index fbe945cfb74..6e2b98d4ea1 100644
--- a/src/core/ext/transport/binder/client/connection_id_generator.h
+++ b/src/core/ext/transport/binder/client/connection_id_generator.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CONNECTION_ID_GENERATOR_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CONNECTION_ID_GENERATOR_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/sync.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc b/src/core/ext/transport/binder/client/endpoint_binder_pool.cc
index 012d7f03063..b64436acb5a 100644
--- a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+++ b/src/core/ext/transport/binder/client/endpoint_binder_pool.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 #ifndef GRPC_NO_BINDER
 
 #include "src/core/ext/transport/binder/client/jni_utils.h"
diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.h b/src/core/ext/transport/binder/client/endpoint_binder_pool.h
index 4f9ac233219..997c36e76a6 100644
--- a/src/core/ext/transport/binder/client/endpoint_binder_pool.h
+++ b/src/core/ext/transport/binder/client/endpoint_binder_pool.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_ENDPOINT_BINDER_POOL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_ENDPOINT_BINDER_POOL_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 
 #include "absl/container/flat_hash_map.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/ext/transport/binder/client/jni_utils.cc b/src/core/ext/transport/binder/client/jni_utils.cc
index 8fc4f629c3c..3f13e269b0c 100644
--- a/src/core/ext/transport/binder/client/jni_utils.cc
+++ b/src/core/ext/transport/binder/client/jni_utils.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/ext/transport/binder/client/jni_utils.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 #ifndef GRPC_NO_BINDER
 
 #include "src/core/util/crash.h"
diff --git a/src/core/ext/transport/binder/client/jni_utils.h b/src/core/ext/transport/binder/client/jni_utils.h
index 1c809b127c8..c83949d3bf0 100644
--- a/src/core/ext/transport/binder/client/jni_utils.h
+++ b/src/core/ext/transport/binder/client/jni_utils.h
@@ -17,6 +17,7 @@
 
 #if defined(ANDROID) || defined(__ANDROID__)
 
+#include <grpc/support/port_platform.h>
 #include <jni.h>
 
 #include <functional>
@@ -24,8 +25,6 @@
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_binder {
 
 // Finds NativeConnectionHelper Java class and caches it. This is useful because
diff --git a/src/core/ext/transport/binder/client/security_policy_setting.cc b/src/core/ext/transport/binder/client/security_policy_setting.cc
index 318b434e6fa..c08a83324c3 100644
--- a/src/core/ext/transport/binder/client/security_policy_setting.cc
+++ b/src/core/ext/transport/binder/client/security_policy_setting.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+
 #ifndef GRPC_NO_BINDER
 
 #include "src/core/ext/transport/binder/client/security_policy_setting.h"
diff --git a/src/core/ext/transport/binder/client/security_policy_setting.h b/src/core/ext/transport/binder/client/security_policy_setting.h
index 46fb000246a..cd386693408 100644
--- a/src/core/ext/transport/binder/client/security_policy_setting.h
+++ b/src/core/ext/transport/binder/client/security_policy_setting.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_SECURITY_POLICY_SETTING_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_SECURITY_POLICY_SETTING_H
 
-#include "absl/container/flat_hash_map.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/security/binder_security_policy.h>
 
+#include "absl/container/flat_hash_map.h"
+#include "absl/strings/string_view.h"
 #include "src/core/util/sync.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc
index 4fe4ee4d159..8126d4c6db7 100644
--- a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+++ b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc
@@ -25,7 +25,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/ext/transport/binder/client/jni_utils.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/ext/transport/binder/server/binder_server.cc b/src/core/ext/transport/binder/server/binder_server.cc
index 3d84b95a8d5..65d70c2fdb7 100644
--- a/src/core/ext/transport/binder/server/binder_server.cc
+++ b/src/core/ext/transport/binder/server/binder_server.cc
@@ -18,6 +18,8 @@
 
 #ifndef GRPC_NO_BINDER
 
+#include <grpc/grpc.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -25,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/utils/ndk_binder.h"
 #include "src/core/ext/transport/binder/wire_format/binder_android.h"
diff --git a/src/core/ext/transport/binder/server/binder_server.h b/src/core/ext/transport/binder/server/binder_server.h
index 34f25090c59..889a2555438 100644
--- a/src/core/ext/transport/binder/server/binder_server.h
+++ b/src/core/ext/transport/binder/server/binder_server.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <string>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/ext/transport/binder/server/binder_server_credentials.cc b/src/core/ext/transport/binder/server/binder_server_credentials.cc
index 0d8f3dd63af..aea85fd82a6 100644
--- a/src/core/ext/transport/binder/server/binder_server_credentials.cc
+++ b/src/core/ext/transport/binder/server/binder_server_credentials.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+
 #ifndef GRPC_NO_BINDER
 
 #include <grpcpp/security/binder_security_policy.h>
diff --git a/src/core/ext/transport/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc
index 06ed2da8798..aa0990f9ba2 100644
--- a/src/core/ext/transport/binder/transport/binder_transport.cc
+++ b/src/core/ext/transport/binder/transport/binder_transport.cc
@@ -28,7 +28,6 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/substitute.h"
-
 #include "src/core/ext/transport/binder/transport/binder_stream.h"
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h"
diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h
index 108926f25df..1e5446c3fc1 100644
--- a/src/core/ext/transport/binder/transport/binder_transport.h
+++ b/src/core/ext/transport/binder/transport/binder_transport.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <atomic>
 #include <memory>
 #include <string>
@@ -24,10 +27,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader.h"
diff --git a/src/core/ext/transport/binder/utils/ndk_binder.cc b/src/core/ext/transport/binder/utils/ndk_binder.cc
index 95b52789803..8997255d7d7 100644
--- a/src/core/ext/transport/binder/utils/ndk_binder.cc
+++ b/src/core/ext/transport/binder/utils/ndk_binder.cc
@@ -24,7 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver.h b/src/core/ext/transport/binder/utils/transport_stream_receiver.h
index fa7dd21472d..a7f22d40c59 100644
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver.h
+++ b/src/core/ext/transport/binder/utils/transport_stream_receiver.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 #include <vector>
 
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/transaction.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
index 5a3cc10cb27..af1f4071104 100644
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
@@ -24,7 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
index a671a5e8233..a5548aba89c 100644
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <map>
 #include <queue>
@@ -22,8 +24,6 @@
 #include <string>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/ext/transport/binder/wire_format/binder.h b/src/core/ext/transport/binder/wire_format/binder.h
index 7936fbb65ce..77ab16597e8 100644
--- a/src/core/ext/transport/binder/wire_format/binder.h
+++ b/src/core/ext/transport/binder/wire_format/binder.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <functional>
 #include <memory>
@@ -22,9 +24,6 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/binder_constants.h"
 #include "src/core/util/orphanable.h"
 
diff --git a/src/core/ext/transport/binder/wire_format/binder_android.cc b/src/core/ext/transport/binder/wire_format/binder_android.cc
index e2a55df6b01..bc808e09bca 100644
--- a/src/core/ext/transport/binder/wire_format/binder_android.cc
+++ b/src/core/ext/transport/binder/wire_format/binder_android.cc
@@ -24,7 +24,6 @@
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/ext/transport/binder/wire_format/binder_android.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/ext/transport/binder/wire_format/binder_android.h b/src/core/ext/transport/binder/wire_format/binder_android.h
index a11b9bb8957..7d59a5fa00d 100644
--- a/src/core/ext/transport/binder/wire_format/binder_android.h
+++ b/src/core/ext/transport/binder/wire_format/binder_android.h
@@ -24,7 +24,6 @@
 #include <memory>
 
 #include "absl/memory/memory.h"
-
 #include "src/core/ext/transport/binder/utils/binder_auto_utils.h"
 #include "src/core/ext/transport/binder/utils/ndk_binder.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
diff --git a/src/core/ext/transport/binder/wire_format/binder_constants.h b/src/core/ext/transport/binder/wire_format/binder_constants.h
index 562f248ec0d..0dacaa742c0 100644
--- a/src/core/ext/transport/binder/wire_format/binder_constants.h
+++ b/src/core/ext/transport/binder/wire_format/binder_constants.h
@@ -15,12 +15,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 
 #include "absl/base/attributes.h"
 
-#include <grpc/support/port_platform.h>
-
 using transaction_code_t = uint32_t;
 
 ABSL_CONST_INIT extern const int FIRST_CALL_TRANSACTION;
diff --git a/src/core/ext/transport/binder/wire_format/transaction.h b/src/core/ext/transport/binder/wire_format/transaction.h
index eda30d093a5..0b22f8a60e9 100644
--- a/src/core/ext/transport/binder/wire_format/transaction.h
+++ b/src/core/ext/transport/binder/wire_format/transaction.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/wire_format/wire_reader.h b/src/core/ext/transport/binder/wire_format/wire_reader.h
index 570f99ac683..e446342af62 100644
--- a/src/core/ext/transport/binder/wire_format/wire_reader.h
+++ b/src/core/ext/transport/binder/wire_format/wire_reader.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_writer.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
index d877b9cd9c1..5d8144650ac 100644
--- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
@@ -29,7 +29,6 @@
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/status/statusor.h"
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_writer.h"
diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
index a08cb6f4985..8c8c4e939f7 100644
--- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <memory>
 #include <queue>
 #include <utility>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader.h"
diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.cc b/src/core/ext/transport/binder/wire_format/wire_writer.cc
index 1cefd1bd5f2..948f16d2ee9 100644
--- a/src/core/ext/transport/binder/wire_format/wire_writer.cc
+++ b/src/core/ext/transport/binder/wire_format/wire_writer.cc
@@ -24,7 +24,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/variant.h"
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.h b/src/core/ext/transport/binder/wire_format/wire_writer.h
index 81041c68c02..81848296323 100644
--- a/src/core/ext/transport/binder/wire_format/wire_writer.h
+++ b/src/core/ext/transport/binder/wire_format/wire_writer.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "absl/container/flat_hash_map.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/transaction.h"
 #include "src/core/lib/iomgr/combiner.h"
diff --git a/src/core/ext/transport/chaotic_good/chaotic_good_transport.h b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h
index b3df1ceb1e6..3616797a3bb 100644
--- a/src/core/ext/transport/chaotic_good/chaotic_good_transport.h
+++ b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <utility>
 
 #include "absl/log/log.h"
 #include "absl/random/random.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc
index d8743703a04..ae9317e3b89 100644
--- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc
+++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <utility>
@@ -23,10 +26,6 @@
 #include "absl/random/bit_gen_ref.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
index 59ef8fd4376..963c8da55be 100644
--- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
+++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_CHAOTIC_GOOD_CONNECTOR_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_CHAOTIC_GOOD_CONNECTOR_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 
 #include "absl/random/random.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/connector.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc
index 29a39c1fbac..3d585191bca 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.cc
+++ b/src/core/ext/transport/chaotic_good/client_transport.cc
@@ -14,6 +14,10 @@
 
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <cstdlib>
 #include <memory>
@@ -27,11 +31,6 @@
 #include "absl/random/random.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h
index f223c551002..997f03d6120 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.h
+++ b/src/core/ext/transport/chaotic_good/client_transport.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_TRANSPORT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -32,12 +36,6 @@
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc
index dccdf7f0dc5..5fbb51d070b 100644
--- a/src/core/ext/transport/chaotic_good/frame.cc
+++ b/src/core/ext/transport/chaotic_good/frame.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/ext/transport/chaotic_good/frame.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,10 +25,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h
index a328c3c80ce..d29545e87c8 100644
--- a/src/core/ext/transport/chaotic_good/frame.h
+++ b/src/core/ext/transport/chaotic_good/frame.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <string>
@@ -22,9 +24,6 @@
 #include "absl/random/bit_gen_ref.h"
 #include "absl/status/status.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
diff --git a/src/core/ext/transport/chaotic_good/frame_header.cc b/src/core/ext/transport/chaotic_good/frame_header.cc
index 903e4646419..7cc9a0d7b91 100644
--- a/src/core/ext/transport/chaotic_good/frame_header.cc
+++ b/src/core/ext/transport/chaotic_good/frame_header.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace chaotic_good {
 
diff --git a/src/core/ext/transport/chaotic_good/frame_header.h b/src/core/ext/transport/chaotic_good/frame_header.h
index 91a83eed4a8..202e8387441 100644
--- a/src/core/ext/transport/chaotic_good/frame_header.h
+++ b/src/core/ext/transport/chaotic_good/frame_header.h
@@ -15,14 +15,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
 
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/bitset.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
index f5c8dc2d685..749a27155bd 100644
--- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
+++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <random>
@@ -26,12 +31,6 @@
 #include "absl/random/bit_gen_ref.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
index 167da14458d..8b555264aab 100644
--- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
+++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_CHAOTIC_GOOD_SERVER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_CHAOTIC_GOOD_SERVER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <cstdint>
 #include <memory>
@@ -25,10 +28,6 @@
 #include "absl/random/random.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc
index 492dee5c843..b166d79380f 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.cc
+++ b/src/core/ext/transport/chaotic_good/server_transport.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <tuple>
@@ -24,12 +29,6 @@
 #include "absl/random/random.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h
index d8244ab32fe..49fd5ae015f 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.h
+++ b/src/core/ext/transport/chaotic_good/server_transport.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -37,13 +42,6 @@
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.cc b/src/core/ext/transport/chaotic_good/settings_metadata.cc
index 3d952be719a..a3b8c5642d3 100644
--- a/src/core/ext/transport/chaotic_good/settings_metadata.cc
+++ b/src/core/ext/transport/chaotic_good/settings_metadata.cc
@@ -14,10 +14,9 @@
 
 #include "src/core/ext/transport/chaotic_good/settings_metadata.h"
 
-#include "absl/status/status.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
 #include "src/core/util/crash.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.h b/src/core/ext/transport/chaotic_good/settings_metadata.h
index fab73696446..81b5fca4f21 100644
--- a/src/core/ext/transport/chaotic_good/settings_metadata.h
+++ b/src/core/ext/transport/chaotic_good/settings_metadata.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SETTINGS_METADATA_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SETTINGS_METADATA_H
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
diff --git a/src/core/ext/transport/chttp2/alpn/alpn.cc b/src/core/ext/transport/chttp2/alpn/alpn.cc
index 75f17402335..cd6119f4782 100644
--- a/src/core/ext/transport/chttp2/alpn/alpn.cc
+++ b/src/core/ext/transport/chttp2/alpn/alpn.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/ext/transport/chttp2/alpn/alpn.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/useful.h"
 
 // in order of preference
diff --git a/src/core/ext/transport/chttp2/alpn/alpn.h b/src/core/ext/transport/chttp2/alpn/alpn.h
index 9c381f8b3b2..09135e90ae2 100644
--- a/src/core/ext/transport/chttp2/alpn/alpn.h
+++ b/src/core/ext/transport/chttp2/alpn/alpn.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H
 
-#include <string.h>
-
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 // Returns 1 if the version is supported, 0 otherwise.
 int grpc_chttp2_is_alpn_version_supported(const char* version, size_t size);
diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc
index 2f6e070ae6a..0223539a450 100644
--- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc
+++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/ext/transport/chttp2/client/chttp2_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_posix.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 
 #include <string>
@@ -29,16 +37,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_posix.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/client_channel_filter.h"
diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h
index 4c7eaa614da..800e08a8ec1 100644
--- a/src/core/ext/transport/chttp2/client/chttp2_connector.h
+++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
 
-#include "absl/base/thread_annotations.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/types/optional.h"
 #include "src/core/client_channel/connector.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index ac0562c4117..0486f7e3bf5 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/ext/transport/chttp2/server/chttp2_server.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_posix.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/passive_listener.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -38,16 +46,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_posix.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/passive_listener.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h
index 25d38236aed..0ecbf39e745 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.h
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H
 
-#include <functional>
-
 #include <grpc/passive_listener.h>
 #include <grpc/support/port_platform.h>
 
+#include <functional>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/server/server.h"
diff --git a/src/core/ext/transport/chttp2/transport/.clang-format b/src/core/ext/transport/chttp2/transport/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/ext/transport/chttp2/transport/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc
index 8d00da86e59..d996de7315e 100644
--- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc
+++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/ext/transport/chttp2/transport/bin_decoder.h"
 
-#include "absl/base/attributes.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/base/attributes.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
 
 static uint8_t decode_table[] = {
diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.h b/src/core/ext/transport/chttp2/transport/bin_decoder.h
index fc87450d365..4af97f54907 100644
--- a/src/core/ext/transport/chttp2/transport/bin_decoder.h
+++ b/src/core/ext/transport/chttp2/transport/bin_decoder.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
+#include <stdint.h>
 
 struct grpc_base64_decode_context {
   // input/output:
diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.cc b/src/core/ext/transport/chttp2/transport/bin_encoder.cc
index 4063d1d5491..8a6b3670ce1 100644
--- a/src/core/ext/transport/chttp2/transport/bin_encoder.cc
+++ b/src/core/ext/transport/chttp2/transport/bin_encoder.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/huffsyms.h"
 
 static const char alphabet[] =
diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.h b/src/core/ext/transport/chttp2/transport/bin_encoder.h
index fbada017abc..5e561036f8f 100644
--- a/src/core/ext/transport/chttp2/transport/bin_encoder.h
+++ b/src/core/ext/transport/chttp2/transport/bin_encoder.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 // base64 encode a slice. Returns a new slice, does not take ownership of the
 // input
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index 4087efcf6dd..61c560e0d21 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -16,6 +16,15 @@
 
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <string.h>
@@ -45,17 +54,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/context_list_entry.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
index c832da4ed9e..011eeae1a0c 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <string>
 
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/ext/transport/chttp2/transport/context_list_entry.h b/src/core/ext/transport/chttp2/transport/context_list_entry.h
index 8d64b321aef..583e8ed522f 100644
--- a/src/core/ext/transport/chttp2/transport/context_list_entry.h
+++ b/src/core/ext/transport/chttp2/transport/context_list_entry.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CONTEXT_LIST_ENTRY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CONTEXT_LIST_ENTRY_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,8 +27,6 @@
 #include <utility>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/telemetry/tcp_tracer.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/decode_huff.h b/src/core/ext/transport/chttp2/transport/decode_huff.h
index 2562f9d0d97..21f087585c0 100644
--- a/src/core/ext/transport/chttp2/transport/decode_huff.h
+++ b/src/core/ext/transport/chttp2/transport/decode_huff.h
@@ -17,10 +17,10 @@
 
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_DECODE_HUFF_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_DECODE_HUFF_H
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <cstdint>
-
-#include <grpc/support/port_platform.h>
 namespace grpc_core {
 class HuffDecoderCommon {
  protected:
diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
index c80fdd83073..b65ab0e12a5 100644
--- a/src/core/ext/transport/chttp2/transport/flow_control.cc
+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -32,9 +33,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h
index d3f1202a217..c7050b99daf 100644
--- a/src/core/ext/transport/chttp2/transport/flow_control.h
+++ b/src/core/ext/transport/chttp2/transport/flow_control.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FLOW_CONTROL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FLOW_CONTROL_H
 
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 
@@ -31,9 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame.cc b/src/core/ext/transport/chttp2/transport/frame.cc
index 65bb1660248..cd9093f94a9 100644
--- a/src/core/ext/transport/chttp2/transport/frame.cc
+++ b/src/core/ext/transport/chttp2/transport/frame.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
@@ -22,9 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/frame.h b/src/core/ext/transport/chttp2/transport/frame.h
index ac6b9e771dd..ccefc083f92 100644
--- a/src/core/ext/transport/chttp2/transport/frame.h
+++ b/src/core/ext/transport/chttp2/transport/frame.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -23,9 +25,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_buffer.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc
index b5bd13d2fc0..d03e47fa71d 100644
--- a/src/core/ext/transport/chttp2/transport/frame_data.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_data.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_data.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h
index eae1f439c3d..e107b740f89 100644
--- a/src/core/ext/transport/chttp2/transport/frame_data.h
+++ b/src/core/ext/transport/chttp2/transport/frame_data.h
@@ -21,13 +21,11 @@
 
 // Parser for GRPC streams embedded in DATA frames
 
-#include <stdint.h>
-
-#include "absl/status/status.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
+#include "absl/status/status.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/src/core/ext/transport/chttp2/transport/frame_goaway.cc
index 31e7c76ba39..36873e862e3 100644
--- a/src/core/ext/transport/chttp2/transport/frame_goaway.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_goaway.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/base/attributes.h"
@@ -25,11 +28,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 
 void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser* p) {
diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.h b/src/core/ext/transport/chttp2/transport/frame_goaway.h
index 40f132721e7..a455f06c24f 100644
--- a/src/core/ext/transport/chttp2/transport/frame_goaway.h
+++ b/src/core/ext/transport/chttp2/transport/frame_goaway.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_GOAWAY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_GOAWAY_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc
index 7b7b080e320..2db29ee7ef6 100644
--- a/src/core/ext/transport/chttp2/transport/frame_ping.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_ping.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -28,10 +30,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h"
 #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.h b/src/core/ext/transport/chttp2/transport/frame_ping.h
index 6f4cd55ff41..a785a9dfa35 100644
--- a/src/core/ext/transport/chttp2/transport/frame_ping.h
+++ b/src/core/ext/transport/chttp2/transport/frame_ping.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_PING_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_PING_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
index 0e38b36c05c..0378d6773c0 100644
--- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
@@ -26,10 +28,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h
index 0e8e74b62a2..d55ab2831d0 100644
--- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h
+++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_RST_STREAM_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_RST_STREAM_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc
index 817097a57b2..84dafd73827 100644
--- a/src/core/ext/transport/chttp2/transport/frame_settings.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_settings.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <string>
@@ -26,10 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h
index 011862f5888..b5480b64029 100644
--- a/src/core/ext/transport/chttp2/transport/frame_settings.h
+++ b/src/core/ext/transport/chttp2/transport/frame_settings.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SETTINGS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SETTINGS_H
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc
index 5209ab2899a..47db0a03941 100644
--- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_window_update.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h
index 53c5f41d3db..c1c8f6e8251 100644
--- a/src/core/ext/transport/chttp2/transport/frame_window_update.h
+++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_constants.h b/src/core/ext/transport/chttp2/transport/hpack_constants.h
index 739c57ba3e3..d709e0ba278 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_constants.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_constants.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_CONSTANTS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_CONSTANTS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <cstdint>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace hpack_constants {
 // Per entry overhead bytes as per the spec
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
index 5c573a0beb6..1ae3db3d609 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
@@ -18,16 +18,15 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <cstdint>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h
index 1dab0871ff2..4695089b01a 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
@@ -29,10 +31,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc
index 143781dca32..2947587c7a6 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc
@@ -14,12 +14,12 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 uint32_t HPackEncoderTable::AllocateIndex(size_t element_size) {
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h
index 1bde664d0fd..f68e2995b2b 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_TABLE_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_TABLE_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
index aa4b69623ad..ffead9117a9 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
@@ -14,13 +14,11 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h
index 628b3327f5b..6aea73bc5b7 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSE_RESULT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSE_RESULT_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -26,9 +27,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/surface/validate_metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
index fb2e9b301a9..82d249f2ce0 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdlib.h>
 
@@ -36,10 +38,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/decode_huff.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h
index af2c1a9c7f0..5417c9e0213 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -32,10 +34,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
index 7a0b7bd8498..b258e6ead09 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -30,9 +31,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h
index 2d790bb2e21..1ccb0808c43 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_TABLE_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_TABLE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <cstdint>
@@ -28,9 +29,6 @@
 #include <vector>
 
 #include "absl/functional/function_ref.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.cc b/src/core/ext/transport/chttp2/transport/http2_settings.cc
index ac9c1553301..83bf6e5c5d8 100644
--- a/src/core/ext/transport/chttp2/transport/http2_settings.cc
+++ b/src/core/ext/transport/chttp2/transport/http2_settings.cc
@@ -20,10 +20,9 @@
 
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
 
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_cat.h"
 #include "src/core/ext/transport/chttp2/transport/frame.h"
 #include "src/core/lib/transport/http2_errors.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.h b/src/core/ext/transport/chttp2/transport/http2_settings.h
index b5debf96c7e..44ed672d123 100644
--- a/src/core/ext/transport/chttp2/transport/http2_settings.h
+++ b/src/core/ext/transport/chttp2/transport/http2_settings.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <cstdint>
@@ -24,9 +25,6 @@
 #include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/frame.h"
 #include "src/core/lib/transport/http2_errors.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h
index 76deea4f043..afe319b81a2 100644
--- a/src/core/ext/transport/chttp2/transport/internal.h
+++ b/src/core/ext/transport/chttp2/transport/internal.h
@@ -19,6 +19,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INTERNAL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INTERNAL_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -32,14 +38,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/context_list_entry.h"
diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc
index e9d746d8e24..7fa290db466 100644
--- a/src/core/ext/transport/chttp2/transport/parsing.cc
+++ b/src/core/ext/transport/chttp2/transport/parsing.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -36,12 +40,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
diff --git a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
index d1f371537f7..e2652964058 100644
--- a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
+++ b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
@@ -14,14 +14,14 @@
 
 #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
 
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
index bff04089822..22e6b03b778 100644
--- a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
+++ b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_ABUSE_POLICY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_ABUSE_POLICY_H
 
-#include <string>
-
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/ping_callbacks.cc b/src/core/ext/transport/chttp2/transport/ping_callbacks.cc
index 4bd16e1fbb4..ff473e59630 100644
--- a/src/core/ext/transport/chttp2/transport/ping_callbacks.cc
+++ b/src/core/ext/transport/chttp2/transport/ping_callbacks.cc
@@ -14,14 +14,14 @@
 
 #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/meta/type_traits.h"
 #include "absl/random/distributions.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void Chttp2PingCallbacks::OnPing(Callback on_start, Callback on_ack) {
diff --git a/src/core/ext/transport/chttp2/transport/ping_callbacks.h b/src/core/ext/transport/chttp2/transport/ping_callbacks.h
index 1e558eda836..deae3da479f 100644
--- a/src/core/ext/transport/chttp2/transport/ping_callbacks.h
+++ b/src/core/ext/transport/chttp2/transport/ping_callbacks.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_CALLBACKS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_CALLBACKS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,10 +28,6 @@
 #include "absl/hash/hash.h"
 #include "absl/random/bit_gen_ref.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc
index 6f329735306..b895e518202 100644
--- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc
+++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <ostream>
 
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/util/match.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h
index df16b3813bc..b49d5323a43 100644
--- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h
+++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h
@@ -15,15 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_RATE_POLICY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_RATE_POLICY_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <iosfwd>
 #include <string>
 
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc
index 14039a614b7..2bf7daa04f7 100644
--- a/src/core/ext/transport/chttp2/transport/stream_lists.cc
+++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/ext/transport/chttp2/transport/stream_lists.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/ext/transport/chttp2/transport/varint.cc b/src/core/ext/transport/chttp2/transport/varint.cc
index 7af77e772be..1db7d67c06f 100644
--- a/src/core/ext/transport/chttp2/transport/varint.cc
+++ b/src/core/ext/transport/chttp2/transport/varint.cc
@@ -18,10 +18,10 @@
 
 #include "src/core/ext/transport/chttp2/transport/varint.h"
 
-#include "absl/base/attributes.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/base/attributes.h"
+
 namespace grpc_core {
 
 size_t VarintLength(size_t tail_value) {
diff --git a/src/core/ext/transport/chttp2/transport/varint.h b/src/core/ext/transport/chttp2/transport/varint.h
index 3dcf32aa609..e84f1b6ee21 100644
--- a/src/core/ext/transport/chttp2/transport/varint.h
+++ b/src/core/ext/transport/chttp2/transport/varint.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 // Helpers for hpack varint encoding
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/write_size_policy.cc b/src/core/ext/transport/chttp2/transport/write_size_policy.cc
index 63e8d2b7e25..b843205de70 100644
--- a/src/core/ext/transport/chttp2/transport/write_size_policy.cc
+++ b/src/core/ext/transport/chttp2/transport/write_size_policy.cc
@@ -14,12 +14,12 @@
 
 #include "src/core/ext/transport/chttp2/transport/write_size_policy.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 size_t Chttp2WriteSizePolicy::WriteTargetSize() { return current_target_; }
diff --git a/src/core/ext/transport/chttp2/transport/write_size_policy.h b/src/core/ext/transport/chttp2/transport/write_size_policy.h
index fdeeda0763a..6f0098e69b1 100644
--- a/src/core/ext/transport/chttp2/transport/write_size_policy.h
+++ b/src/core/ext/transport/chttp2/transport/write_size_policy.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_WRITE_SIZE_POLICY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_WRITE_SIZE_POLICY_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc
index 583d9eaa03d..8aa306ab680 100644
--- a/src/core/ext/transport/chttp2/transport/writing.cc
+++ b/src/core/ext/transport/chttp2/transport/writing.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -30,12 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
index a7c59b26d94..538c6aa2ee0 100644
--- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
+++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/ext/transport/cronet/client/secure/cronet_channel_create.h"
 
-#include "absl/log/log.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
+#include "absl/status/statusor.h"
 #include "src/core/ext/transport/cronet/transport/cronet_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/src/core/ext/transport/cronet/transport/cronet_api_phony.cc b/src/core/ext/transport/cronet/transport/cronet_api_phony.cc
index f0befc2faa1..25b80945e5b 100644
--- a/src/core/ext/transport/cronet/transport/cronet_api_phony.cc
+++ b/src/core/ext/transport/cronet/transport/cronet_api_phony.cc
@@ -19,11 +19,11 @@
 // This file has empty implementation of all the functions exposed by the cronet
 // library, so we can build it in all environments
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "third_party/objective_c/Cronet/bidirectional_stream_c.h"
 
-#include <grpc/support/port_platform.h>
-
 #ifdef GRPC_COMPILE_WITH_CRONET
 // link with the real CRONET library in the build system
 #else
diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc
index 4d47895f9bb..1e1ad321bb8 100644
--- a/src/core/ext/transport/cronet/transport/cronet_transport.cc
+++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc
@@ -18,6 +18,12 @@
 
 #include "src/core/ext/transport/cronet/transport/cronet_transport.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,15 +40,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "third_party/objective_c/Cronet/bidirectional_stream_c.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/ext/transport/chttp2/transport/bin_decoder.h"
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/ext/transport/cronet/transport/cronet_status.h"
@@ -61,6 +58,7 @@
 #include "src/core/util/crash.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/status_helper.h"
+#include "third_party/objective_c/Cronet/bidirectional_stream_c.h"
 
 // IWYU pragma: no_include <type_traits>
 
diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc
index a656d8b7fde..16846ac1960 100644
--- a/src/core/ext/transport/inproc/inproc_transport.cc
+++ b/src/core/ext/transport/inproc/inproc_transport.cc
@@ -14,16 +14,15 @@
 
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/inproc/legacy_inproc_transport.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc
index b93fc97a160..fd7fc3f99b6 100644
--- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc
+++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc
@@ -18,6 +18,13 @@
 
 #include "src/core/ext/transport/inproc/legacy_inproc_transport.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -34,15 +41,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/src/core/filter/blackboard.h b/src/core/filter/blackboard.h
index 972758162f0..19f08be382b 100644
--- a/src/core/filter/blackboard.h
+++ b/src/core/filter/blackboard.h
@@ -22,7 +22,6 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
index 151f4e8c9d4..b6037bfe7cb 100644
--- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
+++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
@@ -16,14 +16,13 @@
 
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
diff --git a/src/core/handshaker/handshaker.cc b/src/core/handshaker/handshaker.cc
index b476e550f75..241d656da80 100644
--- a/src/core/handshaker/handshaker.cc
+++ b/src/core/handshaker/handshaker.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/handshaker/handshaker.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <string>
@@ -29,13 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/handshaker/handshaker.h b/src/core/handshaker/handshaker.h
index 12ea2b4b8bf..251ec6bf7cc 100644
--- a/src/core/handshaker/handshaker.h
+++ b/src/core/handshaker/handshaker.h
@@ -19,17 +19,15 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H
 #define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/container/inlined_vector.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/handshaker/handshaker_registry.cc b/src/core/handshaker/handshaker_registry.cc
index 750fdabfdc0..e4e2380b46f 100644
--- a/src/core/handshaker/handshaker_registry.cc
+++ b/src/core/handshaker/handshaker_registry.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/handshaker/handshaker_registry.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void HandshakerRegistry::Builder::RegisterHandshakerFactory(
diff --git a/src/core/handshaker/handshaker_registry.h b/src/core/handshaker/handshaker_registry.h
index 1357686c6fb..b9ccba03fd8 100644
--- a/src/core/handshaker/handshaker_registry.h
+++ b/src/core/handshaker/handshaker_registry.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H
 #define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc
index 3ec778ed4b1..68ca9ab73c7 100644
--- a/src/core/handshaker/http_connect/http_connect_handshaker.cc
+++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <string.h>
 
@@ -31,12 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.cc b/src/core/handshaker/http_connect/http_proxy_mapper.cc
index f22e6d67423..4bd1e16ee50 100644
--- a/src/core/handshaker/http_connect/http_proxy_mapper.cc
+++ b/src/core/handshaker/http_connect/http_proxy_mapper.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/handshaker/http_connect/http_proxy_mapper.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -38,11 +41,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.h b/src/core/handshaker/http_connect/http_proxy_mapper.h
index 2a283833bd4..50fb2919c96 100644
--- a/src/core/handshaker/http_connect/http_proxy_mapper.h
+++ b/src/core/handshaker/http_connect/http_proxy_mapper.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H
 #define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/handshaker/proxy_mapper.h b/src/core/handshaker/proxy_mapper.h
index 8ba3f740394..6ffe9467670 100644
--- a/src/core/handshaker/proxy_mapper.h
+++ b/src/core/handshaker/proxy_mapper.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H
 #define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
diff --git a/src/core/handshaker/proxy_mapper_registry.cc b/src/core/handshaker/proxy_mapper_registry.cc
index f13e07cc334..c02cac376c6 100644
--- a/src/core/handshaker/proxy_mapper_registry.cc
+++ b/src/core/handshaker/proxy_mapper_registry.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/handshaker/proxy_mapper_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ -25,8 +27,6 @@
 
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void ProxyMapperRegistry::Builder::Register(
diff --git a/src/core/handshaker/proxy_mapper_registry.h b/src/core/handshaker/proxy_mapper_registry.h
index fbc09f6152d..3c604ef9e0c 100644
--- a/src/core/handshaker/proxy_mapper_registry.h
+++ b/src/core/handshaker/proxy_mapper_registry.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
 #define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -26,9 +28,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/src/core/handshaker/security/secure_endpoint.cc b/src/core/handshaker/security/secure_endpoint.cc
index c57b56b4d26..02c39865a3f 100644
--- a/src/core/handshaker/security/secure_endpoint.cc
+++ b/src/core/handshaker/security/secure_endpoint.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/handshaker/security/secure_endpoint.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -31,16 +39,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/handshaker/security/secure_endpoint.h b/src/core/handshaker/security/secure_endpoint.h
index 0d81fec090b..cb036d25766 100644
--- a/src/core/handshaker/security/secure_endpoint.h
+++ b/src/core/handshaker/security/secure_endpoint.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H
 #define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H
 
-#include <stddef.h>
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc
index 82756fc8723..1e1102846df 100644
--- a/src/core/handshaker/security/security_handshaker.cc
+++ b/src/core/handshaker/security/security_handshaker.cc
@@ -18,6 +18,13 @@
 
 #include "src/core/handshaker/security/security_handshaker.h"
 
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 #include <string.h>
@@ -34,15 +41,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
diff --git a/src/core/handshaker/security/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h
index 3e6096d6c47..23c10b94fac 100644
--- a/src/core/handshaker/security/security_handshaker.h
+++ b/src/core/handshaker/security/security_handshaker.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H
 #define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
index a02ccfa8cc3..8dd1ff89d44 100644
--- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
+++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
 
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
@@ -27,12 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
diff --git a/src/core/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc
index ce75321ce31..8a3c270a3d1 100644
--- a/src/core/lib/address_utils/parse_address.cc
+++ b/src/core/lib/address_utils/parse_address.cc
@@ -46,7 +46,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
 #include "src/core/util/grpc_if_nametoindex.h"
diff --git a/src/core/lib/address_utils/parse_address.h b/src/core/lib/address_utils/parse_address.h
index c11789885ab..840d0c260bc 100644
--- a/src/core/lib/address_utils/parse_address.h
+++ b/src/core/lib/address_utils/parse_address.h
@@ -19,13 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H
 #define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/uri.h"
diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc
index 41564ba5242..b52491637c0 100644
--- a/src/core/lib/address_utils/sockaddr_utils.cc
+++ b/src/core/lib/address_utils/sockaddr_utils.cc
@@ -19,11 +19,10 @@
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 
 #include <errno.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
 #ifdef GRPC_HAVE_VSOCK
 #include <linux/vm_sockets.h>
 #endif
@@ -36,7 +35,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
diff --git a/src/core/lib/address_utils/sockaddr_utils.h b/src/core/lib/address_utils/sockaddr_utils.h
index 9837afd930b..c76aa64908a 100644
--- a/src/core/lib/address_utils/sockaddr_utils.h
+++ b/src/core/lib/address_utils/sockaddr_utils.h
@@ -19,14 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H
 #define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/resolved_address.h"
 
 // Returns true if addr is an IPv4-mapped IPv6 address within the
diff --git a/src/core/lib/channel/call_finalization.h b/src/core/lib/channel/call_finalization.h
index 9e083e350a0..a3076677826 100644
--- a/src/core/lib/channel/call_finalization.h
+++ b/src/core/lib/channel/call_finalization.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/call_final_info.h"
diff --git a/src/core/lib/channel/channel_args.cc b/src/core/lib/channel/channel_args.cc
index 1c66f414350..72802910ea0 100644
--- a/src/core/lib/channel/channel_args.cc
+++ b/src/core/lib/channel/channel_args.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/lib/channel/channel_args.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,12 +38,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/useful.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h
index 9274c453988..9a49c3dd3fd 100644
--- a/src/core/lib/channel/channel_args.h
+++ b/src/core/lib/channel/channel_args.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -32,11 +35,6 @@
 #include "absl/meta/type_traits.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/util/avl.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/channel/channel_args_preconditioning.cc b/src/core/lib/channel/channel_args_preconditioning.cc
index 92a94535d30..bb83515839d 100644
--- a/src/core/lib/channel/channel_args_preconditioning.cc
+++ b/src/core/lib/channel/channel_args_preconditioning.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 namespace grpc_core {
 
 void ChannelArgsPreconditioning::Builder::RegisterStage(Stage stage) {
diff --git a/src/core/lib/channel/channel_args_preconditioning.h b/src/core/lib/channel/channel_args_preconditioning.h
index 69f64accd34..ff4b43fc54b 100644
--- a/src/core/lib/channel/channel_args_preconditioning.h
+++ b/src/core/lib/channel/channel_args_preconditioning.h
@@ -15,12 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
 
-#include <functional>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <functional>
+#include <vector>
+
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc
index 14e618a7fd8..0b0b0345538 100644
--- a/src/core/lib/channel/channel_stack.cc
+++ b/src/core/lib/channel/channel_stack.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/channel/channel_stack.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -25,9 +26,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/surface/channel_init.h"
diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h
index 56bcb62f900..855354970b6 100644
--- a/src/core/lib/channel/channel_stack.h
+++ b/src/core/lib/channel/channel_stack.h
@@ -37,17 +37,16 @@
 // it can have an effect on the call status.
 //
 
-#include <stddef.h>
-
-#include <functional>
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
+
+#include <functional>
+#include <memory>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/lib/channel/channel_stack_builder.cc b/src/core/lib/channel/channel_stack_builder.cc
index 69c4fff4fe9..307176e08e1 100644
--- a/src/core/lib/channel/channel_stack_builder.cc
+++ b/src/core/lib/channel/channel_stack_builder.cc
@@ -18,10 +18,10 @@
 
 #include "src/core/lib/channel/channel_stack_builder.h"
 
-#include <algorithm>
-
 #include <grpc/support/port_platform.h>
 
+#include <algorithm>
+
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h
index 6b3155fcbdb..b1e72116765 100644
--- a/src/core/lib/channel/channel_stack_builder.h
+++ b/src/core/lib/channel/channel_stack_builder.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/surface/channel_stack_type.h"
diff --git a/src/core/lib/channel/channel_stack_builder_impl.cc b/src/core/lib/channel/channel_stack_builder_impl.cc
index 360cd7aa7db..2d7bfc2fc47 100644
--- a/src/core/lib/channel/channel_stack_builder_impl.cc
+++ b/src/core/lib/channel/channel_stack_builder_impl.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -31,10 +33,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/channel/channel_stack_builder_impl.h b/src/core/lib/channel/channel_stack_builder_impl.h
index 78df9809c90..6de06ebba73 100644
--- a/src/core/lib/channel/channel_stack_builder_impl.h
+++ b/src/core/lib/channel/channel_stack_builder_impl.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc
index f65f5f74f29..6f8b1bb2913 100644
--- a/src/core/lib/channel/connected_channel.cc
+++ b/src/core/lib/channel/connected_channel.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/lib/channel/connected_channel.h"
 
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -30,12 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc
index a0fc813ad5c..4488a56b680 100644
--- a/src/core/lib/channel/promise_based_filter.cc
+++ b/src/core/lib/channel/promise_based_filter.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/channel/promise_based_filter.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -28,10 +31,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h
index 1a31b901052..d18809dca6b 100644
--- a/src/core/lib/channel/promise_based_filter.h
+++ b/src/core/lib/channel/promise_based_filter.h
@@ -19,6 +19,9 @@
 // promise-style. Most of this will be removed once the promises conversion is
 // completed.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -37,11 +40,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/channel/status_util.cc b/src/core/lib/channel/status_util.cc
index 7c78ac5504a..2caa7da563a 100644
--- a/src/core/lib/channel/status_util.cc
+++ b/src/core/lib/channel/status_util.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/channel/status_util.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/useful.h"
 
 struct status_string_entry {
diff --git a/src/core/lib/channel/status_util.h b/src/core/lib/channel/status_util.h
index cc46bd4feb0..fe6d47e4a70 100644
--- a/src/core/lib/channel/status_util.h
+++ b/src/core/lib/channel/status_util.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 /// If \a status_str is a valid status string, sets \a status to the
 /// corresponding status value and returns true.
 bool grpc_status_code_from_string(const char* status_str,
diff --git a/src/core/lib/compression/compression.cc b/src/core/lib/compression/compression.cc
index 018e92a379a..1a6e1e81dc4 100644
--- a/src/core/lib/compression/compression.cc
+++ b/src/core/lib/compression/compression.cc
@@ -16,16 +16,14 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
-#include "absl/types/optional.h"
-
 #include <grpc/compression.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
+#include <string.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc
index 3bb8a7f2882..d81670a3d1d 100644
--- a/src/core/lib/compression/compression_internal.cc
+++ b/src/core/lib/compression/compression_internal.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/compression/compression_internal.h"
 
+#include <grpc/compression.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <string>
@@ -27,10 +29,6 @@
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
-
-#include <grpc/compression.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/compression/compression_internal.h b/src/core/lib/compression/compression_internal.h
index 45a24faa998..6f417feaf95 100644
--- a/src/core/lib/compression/compression_internal.h
+++ b/src/core/lib/compression/compression_internal.h
@@ -19,16 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H
 
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <initializer_list>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/compression_types.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/bitset.h"
diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc
index 9fb7a7956ac..7a731495e4a 100644
--- a/src/core/lib/compression/message_compress.cc
+++ b/src/core/lib/compression/message_compress.cc
@@ -18,18 +18,15 @@
 
 #include "src/core/lib/compression/message_compress.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
-
 #include <zconf.h>
 #include <zlib.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 
 #define OUTPUT_BLOCK_SIZE 1024
diff --git a/src/core/lib/config/config_vars.cc b/src/core/lib/config/config_vars.cc
index e0db62f5d09..6aa9f551d71 100644
--- a/src/core/lib/config/config_vars.cc
+++ b/src/core/lib/config/config_vars.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/lib/config/config_vars.h"
 
-#include "absl/flags/flag.h"
-#include "absl/strings/escaping.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/flags/flag.h"
+#include "absl/strings/escaping.h"
 #include "src/core/lib/config/load_config.h"
 
 #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING
diff --git a/src/core/lib/config/config_vars.h b/src/core/lib/config/config_vars.h
index 32220cd1f17..b7ea541ad92 100644
--- a/src/core/lib/config/config_vars.h
+++ b/src/core/lib/config/config_vars.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H
 #define GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -27,8 +28,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 class GPR_DLL ConfigVars {
diff --git a/src/core/lib/config/config_vars_non_generated.cc b/src/core/lib/config/config_vars_non_generated.cc
index 2f86246f2b7..78af08c1d8d 100644
--- a/src/core/lib/config/config_vars_non_generated.cc
+++ b/src/core/lib/config/config_vars_non_generated.cc
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/config/core_configuration.cc b/src/core/lib/config/core_configuration.cc
index 474ec3b56c4..3623ac53d8f 100644
--- a/src/core/lib/config/core_configuration.cc
+++ b/src/core/lib/config/core_configuration.cc
@@ -14,14 +14,14 @@
 
 #include "src/core/lib/config/core_configuration.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <utility>
 #include <vector>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 std::atomic<CoreConfiguration*> CoreConfiguration::config_{nullptr};
diff --git a/src/core/lib/config/core_configuration.h b/src/core/lib/config/core_configuration.h
index 400278bd5ea..aa2f79c64fe 100644
--- a/src/core/lib/config/core_configuration.h
+++ b/src/core/lib/config/core_configuration.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
 #define GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/handshaker/proxy_mapper_registry.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/src/core/lib/config/load_config.cc b/src/core/lib/config/load_config.cc
index 3d52fc4db03..afceacc7e4f 100644
--- a/src/core/lib/config/load_config.cc
+++ b/src/core/lib/config/load_config.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/config/load_config.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 
 #include "absl/flags/marshalling.h"
@@ -21,9 +22,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/env.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/config/load_config.h b/src/core/lib/config/load_config.h
index a668174193f..c0a1fe486cd 100644
--- a/src/core/lib/config/load_config.h
+++ b/src/core/lib/config/load_config.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H
 #define GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -24,8 +25,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 std::string LoadConfigFromEnv(absl::string_view environment_variable,
diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc
index 920c5d491c9..3eb004ec232 100644
--- a/src/core/lib/debug/trace.cc
+++ b/src/core/lib/debug/trace.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/debug/trace.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <type_traits>
 #include <utility>
@@ -28,10 +31,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/glob.h"
 
diff --git a/src/core/lib/debug/trace_flags.cc b/src/core/lib/debug/trace_flags.cc
index 03bfe06312c..29963b4c1f6 100644
--- a/src/core/lib/debug/trace_flags.cc
+++ b/src/core/lib/debug/trace_flags.cc
@@ -17,7 +17,6 @@
 //
 
 #include "absl/container/flat_hash_map.h"
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/no_destruct.h"
 
diff --git a/src/core/lib/debug/trace_impl.h b/src/core/lib/debug/trace_impl.h
index 4d91c374d02..5d43e103433 100644
--- a/src/core/lib/debug/trace_impl.h
+++ b/src/core/lib/debug/trace_impl.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_DEBUG_TRACE_IMPL_H
 #define GRPC_SRC_CORE_LIB_DEBUG_TRACE_IMPL_H
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <map>
 #include <string>
@@ -23,8 +25,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 #ifdef _WIN32
 #undef ERROR
 #endif
diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc
index f1faf409241..1d38e9b827b 100644
--- a/src/core/lib/event_engine/ares_resolver.cc
+++ b/src/core/lib/event_engine/ares_resolver.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/ares_resolver.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 // IWYU pragma: no_include <ares_version.h>
@@ -42,6 +42,7 @@
 #include "src/core/lib/event_engine/nameser.h"  // IWYU pragma: keep
 #endif
 
+#include <grpc/event_engine/event_engine.h>
 #include <string.h>
 
 #include <algorithm>
@@ -59,9 +60,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/src/core/lib/event_engine/ares_resolver.h b/src/core/lib/event_engine/ares_resolver.h
index 331e533b35f..e9ca598d82e 100644
--- a/src/core/lib/event_engine/ares_resolver.h
+++ b/src/core/lib/event_engine/ares_resolver.h
@@ -14,30 +14,27 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 
 #if GRPC_ARES == 1
 
+#include <ares.h>
+#include <grpc/event_engine/event_engine.h>
+
 #include <list>
 #include <memory>
 
-#include <ares.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/lib/event_engine/cf_engine/cf_engine.cc b/src/core/lib/event_engine/cf_engine/cf_engine.cc
index cc80e9977b6..a4c61521a29 100644
--- a/src/core/lib/event_engine/cf_engine/cf_engine.cc
+++ b/src/core/lib/event_engine/cf_engine/cf_engine.cc
@@ -19,12 +19,10 @@
 #ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 
 #include <CoreFoundation/CoreFoundation.h>
+#include <grpc/support/cpu.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/cpu.h>
-
 #include "src/core/lib/event_engine/cf_engine/cf_engine.h"
 #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h"
 #include "src/core/lib/event_engine/cf_engine/dns_service_resolver.h"
diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
index 7a5f15b4208..9f7235aaa00 100644
--- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
@@ -21,7 +21,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h"
 #include "src/core/util/strerror.h"
 
diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
index 8623dc888f0..04d8f8bf640 100644
--- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
+++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
@@ -20,11 +20,9 @@
 #ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 
 #include <CoreFoundation/CoreFoundation.h>
-
-#include "absl/strings/str_format.h"
-
 #include <grpc/event_engine/event_engine.h>
 
+#include "absl/strings/str_format.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/cf_engine/cf_engine.h"
 #include "src/core/lib/event_engine/cf_engine/cftype_unique_ref.h"
diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
index a4fd9758ae5..c75b62b8f98 100644
--- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
+++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
@@ -21,7 +21,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/event_engine/cf_engine/dns_service_resolver.h"
 #include "src/core/lib/event_engine/posix_engine/lockfree_event.h"
diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h
index e9c464029b3..01d69b95cc8 100644
--- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h
+++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h
@@ -21,12 +21,10 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <dns_sd.h>
+#include <grpc/event_engine/event_engine.h>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/cf_engine/cf_engine.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/event_engine/channel_args_endpoint_config.cc b/src/core/lib/event_engine/channel_args_endpoint_config.cc
index 6cc79a7028a..41dd385080e 100644
--- a/src/core/lib/event_engine/channel_args_endpoint_config.cc
+++ b/src/core/lib/event_engine/channel_args_endpoint_config.cc
@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 
-#include <string>
-
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/channel_args_endpoint_config.h b/src/core/lib/event_engine/channel_args_endpoint_config.h
index c14735e3376..91000223bf2 100644
--- a/src/core/lib/event_engine/channel_args_endpoint_config.h
+++ b/src/core/lib/event_engine/channel_args_endpoint_config.h
@@ -14,12 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H
 
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/common_closures.h b/src/core/lib/event_engine/common_closures.h
index 007f352cbb8..52a8477be17 100644
--- a/src/core/lib/event_engine/common_closures.h
+++ b/src/core/lib/event_engine/common_closures.h
@@ -15,13 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/default_event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc
index 24282e7921b..7b005d02d8e 100644
--- a/src/core/lib/event_engine/default_event_engine.cc
+++ b/src/core/lib/event_engine/default_event_engine.cc
@@ -13,15 +13,14 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/default_event_engine.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <memory>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/event_engine/default_event_engine.h b/src/core/lib/event_engine/default_event_engine.h
index 2f7c982ab4c..2a254d49586 100644
--- a/src/core/lib/event_engine/default_event_engine.h
+++ b/src/core/lib/event_engine/default_event_engine.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/debug_location.h"
 
diff --git a/src/core/lib/event_engine/default_event_engine_factory.cc b/src/core/lib/event_engine/default_event_engine_factory.cc
index d48aa2fba03..8f91ad64431 100644
--- a/src/core/lib/event_engine/default_event_engine_factory.cc
+++ b/src/core/lib/event_engine/default_event_engine_factory.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/lib/event_engine/default_event_engine_factory.h"
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #if defined(GPR_WINDOWS)
 #include "src/core/lib/event_engine/windows/windows_engine.h"
 
diff --git a/src/core/lib/event_engine/default_event_engine_factory.h b/src/core/lib/event_engine/default_event_engine_factory.h
index a32f04ff6be..3e97c4e480b 100644
--- a/src/core/lib/event_engine/default_event_engine_factory.h
+++ b/src/core/lib/event_engine/default_event_engine_factory.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/event_engine.cc b/src/core/lib/event_engine/event_engine.cc
index 5a162f871a1..0a16cba4dbc 100644
--- a/src/core/lib/event_engine/event_engine.cc
+++ b/src/core/lib/event_engine/event_engine.cc
@@ -11,11 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "absl/strings/str_cat.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_cat.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/extensions/can_track_errors.h b/src/core/lib/event_engine/extensions/can_track_errors.h
index 8a6f9df046c..d3042acbb2a 100644
--- a/src/core/lib/event_engine/extensions/can_track_errors.h
+++ b/src/core/lib/event_engine/extensions/can_track_errors.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/extensions/chaotic_good_extension.h b/src/core/lib/event_engine/extensions/chaotic_good_extension.h
index 9610f4ed720..e787712e266 100644
--- a/src/core/lib/event_engine/extensions/chaotic_good_extension.h
+++ b/src/core/lib/event_engine/extensions/chaotic_good_extension.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CHAOTIC_GOOD_EXTENSION_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CHAOTIC_GOOD_EXTENSION_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/extensions/supports_fd.h b/src/core/lib/event_engine/extensions/supports_fd.h
index 30f0d2ad0e6..c7a1bfdcd4f 100644
--- a/src/core/lib/event_engine/extensions/supports_fd.h
+++ b/src/core/lib/event_engine/extensions/supports_fd.h
@@ -15,13 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include "absl/functional/any_invocable.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/extensions/tcp_trace.h b/src/core/lib/event_engine/extensions/tcp_trace.h
index e5d66a45860..4e5efa712f7 100644
--- a/src/core/lib/event_engine/extensions/tcp_trace.h
+++ b/src/core/lib/event_engine/extensions/tcp_trace.h
@@ -18,7 +18,6 @@
 #include <memory>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/telemetry/tcp_tracer.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/forkable.cc b/src/core/lib/event_engine/forkable.cc
index 0034cbbd92e..e83c8105dee 100644
--- a/src/core/lib/event_engine/forkable.cc
+++ b/src/core/lib/event_engine/forkable.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/event_engine/forkable.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+
 #ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK
 #include <pthread.h>
 #endif
diff --git a/src/core/lib/event_engine/forkable.h b/src/core/lib/event_engine/forkable.h
index 414947b7515..38a3637ecae 100644
--- a/src/core/lib/event_engine/forkable.h
+++ b/src/core/lib/event_engine/forkable.h
@@ -14,11 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_FORKABLE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_FORKABLE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/grpc_polled_fd.h b/src/core/lib/event_engine/grpc_polled_fd.h
index d1e6dc3b20c..65ce8cbb176 100644
--- a/src/core/lib/event_engine/grpc_polled_fd.h
+++ b/src/core/lib/event_engine/grpc_polled_fd.h
@@ -15,18 +15,17 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #if GRPC_ARES == 1
 
 #include <ares.h>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-
 #include "src/core/util/sync.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/handle_containers.h b/src/core/lib/event_engine/handle_containers.h
index 2a4cd766f18..5772de7476d 100644
--- a/src/core/lib/event_engine/handle_containers.h
+++ b/src/core/lib/event_engine/handle_containers.h
@@ -14,6 +14,8 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
@@ -22,9 +24,6 @@
 #include "absl/container/flat_hash_set.h"
 #include "absl/hash/hash.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/memory_allocator_factory.h b/src/core/lib/event_engine/memory_allocator_factory.h
index 88e61908ef3..8283c415970 100644
--- a/src/core/lib/event_engine/memory_allocator_factory.h
+++ b/src/core/lib/event_engine/memory_allocator_factory.h
@@ -13,14 +13,13 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_MEMORY_ALLOCATOR_FACTORY_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_MEMORY_ALLOCATOR_FACTORY_H
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/poller.h b/src/core/lib/event_engine/poller.h
index 26333e798fa..550ce2b24f2 100644
--- a/src/core/lib/event_engine/poller.h
+++ b/src/core/lib/event_engine/poller.h
@@ -14,11 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H
 
-#include "absl/functional/function_ref.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/function_ref.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/.clang-format b/src/core/lib/event_engine/posix_engine/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/lib/event_engine/posix_engine/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
index f59c6616bd9..e8abcaf471d 100644
--- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
+++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
@@ -13,6 +13,10 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -23,12 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/time_util.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h
index 42c61446659..de850dc671f 100644
--- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h
+++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h
@@ -14,6 +14,9 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_EPOLL1_LINUX_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_EPOLL1_LINUX_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <list>
 #include <memory>
 #include <string>
@@ -22,10 +25,6 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
index c62c9e1a8e2..9bc6ba27553 100644
--- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
+++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -27,13 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
@@ -43,13 +41,12 @@
 #ifdef GRPC_POSIX_SOCKET_EV_POLL
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
 #include <limits.h>
 #include <poll.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h"
diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h
index d3e139eb0c8..d296eb58e50 100644
--- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h
+++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_POLL_POSIX_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_POLL_POSIX_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
diff --git a/src/core/lib/event_engine/posix_engine/event_poller.h b/src/core/lib/event_engine/posix_engine/event_poller.h
index 49cf7769364..3553ae6ca3f 100644
--- a/src/core/lib/event_engine/posix_engine/event_poller.h
+++ b/src/core/lib/event_engine/posix_engine/event_poller.h
@@ -14,15 +14,14 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
index 7f11bbb05a0..7d22bcaf503 100644
--- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
+++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h"
diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h
index f1ec8c39d9e..bfde1904d9c 100644
--- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h
+++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_POSIX_DEFAULT_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_POSIX_DEFAULT_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
index 7c9f8a5f742..0dba5c5d11b 100644
--- a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
+++ b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_GRPC_POLLED_FD_POSIX_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_GRPC_POLLED_FD_POSIX_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
 
@@ -27,6 +27,7 @@
 
 // IWYU pragma: no_include <ares_build.h>
 
+#include <ares.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ -36,12 +37,9 @@
 #include <unordered_set>
 #include <utility>
 
-#include <ares.h>
-
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
diff --git a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc
index dd4d3711f9d..878b5ba4022 100644
--- a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc
+++ b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc
@@ -14,10 +14,9 @@
 
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
diff --git a/src/core/lib/event_engine/posix_engine/internal_errqueue.h b/src/core/lib/event_engine/posix_engine/internal_errqueue.h
index c779af8106d..e2c1460d050 100644
--- a/src/core/lib/event_engine/posix_engine/internal_errqueue.h
+++ b/src/core/lib/event_engine/posix_engine/internal_errqueue.h
@@ -15,9 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_INTERNAL_ERRQUEUE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_INTERNAL_ERRQUEUE_H
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/lib/iomgr/port.h"
 
diff --git a/src/core/lib/event_engine/posix_engine/lockfree_event.cc b/src/core/lib/event_engine/posix_engine/lockfree_event.cc
index e0cb157b922..6a904cd36db 100644
--- a/src/core/lib/event_engine/posix_engine/lockfree_event.cc
+++ b/src/core/lib/event_engine/posix_engine/lockfree_event.cc
@@ -13,15 +13,14 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/posix_engine/lockfree_event.h"
 
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/event_engine/posix_engine/lockfree_event.h b/src/core/lib/event_engine/posix_engine/lockfree_event.h
index a9c2635cc91..fb05ae450cb 100644
--- a/src/core/lib/event_engine/posix_engine/lockfree_event.h
+++ b/src/core/lib/event_engine/posix_engine/lockfree_event.h
@@ -14,13 +14,12 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_LOCKFREE_EVENT_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_LOCKFREE_EVENT_H
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
index 7d4c7a0ac7b..44f23efb71e 100644
--- a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
+++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
@@ -32,7 +32,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h"
 #include "src/core/util/host_port.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
index 693a70fbb43..138f89ac73e 100644
--- a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
+++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_POSIX_DNS_RESOLVER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_POSIX_DNS_RESOLVER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc
index bf6a78bb23c..ab1e61fbf65 100644
--- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc
@@ -14,6 +14,11 @@
 #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h"
 
 #include <errno.h>
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <limits.h>
 
@@ -32,13 +37,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.h b/src/core/lib/event_engine/posix_engine/posix_endpoint.h
index 81ec03c7f0f..98d0e169c8a 100644
--- a/src/core/lib/event_engine/posix_engine/posix_endpoint.h
+++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.h
@@ -19,6 +19,11 @@
 
 // IWYU pragma: no_include <bits/types/struct_iovec.h>
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/alloc.h>
+
 #include <atomic>
 #include <cstdint>
 #include <memory>
@@ -33,12 +38,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/event_engine/extensions/supports_fd.h"
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc
index d0683677795..f2275975b0d 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc
@@ -13,6 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -30,13 +36,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/cpu.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/ares_resolver.h"
 #include "src/core/lib/event_engine/forkable.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.h b/src/core/lib/event_engine/posix_engine/posix_engine.h
index f2483d11653..82be0bdd0e5 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine.h
@@ -13,6 +13,11 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_H
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 #include <memory>
@@ -27,12 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/handle_containers.h"
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_closure.h b/src/core/lib/event_engine/posix_engine/posix_engine_closure.h
index 084b096c14a..46d06f9c024 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_closure.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_closure.h
@@ -14,14 +14,14 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_CLOSURE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_CLOSURE_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
index d8b40ab2f71..ce95139e6e8 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -20,7 +20,9 @@
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 
-#include <errno.h>       // IWYU pragma: keep
+#include <errno.h>  // IWYU pragma: keep
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
 #include <sys/socket.h>  // IWYU pragma: keep
 #include <unistd.h>      // IWYU pragma: keep
 
@@ -36,10 +38,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h
index 40c43de8c12..1ddbe1b3fb9 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h
@@ -14,6 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <atomic>
@@ -26,13 +31,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
index b3532e2d860..f8db2f28df9 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,10 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_replace.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h
index e5a9684545a..2fe3f68161c 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h
@@ -14,11 +14,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_UTILS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_UTILS_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
index fad1a7f6730..2631b9926ef 100644
--- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
+++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
@@ -15,18 +15,16 @@
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 
 #include <errno.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 
 #include "absl/cleanup/cleanup.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
 #include "src/core/util/time.h"
@@ -51,7 +49,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/util/status_helper.h"
 #include "src/core/util/strerror.h"
diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
index 07bd3308d1d..5a11675cbec 100644
--- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
+++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
@@ -15,6 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TCP_SOCKET_UTILS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TCP_SOCKET_UTILS_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 #include <utility>
@@ -22,13 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/src/core/lib/event_engine/posix_engine/timer.cc b/src/core/lib/event_engine/posix_engine/timer.cc
index 8e77e251bcc..4f4c303721d 100644
--- a/src/core/lib/event_engine/posix_engine/timer.cc
+++ b/src/core/lib/event_engine/posix_engine/timer.cc
@@ -18,14 +18,14 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 
+#include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <atomic>
 #include <limits>
 #include <utility>
 
-#include <grpc/support/cpu.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/timer_heap.h"
 #include "src/core/util/time.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/lib/event_engine/posix_engine/timer.h b/src/core/lib/event_engine/posix_engine/timer.h
index 54f753b91cf..7528ca89c1e 100644
--- a/src/core/lib/event_engine/posix_engine/timer.h
+++ b/src/core/lib/event_engine/posix_engine/timer.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -28,10 +30,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/timer_heap.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
diff --git a/src/core/lib/event_engine/posix_engine/timer_heap.cc b/src/core/lib/event_engine/posix_engine/timer_heap.cc
index c3e560ba5cc..85fbdb9e01d 100644
--- a/src/core/lib/event_engine/posix_engine/timer_heap.cc
+++ b/src/core/lib/event_engine/posix_engine/timer_heap.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer_heap.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/timer_heap.h b/src/core/lib/event_engine/posix_engine/timer_heap.h
index a13bc206cba..b59eb9b127f 100644
--- a/src/core/lib/event_engine/posix_engine/timer_heap.h
+++ b/src/core/lib/event_engine/posix_engine/timer_heap.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_HEAP_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_HEAP_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.cc b/src/core/lib/event_engine/posix_engine/timer_manager.cc
index 8a0373cf86b..4b2097e8b81 100644
--- a/src/core/lib/event_engine/posix_engine/timer_manager.cc
+++ b/src/core/lib/event_engine/posix_engine/timer_manager.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <memory>
 #include <utility>
 
@@ -25,10 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 
 static thread_local bool g_timer_thread;
diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.h b/src/core/lib/event_engine/posix_engine/timer_manager.h
index 3650a06dfce..c7616db7c62 100644
--- a/src/core/lib/event_engine/posix_engine/timer_manager.h
+++ b/src/core/lib/event_engine/posix_engine/timer_manager.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_MANAGER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_MANAGER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -26,10 +28,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc
index d908ca76943..2bc411b9d6e 100644
--- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc
+++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -23,10 +25,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h
index 1df29a14243..bd77ea81139 100644
--- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h
+++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h
@@ -15,15 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TRACED_BUFFER_LIST_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TRACED_BUFFER_LIST_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc
index d6efbd26671..e23df12cdfa 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
 
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h
index 6ab9a6eaeb4..62d5c658240 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h
@@ -14,13 +14,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_EVENTFD_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_EVENTFD_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc
index 9f2a0959df3..9aa1ba317c5 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
 
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
index 7676d6cf57b..9884363907c 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
@@ -14,13 +14,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_PIPE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_PIPE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
index 119dab7ecfb..2e7f1574280 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
@@ -42,10 +42,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_H
 
-#include "absl/status/status.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc
index 35768988b65..71caee017bd 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc
@@ -11,13 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
index 40e9381576a..51f766fe760 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
@@ -14,12 +14,12 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_DEFAULT_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_DEFAULT_H
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/statusor.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/query_extensions.h b/src/core/lib/event_engine/query_extensions.h
index 2b39214e635..a9c7e7b8fff 100644
--- a/src/core/lib/event_engine/query_extensions.h
+++ b/src/core/lib/event_engine/query_extensions.h
@@ -14,11 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
index 107ba10f75b..3de70e7cd38 100644
--- a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
+++ b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
@@ -15,13 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H
 
-#include <stdint.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/util/orphanable.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/resolved_address.cc b/src/core/lib/event_engine/resolved_address.cc
index 95c37586ae2..1a41663bedd 100644
--- a/src/core/lib/event_engine/resolved_address.cc
+++ b/src/core/lib/event_engine/resolved_address.cc
@@ -14,13 +14,11 @@
 
 #include "src/core/lib/iomgr/resolved_address.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
 
 // IWYU pragma: no_include <sys/socket.h>
diff --git a/src/core/lib/event_engine/slice.cc b/src/core/lib/event_engine/slice.cc
index 7d4a6c4a051..ea6994631ac 100644
--- a/src/core/lib/event_engine/slice.cc
+++ b/src/core/lib/event_engine/slice.cc
@@ -14,17 +14,15 @@
 
 #include "src/core/lib/slice/slice.h"
 
+#include <grpc/event_engine/slice.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/slice.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 
diff --git a/src/core/lib/event_engine/slice_buffer.cc b/src/core/lib/event_engine/slice_buffer.cc
index 4a1aa804837..5b8ad807ad7 100644
--- a/src/core/lib/event_engine/slice_buffer.cc
+++ b/src/core/lib/event_engine/slice_buffer.cc
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <stddef.h>
-
 #include <grpc/event_engine/slice.h>
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/slice/slice.h"
 
diff --git a/src/core/lib/event_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/tcp_socket_utils.cc
index 1353249817d..d4ef7a8bb48 100644
--- a/src/core/lib/event_engine/tcp_socket_utils.cc
+++ b/src/core/lib/event_engine/tcp_socket_utils.cc
@@ -58,7 +58,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/host_port.h"
 #include "src/core/util/status_helper.h"
diff --git a/src/core/lib/event_engine/tcp_socket_utils.h b/src/core/lib/event_engine/tcp_socket_utils.h
index d048a124b06..c8f25fe45fb 100644
--- a/src/core/lib/event_engine/tcp_socket_utils.h
+++ b/src/core/lib/event_engine/tcp_socket_utils.h
@@ -14,14 +14,14 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/thread_pool/thread_count.cc b/src/core/lib/event_engine/thread_pool/thread_count.cc
index faeffe1f896..c2010a2a448 100644
--- a/src/core/lib/event_engine/thread_pool/thread_count.cc
+++ b/src/core/lib/event_engine/thread_pool/thread_count.cc
@@ -13,6 +13,7 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/thread_pool/thread_count.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <cstddef>
@@ -22,9 +23,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/thread_pool/thread_count.h b/src/core/lib/event_engine/thread_pool/thread_count.h
index 7bca370e9e1..cbd10fcfd71 100644
--- a/src/core/lib/event_engine/thread_pool/thread_count.h
+++ b/src/core/lib/event_engine/thread_pool/thread_count.h
@@ -14,6 +14,9 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H
 
+#include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstddef>
 #include <cstdint>
@@ -22,10 +25,6 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/cpu.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/lib/event_engine/thread_pool/thread_pool.h b/src/core/lib/event_engine/thread_pool/thread_pool.h
index 2590d891a30..e4648d1dbd3 100644
--- a/src/core/lib/event_engine/thread_pool/thread_pool.h
+++ b/src/core/lib/event_engine/thread_pool/thread_pool.h
@@ -13,15 +13,13 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/forkable.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc
index bea6d8d526c..e3a3799b6a4 100644
--- a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc
+++ b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc
@@ -11,12 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
index 852cf0f3915..a8f35bb1cfd 100644
--- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
+++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
@@ -17,6 +17,8 @@
 //
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/thd_id.h>
 #include <inttypes.h>
 
 #include <atomic>
@@ -31,10 +33,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/thd_id.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_local.h"
diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h
index 69beaa7cddd..a0c79f64da0 100644
--- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h
+++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h
@@ -18,6 +18,9 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_WORK_STEALING_THREAD_POOL_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_WORK_STEALING_THREAD_POOL_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/thd_id.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,11 +30,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/thd_id.h>
-
 #include "src/core/lib/event_engine/thread_pool/thread_count.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc
index 5475f2e45a0..94b53e9081b 100644
--- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc
+++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <type_traits>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/thd.h"
diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h
index 8b87d90a757..02f90c7a771 100644
--- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h
+++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREADY_EVENT_ENGINE_THREADY_EVENT_ENGINE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREADY_EVENT_ENGINE_THREADY_EVENT_ENGINE_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
@@ -23,11 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/time_util.cc b/src/core/lib/event_engine/time_util.cc
index d7b663581d1..ab542b1e258 100644
--- a/src/core/lib/event_engine/time_util.cc
+++ b/src/core/lib/event_engine/time_util.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/time_util.h"
 
-#include <chrono>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <chrono>
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/time_util.h b/src/core/lib/event_engine/time_util.h
index 813b6cda8f8..14ec99ab5d1 100644
--- a/src/core/lib/event_engine/time_util.h
+++ b/src/core/lib/event_engine/time_util.h
@@ -14,10 +14,9 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TIME_UTIL_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TIME_UTIL_H
 
-#include <stddef.h>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 namespace grpc_event_engine {
 namespace experimental {
diff --git a/src/core/lib/event_engine/utils.cc b/src/core/lib/event_engine/utils.cc
index d0d1b436c5d..f2a202315ce 100644
--- a/src/core/lib/event_engine/utils.cc
+++ b/src/core/lib/event_engine/utils.cc
@@ -13,15 +13,13 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/utils.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/utils.h b/src/core/lib/event_engine/utils.h
index 5edfcd890f0..45675ee8d88 100644
--- a/src/core/lib/event_engine/utils.h
+++ b/src/core/lib/event_engine/utils.h
@@ -14,13 +14,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_UTILS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_UTILS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/windows/.clang-format b/src/core/lib/event_engine/windows/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/lib/event_engine/windows/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
index 3723b3463ed..3bfd15537e6 100644
--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
@@ -18,17 +18,14 @@
 
 #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 
-#include <winsock2.h>
-
 #include <ares.h>
+#include <grpc/support/log_windows.h>
+#include <winsock2.h>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/ares_resolver.h"
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
index e16c8e80e9e..f0efeaccfcc 100644
--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
@@ -21,15 +21,13 @@
 
 #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 
-#include <memory>
-
 #include <ares.h>
+#include <grpc/event_engine/event_engine.h>
+
+#include <memory>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/src/core/lib/event_engine/windows/iocp.cc b/src/core/lib/event_engine/windows/iocp.cc
index 74d875ba2ab..b3458b3e05a 100644
--- a/src/core/lib/event_engine/windows/iocp.cc
+++ b/src/core/lib/event_engine/windows/iocp.cc
@@ -15,14 +15,13 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
+
 #include <chrono>
 
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/time_util.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/src/core/lib/event_engine/windows/iocp.h b/src/core/lib/event_engine/windows/iocp.h
index 9c972ed0f92..812f773b85c 100644
--- a/src/core/lib/event_engine/windows/iocp.h
+++ b/src/core/lib/event_engine/windows/iocp.h
@@ -18,10 +18,9 @@
 
 #ifdef GPR_WINDOWS
 
-#include "absl/status/status.h"
-
 #include <grpc/event_engine/event_engine.h>
 
+#include "absl/status/status.h"
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/win_socket.h"
diff --git a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
index d8114497b11..6a1caaf9116 100644
--- a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
+++ b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
@@ -14,6 +14,7 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_WINDOWS
+#include <grpc/event_engine/event_engine.h>
 #include <inttypes.h>
 #include <string.h>
 #include <sys/types.h>
@@ -22,9 +23,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/windows/native_windows_dns_resolver.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/host_port.h"
diff --git a/src/core/lib/event_engine/windows/win_socket.cc b/src/core/lib/event_engine/windows/win_socket.cc
index 79fc2bec4fe..482d4bb06f7 100644
--- a/src/core/lib/event_engine/windows/win_socket.cc
+++ b/src/core/lib/event_engine/windows/win_socket.cc
@@ -14,12 +14,11 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_WINDOWS
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/log_windows.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/win_socket.h"
diff --git a/src/core/lib/event_engine/windows/win_socket.h b/src/core/lib/event_engine/windows/win_socket.h
index 4256179c070..6300279efe6 100644
--- a/src/core/lib/event_engine/windows/win_socket.h
+++ b/src/core/lib/event_engine/windows/win_socket.h
@@ -18,11 +18,10 @@
 
 #ifdef GPR_WINDOWS
 
-#include "absl/base/thread_annotations.h"
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/event_engine/event_engine.h>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/functional/any_invocable.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/event_engine/windows/windows_endpoint.cc b/src/core/lib/event_engine/windows/windows_endpoint.cc
index ec4118c7fd2..3b16c060de6 100644
--- a/src/core/lib/event_engine/windows/windows_endpoint.cc
+++ b/src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -15,16 +15,15 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/log_windows.h>
+
 #include "absl/cleanup/cleanup.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/windows_endpoint.h"
diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc
index 31e2eb03569..6a1fb634fe5 100644
--- a/src/core/lib/event_engine/windows/windows_engine.cc
+++ b/src/core/lib/event_engine/windows/windows_engine.cc
@@ -15,6 +15,12 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/cpu.h>
+
 #include <memory>
 #include <ostream>
 
@@ -23,13 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/cpu.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/handle_containers.h"
diff --git a/src/core/lib/event_engine/windows/windows_engine.h b/src/core/lib/event_engine/windows/windows_engine.h
index 98ca81e1a52..c9a597b5713 100644
--- a/src/core/lib/event_engine/windows/windows_engine.h
+++ b/src/core/lib/event_engine/windows/windows_engine.h
@@ -20,17 +20,16 @@
 
 #ifdef GPR_WINDOWS
 
-#include <memory>
-
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/memory_allocator.h>
 #include <grpc/event_engine/slice_buffer.h>
 
+#include <memory>
+
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/event_engine/ares_resolver.h"
 #include "src/core/lib/event_engine/handle_containers.h"
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
diff --git a/src/core/lib/event_engine/windows/windows_listener.cc b/src/core/lib/event_engine/windows/windows_listener.cc
index 2bba1a6e818..63b973cf213 100644
--- a/src/core/lib/event_engine/windows/windows_listener.cc
+++ b/src/core/lib/event_engine/windows/windows_listener.cc
@@ -19,7 +19,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
 #include "src/core/lib/event_engine/windows/win_socket.h"
diff --git a/src/core/lib/event_engine/windows/windows_listener.h b/src/core/lib/event_engine/windows/windows_listener.h
index 8e0a5bd0f95..4dd254d7d10 100644
--- a/src/core/lib/event_engine/windows/windows_listener.h
+++ b/src/core/lib/event_engine/windows/windows_listener.h
@@ -18,14 +18,13 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <list>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.cc b/src/core/lib/event_engine/work_queue/basic_work_queue.cc
index 40bfcf7cd5d..629debf2bc8 100644
--- a/src/core/lib/event_engine/work_queue/basic_work_queue.cc
+++ b/src/core/lib/event_engine/work_queue/basic_work_queue.cc
@@ -13,10 +13,10 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.h b/src/core/lib/event_engine/work_queue/basic_work_queue.h
index 93ac366831e..20da2977742 100644
--- a/src/core/lib/event_engine/work_queue/basic_work_queue.h
+++ b/src/core/lib/event_engine/work_queue/basic_work_queue.h
@@ -13,16 +13,14 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_BASIC_WORK_QUEUE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_BASIC_WORK_QUEUE_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <deque>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/work_queue/work_queue.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/event_engine/work_queue/work_queue.h b/src/core/lib/event_engine/work_queue/work_queue.h
index 73c6a74ab21..393a1bce6a0 100644
--- a/src/core/lib/event_engine/work_queue/work_queue.h
+++ b/src/core/lib/event_engine/work_queue/work_queue.h
@@ -14,13 +14,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_WORK_QUEUE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_WORK_QUEUE_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/functional/any_invocable.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc
index cab35e0f04a..f2ec5d1a0db 100644
--- a/src/core/lib/experiments/config.cc
+++ b/src/core/lib/experiments/config.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/experiments/config.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -30,9 +31,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
diff --git a/src/core/lib/experiments/config.h b/src/core/lib/experiments/config.h
index 921875b99bb..e74f7c6b716 100644
--- a/src/core/lib/experiments/config.h
+++ b/src/core/lib/experiments/config.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_EXPERIMENTS_CONFIG_H
 #define GRPC_SRC_CORE_LIB_EXPERIMENTS_CONFIG_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -23,8 +24,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 // #define GRPC_EXPERIMENTS_ARE_FINAL
 
 namespace grpc_core {
diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc
index 91bfc45a021..1cc2cbb4e9c 100644
--- a/src/core/lib/iomgr/buffer_list.cc
+++ b/src/core/lib/iomgr/buffer_list.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/lib/iomgr/buffer_list.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h
index 6805c53c08d..47d390354a8 100644
--- a/src/core/lib/iomgr/buffer_list.h
+++ b/src/core/lib/iomgr/buffer_list.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H
 #define GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/internal_errqueue.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc
index e20cc0a0986..8459f415157 100644
--- a/src/core/lib/iomgr/call_combiner.cc
+++ b/src/core/lib/iomgr/call_combiner.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/iomgr/call_combiner.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h
index 23488f51cfc..8e4b7189798 100644
--- a/src/core/lib/iomgr/call_combiner.h
+++ b/src/core/lib/iomgr/call_combiner.h
@@ -19,14 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H
 
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/container/inlined_vector.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/dynamic_annotations.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc
index e70393f6abd..0b64b87f3dd 100644
--- a/src/core/lib/iomgr/cfstream_handle.cc
+++ b/src/core/lib/iomgr/cfstream_handle.cc
@@ -23,13 +23,11 @@
 
 #ifdef GRPC_CFSTREAM
 #import <CoreFoundation/CoreFoundation.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/sync.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/debug/trace.h"
 #import "src/core/lib/iomgr/cfstream_handle.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/iomgr/closure.cc b/src/core/lib/iomgr/closure.cc
index 12ff26a9156..bbc81f8445e 100644
--- a/src/core/lib/iomgr/closure.cc
+++ b/src/core/lib/iomgr/closure.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/iomgr/closure.h"
 
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_format.h"
+
 std::string grpc_closure::DebugString() const {
 #ifdef NDEBUG
   return absl::StrFormat("%p", this);
diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h
index cb08c23e7c7..cf01653e9d8 100644
--- a/src/core/lib/iomgr/closure.h
+++ b/src/core/lib/iomgr/closure.h
@@ -20,14 +20,12 @@
 #define GRPC_SRC_CORE_LIB_IOMGR_CLOSURE_H
 
 #include <assert.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdbool.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc
index 31f7b204af9..81f33c70a2b 100644
--- a/src/core/lib/iomgr/combiner.cc
+++ b/src/core/lib/iomgr/combiner.cc
@@ -19,15 +19,13 @@
 #include "src/core/lib/iomgr/combiner.h"
 
 #include <assert.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h
index af15e83af29..f7fd6bd6955 100644
--- a/src/core/lib/iomgr/combiner.h
+++ b/src/core/lib/iomgr/combiner.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H
 
-#include <stddef.h>
-
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h
index c4b70abe4f3..9825d21a6b5 100644
--- a/src/core/lib/iomgr/endpoint.h
+++ b/src/core/lib/iomgr/endpoint.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H
 #define GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 
diff --git a/src/core/lib/iomgr/endpoint_cfstream.cc b/src/core/lib/iomgr/endpoint_cfstream.cc
index c542c6ae6bc..3177567e948 100644
--- a/src/core/lib/iomgr/endpoint_cfstream.cc
+++ b/src/core/lib/iomgr/endpoint_cfstream.cc
@@ -23,14 +23,12 @@
 #ifdef GRPC_CFSTREAM_ENDPOINT
 
 #import <CoreFoundation/CoreFoundation.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/cfstream_handle.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc
index 85fb3849f29..04c574560c0 100644
--- a/src/core/lib/iomgr/endpoint_pair_posix.cc
+++ b/src/core/lib/iomgr/endpoint_pair_posix.cc
@@ -24,6 +24,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -32,9 +33,6 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc
index f8a746624e6..f30f691323d 100644
--- a/src/core/lib/iomgr/endpoint_pair_windows.cc
+++ b/src/core/lib/iomgr/endpoint_pair_windows.cc
@@ -27,7 +27,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc
index d637ab6d20c..90f535bcf5e 100644
--- a/src/core/lib/iomgr/error.cc
+++ b/src/core/lib/iomgr/error.cc
@@ -17,6 +17,10 @@
 //
 #include "src/core/lib/iomgr/error.h"
 
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -24,12 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 
 #ifdef GPR_WINDOWS
diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h
index e1fb98107c1..0171c504811 100644
--- a/src/core/lib/iomgr/error.h
+++ b/src/core/lib/iomgr/error.h
@@ -19,17 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_ERROR_H
 #define GRPC_SRC_CORE_LIB_IOMGR_ERROR_H
 
-#include <inttypes.h>
-#include <stdbool.h>
-
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <stdbool.h>
 
+#include "absl/log/check.h"
+#include "absl/status/status.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/error_cfstream.cc b/src/core/lib/iomgr/error_cfstream.cc
index 49f5b0aaddf..b9f7cdf1992 100644
--- a/src/core/lib/iomgr/error_cfstream.cc
+++ b/src/core/lib/iomgr/error_cfstream.cc
@@ -20,13 +20,11 @@
 
 #ifdef GRPC_CFSTREAM
 #include <CoreFoundation/CoreFoundation.h>
+#include <grpc/support/alloc.h>
 
 #include <string>
 
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/error.h"
 
 #define MAX_ERROR_DESCRIPTION 256
diff --git a/src/core/lib/iomgr/ev_apple.cc b/src/core/lib/iomgr/ev_apple.cc
index 73ded9294d7..e20f05e5185 100644
--- a/src/core/lib/iomgr/ev_apple.cc
+++ b/src/core/lib/iomgr/ev_apple.cc
@@ -34,7 +34,6 @@
 #include <list>
 
 #include "absl/time/time.h"
-
 #include "src/core/lib/iomgr/ev_apple.h"
 #include "src/core/util/thd.h"
 #include "src/core/util/time_util.h"
diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc
index ff347ac69d6..a290c3d1bdc 100644
--- a/src/core/lib/iomgr/ev_epoll1_linux.cc
+++ b/src/core/lib/iomgr/ev_epoll1_linux.cc
@@ -27,6 +27,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/cpu.h>
 #include <limits.h>
 #include <poll.h>
 #include <pthread.h>
@@ -43,10 +45,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/cpu.h>
-
 #include "src/core/lib/iomgr/block_annotate.h"
 #include "src/core/lib/iomgr/ev_epoll1_linux.h"
 #include "src/core/lib/iomgr/ev_posix.h"
diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc
index 9e955d8c094..32d42c36e27 100644
--- a/src/core/lib/iomgr/ev_poll_posix.cc
+++ b/src/core/lib/iomgr/ev_poll_posix.cc
@@ -25,6 +25,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <grpc/support/alloc.h>
 #include <limits.h>
 #include <poll.h>
 #include <string.h>
@@ -37,9 +38,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/block_annotate.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc
index e195c940d87..055ca6efb5e 100644
--- a/src/core/lib/iomgr/ev_posix.cc
+++ b/src/core/lib/iomgr/ev_posix.cc
@@ -23,15 +23,13 @@
 
 #ifdef GRPC_POSIX_SOCKET_EV
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/ev_epoll1_linux.h"
diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h
index 8573f0568bc..1e40d81f020 100644
--- a/src/core/lib/iomgr/ev_posix.h
+++ b/src/core/lib/iomgr/ev_posix.h
@@ -23,9 +23,8 @@
 
 #ifdef GRPC_POSIX_SOCKET_EV
 
-#include <poll.h>
-
 #include <grpc/support/port_platform.h>
+#include <poll.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/iomgr/event_engine_shims/closure.cc b/src/core/lib/iomgr/event_engine_shims/closure.cc
index 8a362210b80..921401941cf 100644
--- a/src/core/lib/iomgr/event_engine_shims/closure.cc
+++ b/src/core/lib/iomgr/event_engine_shims/closure.cc
@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/iomgr/event_engine_shims/closure.h"
 
-#include "absl/functional/any_invocable.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/transport/error_utils.h"
diff --git a/src/core/lib/iomgr/event_engine_shims/closure.h b/src/core/lib/iomgr/event_engine_shims/closure.h
index 87b4e60bee1..2272f68fed7 100644
--- a/src/core/lib/iomgr/event_engine_shims/closure.h
+++ b/src/core/lib/iomgr/event_engine_shims/closure.h
@@ -14,11 +14,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 
diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc
index 28b1ef42bf1..5fec956179e 100644
--- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc
+++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc
@@ -13,6 +13,13 @@
 // limitations under the License.
 #include "src/core/lib/iomgr/event_engine_shims/endpoint.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/codegen/slice.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <atomic>
 #include <memory>
 #include <utility>
@@ -23,14 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/codegen/slice.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/extensions/can_track_errors.h"
 #include "src/core/lib/event_engine/extensions/supports_fd.h"
diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.h b/src/core/lib/iomgr/event_engine_shims/endpoint.h
index 2ff27081503..5e59157aa68 100644
--- a/src/core/lib/iomgr/event_engine_shims/endpoint.h
+++ b/src/core/lib/iomgr/event_engine_shims/endpoint.h
@@ -13,11 +13,11 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/iomgr/endpoint.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc
index 2880415e192..16d27f005a2 100644
--- a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc
+++ b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc
@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h"
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc
index 6bb16390008..23d4248eaa9 100644
--- a/src/core/lib/iomgr/exec_ctx.cc
+++ b/src/core/lib/iomgr/exec_ctx.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h
index 0bda1d9af88..2b608ca9a4d 100644
--- a/src/core/lib/iomgr/exec_ctx.h
+++ b/src/core/lib/iomgr/exec_ctx.h
@@ -19,22 +19,21 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H
 
-#include <limits>
-
 #include <grpc/support/port_platform.h>
 
+#include <limits>
+
 #if __APPLE__
 // Provides TARGET_OS_IPHONE
 #include <TargetConditionals.h>
 #endif
 
-#include "absl/log/check.h"
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc
index 9c427b6fd12..b9ff3a5f78f 100644
--- a/src/core/lib/iomgr/executor.cc
+++ b/src/core/lib/iomgr/executor.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/lib/iomgr/executor.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/debug/trace_impl.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc
index 37059aaa815..0d784ea53cc 100644
--- a/src/core/lib/iomgr/fork_posix.cc
+++ b/src/core/lib/iomgr/fork_posix.cc
@@ -26,13 +26,11 @@
 #include <pthread.h>
 #endif
 
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/src/core/lib/iomgr/fork_windows.cc b/src/core/lib/iomgr/fork_windows.cc
index 84d0609e2a0..baf9e212469 100644
--- a/src/core/lib/iomgr/fork_windows.cc
+++ b/src/core/lib/iomgr/fork_windows.cc
@@ -22,10 +22,10 @@
 
 #ifndef GRPC_POSIX_FORK
 
-#include "absl/log/log.h"
-
 #include <grpc/fork.h>
 
+#include "absl/log/log.h"
+
 //
 // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK
 //       AROUND VERY SPECIFIC USE CASES.
diff --git a/src/core/lib/iomgr/internal_errqueue.cc b/src/core/lib/iomgr/internal_errqueue.cc
index 65199cd8e35..d5386498a53 100644
--- a/src/core/lib/iomgr/internal_errqueue.cc
+++ b/src/core/lib/iomgr/internal_errqueue.cc
@@ -14,10 +14,9 @@
 
 #include "src/core/lib/iomgr/internal_errqueue.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc
index 51eae975fbc..12b8cb31c63 100644
--- a/src/core/lib/iomgr/iocp_windows.cc
+++ b/src/core/lib/iomgr/iocp_windows.cc
@@ -22,16 +22,14 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
 #include <winsock2.h>
 
 #include <limits>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/socket_windows.h"
diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc
index a4fce10be34..39e0504d0d7 100644
--- a/src/core/lib/iomgr/iomgr.cc
+++ b/src/core/lib/iomgr/iomgr.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/lib/iomgr/iomgr.h"
 
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/buffer_list.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h
index 3c4a5987f19..280471fae87 100644
--- a/src/core/lib/iomgr/iomgr.h
+++ b/src/core/lib/iomgr/iomgr.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
 #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
 
-#include <stdlib.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdlib.h>
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/iomgr_internal.cc b/src/core/lib/iomgr/iomgr_internal.cc
index 81c1b829247..f5bb42e53d5 100644
--- a/src/core/lib/iomgr/iomgr_internal.cc
+++ b/src/core/lib/iomgr/iomgr_internal.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/lib/iomgr/iomgr_internal.h"
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 static grpc_iomgr_platform_vtable* iomgr_platform_vtable = nullptr;
 
diff --git a/src/core/lib/iomgr/iomgr_internal.h b/src/core/lib/iomgr/iomgr_internal.h
index a3a8ceb178a..c0d34a9d0a5 100644
--- a/src/core/lib/iomgr/iomgr_internal.h
+++ b/src/core/lib/iomgr/iomgr_internal.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc
index fe1d24a3492..2d8716c54ee 100644
--- a/src/core/lib/iomgr/iomgr_windows.cc
+++ b/src/core/lib/iomgr/iomgr_windows.cc
@@ -23,7 +23,6 @@
 #ifdef GRPC_WINSOCK_SOCKET
 
 #include "absl/log/check.h"
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc
index 53700d13749..42023ef4615 100644
--- a/src/core/lib/iomgr/lockfree_event.cc
+++ b/src/core/lib/iomgr/lockfree_event.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/lib/iomgr/lockfree_event.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc
index 918af4a7f65..8a5ad277f24 100644
--- a/src/core/lib/iomgr/polling_entity.cc
+++ b/src/core/lib/iomgr/polling_entity.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/iomgr/polling_entity.h"
 
-#include "absl/log/check.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 
 grpc_polling_entity grpc_polling_entity_create_from_pollset_set(
diff --git a/src/core/lib/iomgr/pollset_set_windows.cc b/src/core/lib/iomgr/pollset_set_windows.cc
index 46dd8d20977..c40eccf95e4 100644
--- a/src/core/lib/iomgr/pollset_set_windows.cc
+++ b/src/core/lib/iomgr/pollset_set_windows.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/lib/iomgr/port.h"
 
diff --git a/src/core/lib/iomgr/resolve_address.cc b/src/core/lib/iomgr/resolve_address.cc
index a6130701fec..3a0d1b106e1 100644
--- a/src/core/lib/iomgr/resolve_address.cc
+++ b/src/core/lib/iomgr/resolve_address.cc
@@ -17,12 +17,11 @@
 //
 #include "src/core/lib/iomgr/resolve_address.h"
 
-#include "absl/strings/str_cat.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_cat.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/no_destruct.h"
 
diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h
index c8c94b00c0b..5a8279ae9c4 100644
--- a/src/core/lib/iomgr/resolve_address.h
+++ b/src/core/lib/iomgr/resolve_address.h
@@ -19,14 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/handle_containers.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/resolve_address_impl.h b/src/core/lib/iomgr/resolve_address_impl.h
index a6e072dd919..4c3cbe0d92b 100644
--- a/src/core/lib/iomgr/resolve_address_impl.h
+++ b/src/core/lib/iomgr/resolve_address_impl.h
@@ -17,9 +17,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc
index 0dd2e449575..fe1d4c99a93 100644
--- a/src/core/lib/iomgr/resolve_address_posix.cc
+++ b/src/core/lib/iomgr/resolve_address_posix.cc
@@ -21,12 +21,11 @@
 #include "src/core/lib/iomgr/port.h"
 #ifdef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
 
-#include <string.h>
-#include <sys/types.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
+#include <string.h>
+#include <sys/types.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/block_annotate.h"
diff --git a/src/core/lib/iomgr/resolve_address_posix.h b/src/core/lib/iomgr/resolve_address_posix.h
index 15986358e80..cb37cbc9a75 100644
--- a/src/core/lib/iomgr/resolve_address_posix.h
+++ b/src/core/lib/iomgr/resolve_address_posix.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H
 
-#include <functional>
-
 #include <grpc/support/port_platform.h>
 
+#include <functional>
+
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 
diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc
index 9db5b689954..1dc7ee3d1fc 100644
--- a/src/core/lib/iomgr/resolve_address_windows.cc
+++ b/src/core/lib/iomgr/resolve_address_windows.cc
@@ -19,6 +19,10 @@
 #include "src/core/lib/iomgr/port.h"
 #ifdef GRPC_WINSOCK_SOCKET
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <string.h>
 #include <sys/types.h>
@@ -26,12 +30,6 @@
 #include <string>
 
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/block_annotate.h"
diff --git a/src/core/lib/iomgr/resolve_address_windows.h b/src/core/lib/iomgr/resolve_address_windows.h
index eea5c44111e..6d608efd2e8 100644
--- a/src/core/lib/iomgr/resolve_address_windows.h
+++ b/src/core/lib/iomgr/resolve_address_windows.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H
 
-#include <functional>
-
 #include <grpc/support/port_platform.h>
 
+#include <functional>
+
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 
diff --git a/src/core/lib/iomgr/resolved_address.h b/src/core/lib/iomgr/resolved_address.h
index e16f7fc27f9..c622bdb5126 100644
--- a/src/core/lib/iomgr/resolved_address.h
+++ b/src/core/lib/iomgr/resolved_address.h
@@ -15,9 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/iomgr/port.h"
 
diff --git a/src/core/lib/iomgr/sockaddr_utils_posix.cc b/src/core/lib/iomgr/sockaddr_utils_posix.cc
index 8fc4d5a186e..a522df8aecd 100644
--- a/src/core/lib/iomgr/sockaddr_utils_posix.cc
+++ b/src/core/lib/iomgr/sockaddr_utils_posix.cc
@@ -30,6 +30,8 @@
 #else
 #include <netinet/tcp.h>
 #endif
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -38,10 +40,6 @@
 #include <string>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/lib/iomgr/socket_mutator.h b/src/core/lib/iomgr/socket_mutator.h
index e919d3caaa4..9ce180b3452 100644
--- a/src/core/lib/iomgr/socket_mutator.h
+++ b/src/core/lib/iomgr/socket_mutator.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H
 #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H
 
-#include <stdbool.h>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <stdbool.h>
 
 /// How is an fd to be used?
 typedef enum {
diff --git a/src/core/lib/iomgr/socket_utils.h b/src/core/lib/iomgr/socket_utils.h
index 75d3082677d..f6c4c27d6de 100644
--- a/src/core/lib/iomgr/socket_utils.h
+++ b/src/core/lib/iomgr/socket_utils.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 // TODO(juanlishen): The following functions might be simple enough to implement
 // ourselves, so that they don't cause any portability hassle.
diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc
index 49b1c349795..8b1af9db729 100644
--- a/src/core/lib/iomgr/socket_utils_common_posix.cc
+++ b/src/core/lib/iomgr/socket_utils_common_posix.cc
@@ -35,6 +35,9 @@
 #else
 #include <netinet/tcp.h>
 #endif
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -46,11 +49,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc
index ebd2d586069..aa356e591c8 100644
--- a/src/core/lib/iomgr/socket_utils_posix.cc
+++ b/src/core/lib/iomgr/socket_utils_posix.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKETUTILS
 #include <fcntl.h>
+#include <grpc/impl/grpc_types.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include <grpc/impl/grpc_types.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc
index 6ace1af6bc4..8ec4eaa1366 100644
--- a/src/core/lib/iomgr/socket_windows.cc
+++ b/src/core/lib/iomgr/socket_windows.cc
@@ -25,15 +25,13 @@
 #include <winsock2.h>
 
 // must be included after winsock2.h
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
 #include <mswsock.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/pollset.h"
diff --git a/src/core/lib/iomgr/socket_windows.h b/src/core/lib/iomgr/socket_windows.h
index 418685a5d3d..3c272b72c6e 100644
--- a/src/core/lib/iomgr/socket_windows.h
+++ b/src/core/lib/iomgr/socket_windows.h
@@ -24,10 +24,9 @@
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_WINSOCK_SOCKET
-#include <winsock2.h>
-
 #include <grpc/support/atm.h>
 #include <grpc/support/sync.h>
+#include <winsock2.h>
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc
index c091737b96c..141a9c76f52 100644
--- a/src/core/lib/iomgr/tcp_client_cfstream.cc
+++ b/src/core/lib/iomgr/tcp_client_cfstream.cc
@@ -24,15 +24,13 @@
 #ifdef GRPC_CFSTREAM_CLIENT
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <netinet/in.h>
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
+#include <netinet/in.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/iomgr/cfstream_handle.h"
diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc
index a66807cf111..9394ec75783 100644
--- a/src/core/lib/iomgr/tcp_client_posix.cc
+++ b/src/core/lib/iomgr/tcp_client_posix.cc
@@ -24,6 +24,8 @@
 #ifdef GRPC_POSIX_SOCKET_TCP_CLIENT
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <unistd.h>
@@ -32,10 +34,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
 #include "src/core/lib/event_engine/shim.h"
diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc
index c19e81d8131..5cc135d809d 100644
--- a/src/core/lib/iomgr/tcp_client_windows.cc
+++ b/src/core/lib/iomgr/tcp_client_windows.cc
@@ -16,21 +16,19 @@
 //
 //
 
-#include <inttypes.h>
-
 #include <grpc/support/port_platform.h>
+#include <inttypes.h>
 
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#include "absl/log/check.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log_windows.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h"
diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc
index a53d983db33..1b45c36efff 100644
--- a/src/core/lib/iomgr/tcp_posix.cc
+++ b/src/core/lib/iomgr/tcp_posix.cc
@@ -16,21 +16,25 @@
 //
 //
 
+#include <grpc/impl/grpc_types.h>
+#include <grpc/support/port_platform.h>
+
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/grpc_types.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 
 #include <errno.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <limits.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -47,13 +51,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/src/core/lib/iomgr/tcp_server.h b/src/core/lib/iomgr/tcp_server.h
index 8b1feece209..5f5197bbc4f 100644
--- a/src/core/lib/iomgr/tcp_server.h
+++ b/src/core/lib/iomgr/tcp_server.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_H
 
-#include <vector>
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 
+#include <vector>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/resolve_address.h"
diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc
index fdd3d96c63e..357412fa9ee 100644
--- a/src/core/lib/iomgr/tcp_server_posix.cc
+++ b/src/core/lib/iomgr/tcp_server_posix.cc
@@ -16,11 +16,11 @@
 //
 //
 
-#include <utility>
-
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 // FIXME: "posix" files shouldn't be depending on _GNU_SOURCE
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -32,6 +32,12 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/byte_buffer.h>
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -47,14 +53,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/memory_allocator_factory.h"
diff --git a/src/core/lib/iomgr/tcp_server_utils_posix.h b/src/core/lib/iomgr/tcp_server_utils_posix.h
index fcf97da7926..a726c750279 100644
--- a/src/core/lib/iomgr/tcp_server_utils_posix.h
+++ b/src/core/lib/iomgr/tcp_server_utils_posix.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/container/flat_hash_map.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/resolve_address.h"
diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc
index 7ec14525002..638e3221614 100644
--- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc
+++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc
@@ -24,6 +24,8 @@
 #ifdef GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
@@ -34,10 +36,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
index 89c69d8beb2..2dad0bb1be4 100644
--- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
+++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
@@ -23,6 +23,7 @@
 #ifdef GRPC_HAVE_IFADDRS
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
 #include <ifaddrs.h>
 #include <stddef.h>
 #include <string.h>
@@ -33,9 +34,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc
index ed32fcb25b0..e5fcac64277 100644
--- a/src/core/lib/iomgr/tcp_server_windows.cc
+++ b/src/core/lib/iomgr/tcp_server_windows.cc
@@ -22,15 +22,6 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#include <inttypes.h>
-#include <io.h>
-
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/memory_allocator.h>
@@ -39,7 +30,14 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <io.h>
+
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/memory_allocator_factory.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc
index 9574531c57d..e52ca28089f 100644
--- a/src/core/lib/iomgr/tcp_windows.cc
+++ b/src/core/lib/iomgr/tcp_windows.cc
@@ -22,15 +22,13 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#include <limits.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <limits.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h
index 299331f0320..5d84066f942 100644
--- a/src/core/lib/iomgr/timer.h
+++ b/src/core/lib/iomgr/timer.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_TIMER_H
 
-#include <cstdint>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include <cstdint>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc
index 4d940942c47..3e5f604603a 100644
--- a/src/core/lib/iomgr/timer_generic.cc
+++ b/src/core/lib/iomgr/timer_generic.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <inttypes.h>
 
 #include <string>
@@ -24,12 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/cpu.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/timer_heap.cc b/src/core/lib/iomgr/timer_heap.cc
index 8f7d950e699..617f76ade0f 100644
--- a/src/core/lib/iomgr/timer_heap.cc
+++ b/src/core/lib/iomgr/timer_heap.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/lib/iomgr/timer_heap.h"
 
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc
index 5d2015ef50c..9a3362e0ef4 100644
--- a/src/core/lib/iomgr/timer_manager.cc
+++ b/src/core/lib/iomgr/timer_manager.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/lib/iomgr/timer_manager.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/timer_manager.h b/src/core/lib/iomgr/timer_manager.h
index c2e662b4943..47b6c132bdc 100644
--- a/src/core/lib/iomgr/timer_manager.h
+++ b/src/core/lib/iomgr/timer_manager.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 // Timer Manager tries to keep only one thread waiting for the next timeout at
 // all times, and thus effectively preventing the thundering herd problem.
diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc
index 01a18602ff6..90ae7817d78 100644
--- a/src/core/lib/iomgr/unix_sockets_posix.cc
+++ b/src/core/lib/iomgr/unix_sockets_posix.cc
@@ -33,11 +33,10 @@
 #include <sys/un.h>
 #endif  // GPR_WINDOWS
 
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/alloc.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/unix_sockets_posix.h"
diff --git a/src/core/lib/iomgr/unix_sockets_posix.h b/src/core/lib/iomgr/unix_sockets_posix.h
index d63a56e8d00..f6e6418a312 100644
--- a/src/core/lib/iomgr/unix_sockets_posix.h
+++ b/src/core/lib/iomgr/unix_sockets_posix.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
 
-#include <string>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 
diff --git a/src/core/lib/iomgr/vsock.cc b/src/core/lib/iomgr/vsock.cc
index 45a769998bf..a830668cf4c 100644
--- a/src/core/lib/iomgr/vsock.cc
+++ b/src/core/lib/iomgr/vsock.cc
@@ -21,14 +21,12 @@
 
 #ifdef GRPC_HAVE_VSOCK
 
+#include <grpc/support/alloc.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/transport/error_utils.h"
diff --git a/src/core/lib/iomgr/vsock.h b/src/core/lib/iomgr/vsock.h
index 08280c32a0a..1bd3a2c71fe 100644
--- a/src/core/lib/iomgr/vsock.h
+++ b/src/core/lib/iomgr/vsock.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_VSOCK_H
 #define GRPC_SRC_CORE_LIB_IOMGR_VSOCK_H
 
-#include <string>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 
diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc
index e2640d263c9..9fc196e18a6 100644
--- a/src/core/lib/iomgr/wakeup_fd_pipe.cc
+++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc
@@ -27,7 +27,6 @@
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/lib/iomgr/wakeup_fd_pipe.h"
 #include "src/core/lib/iomgr/wakeup_fd_posix.h"
diff --git a/src/core/lib/promise/activity.cc b/src/core/lib/promise/activity.cc
index 7f495ddb1b3..1a0a52d7b64 100644
--- a/src/core/lib/promise/activity.cc
+++ b/src/core/lib/promise/activity.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/promise/activity.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <vector>
@@ -22,9 +23,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/atomic_utils.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h
index b84fc473b62..1bb57bb3f78 100644
--- a/src/core/lib/promise/activity.h
+++ b/src/core/lib/promise/activity.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H
 #define GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -28,9 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
diff --git a/src/core/lib/promise/all_ok.h b/src/core/lib/promise/all_ok.h
index 63abaf754d1..72d9d3815b3 100644
--- a/src/core/lib/promise/all_ok.h
+++ b/src/core/lib/promise/all_ok.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H
 #define GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H
 
+#include <grpc/support/port_platform.h>
+
 #include <tuple>
 #include <variant>
 
 #include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/join_state.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/arena_promise.h b/src/core/lib/promise/arena_promise.h
index 7f4bb0de563..e03d6280829 100644
--- a/src/core/lib/promise/arena_promise.h
+++ b/src/core/lib/promise/arena_promise.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <cstddef>
@@ -23,9 +24,6 @@
 #include <utility>
 
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h
index c720dfe35b1..a0eed9396e8 100644
--- a/src/core/lib/promise/context.h
+++ b/src/core/lib/promise/context.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H
 #define GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/down_cast.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h
index 032f6b304f0..767ca8d787d 100644
--- a/src/core/lib/promise/detail/join_state.h
+++ b/src/core/lib/promise/detail/join_state.h
@@ -17,15 +17,14 @@
 
 // This file is generated by tools/codegen/core/gen_join.py
 
+#include <grpc/support/port_platform.h>
+
 #include <tuple>
 #include <type_traits>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/detail/promise_factory.h b/src/core/lib/promise/detail/promise_factory.h
index 1e507743929..49dc25c3301 100644
--- a/src/core/lib/promise/detail/promise_factory.h
+++ b/src/core/lib/promise/detail/promise_factory.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H
 #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_like.h"
 
 // PromiseFactory is an adaptor class.
diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h
index 60a7fcc26b0..8515e8b46fb 100644
--- a/src/core/lib/promise/detail/promise_like.h
+++ b/src/core/lib/promise/detail/promise_like.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/poll.h"
 
 // A Promise is a callable object that returns Poll<T> for some T.
diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h
index 47810f19141..da9880044ce 100644
--- a/src/core/lib/promise/detail/seq_state.h
+++ b/src/core/lib/promise/detail/seq_state.h
@@ -17,6 +17,7 @@
 
 // This file is generated by tools/codegen/core/gen_seq.py
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <utility>
@@ -25,9 +26,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/detail/promise_like.h"
diff --git a/src/core/lib/promise/detail/status.h b/src/core/lib/promise/detail/status.h
index 42847c6ba6d..d33c32644cf 100644
--- a/src/core/lib/promise/detail/status.h
+++ b/src/core/lib/promise/detail/status.h
@@ -15,14 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_STATUS_H
 #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_STATUS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
-#include <grpc/support/port_platform.h>
-
 // Helpers for dealing with absl::Status/StatusOr generically
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/event_engine_wakeup_scheduler.h b/src/core/lib/promise/event_engine_wakeup_scheduler.h
index eedd48357c3..3e494beaa6f 100644
--- a/src/core/lib/promise/event_engine_wakeup_scheduler.h
+++ b/src/core/lib/promise/event_engine_wakeup_scheduler.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_EVENT_ENGINE_WAKEUP_SCHEDULER_H
 #define GRPC_SRC_CORE_LIB_PROMISE_EVENT_ENGINE_WAKEUP_SCHEDULER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h
index cc36e1ff747..c66fc233b21 100644
--- a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h
+++ b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H
 #define GRPC_SRC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H
 
-#include "absl/status/status.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h
index 5fcaf0094a0..c990f249845 100644
--- a/src/core/lib/promise/for_each.h
+++ b/src/core/lib/promise/for_each.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_FOR_EACH_H
 #define GRPC_SRC_CORE_LIB_PROMISE_FOR_EACH_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -24,9 +25,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h
index d75aec9a5ff..55d18aa74c7 100644
--- a/src/core/lib/promise/if.h
+++ b/src/core/lib/promise/if.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_IF_H
 #define GRPC_SRC_CORE_LIB_PROMISE_IF_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/status/statusor.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/inter_activity_latch.h b/src/core/lib/promise/inter_activity_latch.h
index c5e89626505..a5a614dcf9f 100644
--- a/src/core/lib/promise/inter_activity_latch.h
+++ b/src/core/lib/promise/inter_activity_latch.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_LATCH_H
 #define GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_LATCH_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -22,9 +23,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h
index f6a2144dadb..08e71608e31 100644
--- a/src/core/lib/promise/inter_activity_pipe.h
+++ b/src/core/lib/promise/inter_activity_pipe.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_PIPE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_PIPE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <array>
@@ -22,9 +23,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h
index d75e6452892..a36f90d1142 100644
--- a/src/core/lib/promise/interceptor_list.h
+++ b/src/core/lib/promise/interceptor_list.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTERCEPTOR_LIST_H
 #define GRPC_SRC_CORE_LIB_PROMISE_INTERCEPTOR_LIST_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,9 +28,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/join.h b/src/core/lib/promise/join.h
index 0206baabccc..81619e33142 100644
--- a/src/core/lib/promise/join.h
+++ b/src/core/lib/promise/join.h
@@ -15,14 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_JOIN_H
 #define GRPC_SRC_CORE_LIB_PROMISE_JOIN_H
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <tuple>
 
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/join_state.h"
 #include "src/core/lib/promise/map.h"
 
diff --git a/src/core/lib/promise/latch.h b/src/core/lib/promise/latch.h
index 10f4776117f..63e298016b8 100644
--- a/src/core/lib/promise/latch.h
+++ b/src/core/lib/promise/latch.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_LATCH_H
 #define GRPC_SRC_CORE_LIB_PROMISE_LATCH_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -24,9 +25,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/loop.h b/src/core/lib/promise/loop.h
index a7e4195cdea..768746f7b60 100644
--- a/src/core/lib/promise/loop.h
+++ b/src/core/lib/promise/loop.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_LOOP_H
 #define GRPC_SRC_CORE_LIB_PROMISE_LOOP_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/construct_destruct.h"
diff --git a/src/core/lib/promise/map.h b/src/core/lib/promise/map.h
index 3ba8c19c2f6..52023fd2dc7 100644
--- a/src/core/lib/promise/map.h
+++ b/src/core/lib/promise/map.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_MAP_H
 #define GRPC_SRC_CORE_LIB_PROMISE_MAP_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <tuple>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/src/core/lib/promise/map_pipe.h b/src/core/lib/promise/map_pipe.h
index 2915a9376b5..1888100fbb5 100644
--- a/src/core/lib/promise/map_pipe.h
+++ b/src/core/lib/promise/map_pipe.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_MAP_PIPE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_MAP_PIPE_H
 
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/for_each.h"
 #include "src/core/lib/promise/map.h"
diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h
index 02c8d2f97a4..fa77ecb03fb 100644
--- a/src/core/lib/promise/mpsc.h
+++ b/src/core/lib/promise/mpsc.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_MPSC_H
 #define GRPC_SRC_CORE_LIB_PROMISE_MPSC_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -25,9 +26,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/wait_set.h"
diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h
index 0f500d66317..671348ff9a2 100644
--- a/src/core/lib/promise/observable.h
+++ b/src/core/lib/promise/observable.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_OBSERVABLE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_OBSERVABLE_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/container/flat_hash_set.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc
index 79c310c9806..ed0e3af639b 100644
--- a/src/core/lib/promise/party.cc
+++ b/src/core/lib/promise/party.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/promise/party.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 
@@ -21,9 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h
index d2051aa6083..9066c3a7de3 100644
--- a/src/core/lib/promise/party.h
+++ b/src/core/lib/promise/party.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PARTY_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PARTY_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,10 +29,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/context.h"
diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h
index f3dac4532af..71ce810b704 100644
--- a/src/core/lib/promise/pipe.h
+++ b/src/core/lib/promise/pipe.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PIPE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PIPE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -27,9 +28,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/if.h"
diff --git a/src/core/lib/promise/poll.h b/src/core/lib/promise/poll.h
index 9b895cea032..879a5f42335 100644
--- a/src/core/lib/promise/poll.h
+++ b/src/core/lib/promise/poll.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_POLL_H
 #define GRPC_SRC_CORE_LIB_PROMISE_POLL_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/construct_destruct.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/prioritized_race.h b/src/core/lib/promise/prioritized_race.h
index bd179c33313..166c4d2dad1 100644
--- a/src/core/lib/promise/prioritized_race.h
+++ b/src/core/lib/promise/prioritized_race.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PRIORITIZED_RACE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PRIORITIZED_RACE_H
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 namespace grpc_core {
 
 namespace promise_detail {
diff --git a/src/core/lib/promise/promise.h b/src/core/lib/promise/promise.h
index cb26a165071..b5ac75d73d2 100644
--- a/src/core/lib/promise/promise.h
+++ b/src/core/lib/promise/promise.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PROMISE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PROMISE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <type_traits>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/src/core/lib/promise/promise_mutex.h b/src/core/lib/promise/promise_mutex.h
index b7014da2494..c17750ff066 100644
--- a/src/core/lib/promise/promise_mutex.h
+++ b/src/core/lib/promise/promise_mutex.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/src/core/lib/promise/race.h b/src/core/lib/promise/race.h
index 83de1a617d7..a17fc074b7d 100644
--- a/src/core/lib/promise/race.h
+++ b/src/core/lib/promise/race.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_RACE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_RACE_H
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 namespace grpc_core {
 
 namespace promise_detail {
diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h
index 40051ae4939..80cd2981308 100644
--- a/src/core/lib/promise/seq.h
+++ b/src/core/lib/promise/seq.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_SEQ_H
 #define GRPC_SRC_CORE_LIB_PROMISE_SEQ_H
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/detail/seq_state.h"
diff --git a/src/core/lib/promise/sleep.cc b/src/core/lib/promise/sleep.cc
index d31e2a82595..53ae975660f 100644
--- a/src/core/lib/promise/sleep.cc
+++ b/src/core/lib/promise/sleep.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/lib/promise/sleep.h"
 
-#include <utility>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/event_engine/event_engine_context.h"  // IWYU pragma: keep
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/src/core/lib/promise/sleep.h b/src/core/lib/promise/sleep.h
index 0ae4232d7b7..83885a07790 100644
--- a/src/core/lib/promise/sleep.h
+++ b/src/core/lib/promise/sleep.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_SLEEP_H
 #define GRPC_SRC_CORE_LIB_PROMISE_SLEEP_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <utility>
 
 #include "absl/status/status.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/time.h"
diff --git a/src/core/lib/promise/status_flag.h b/src/core/lib/promise/status_flag.h
index 250dce50504..1152694b1f0 100644
--- a/src/core/lib/promise/status_flag.h
+++ b/src/core/lib/promise/status_flag.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H
 #define GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H
 
+#include <grpc/support/port_platform.h>
+
 #include <ostream>
 
 #include "absl/log/check.h"
@@ -22,9 +24,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/status.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/switch.h b/src/core/lib/promise/switch.h
index eed6e89928b..1bb05507ef2 100644
--- a/src/core/lib/promise/switch.h
+++ b/src/core/lib/promise/switch.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H
 #define GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/if.h"
 
diff --git a/src/core/lib/promise/try_join.h b/src/core/lib/promise/try_join.h
index 5cde944fe41..e80eaee9a89 100644
--- a/src/core/lib/promise/try_join.h
+++ b/src/core/lib/promise/try_join.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_TRY_JOIN_H
 #define GRPC_SRC_CORE_LIB_PROMISE_TRY_JOIN_H
 
+#include <grpc/support/port_platform.h>
+
 #include <tuple>
 #include <variant>
 
@@ -22,9 +24,6 @@
 #include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/join_state.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/try_seq.h b/src/core/lib/promise/try_seq.h
index 7cda223ac67..e7a09b4ab7d 100644
--- a/src/core/lib/promise/try_seq.h
+++ b/src/core/lib/promise/try_seq.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_TRY_SEQ_H
 #define GRPC_SRC_CORE_LIB_PROMISE_TRY_SEQ_H
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <type_traits>
@@ -24,9 +25,6 @@
 #include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/detail/seq_state.h"
diff --git a/src/core/lib/promise/wait_for_callback.h b/src/core/lib/promise/wait_for_callback.h
index 6aabfe57970..cdebb5f085a 100644
--- a/src/core/lib/promise/wait_for_callback.h
+++ b/src/core/lib/promise/wait_for_callback.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_WAIT_FOR_CALLBACK_H
 #define GRPC_SRC_CORE_LIB_PROMISE_WAIT_FOR_CALLBACK_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/promise/wait_set.h b/src/core/lib/promise/wait_set.h
index d58788a057c..a625f01433b 100644
--- a/src/core/lib/promise/wait_set.h
+++ b/src/core/lib/promise/wait_set.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_WAIT_SET_H
 #define GRPC_SRC_CORE_LIB_PROMISE_WAIT_SET_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/hash/hash.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/src/core/lib/resource_quota/api.cc b/src/core/lib/resource_quota/api.cc
index 113685e08f4..8438fdc35f5 100644
--- a/src/core/lib/resource_quota/api.cc
+++ b/src/core/lib/resource_quota/api.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/resource_quota/api.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -22,11 +25,6 @@
 #include <utility>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/src/core/lib/resource_quota/api.h b/src/core/lib/resource_quota/api.h
index f1a60fb3772..9d80d576afb 100644
--- a/src/core/lib/resource_quota/api.h
+++ b/src/core/lib/resource_quota/api.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_API_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_API_H
 
-#include <stddef.h>
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/src/core/lib/resource_quota/arena.cc b/src/core/lib/resource_quota/arena.cc
index 4fb33b266f7..e3b24dc739b 100644
--- a/src/core/lib/resource_quota/arena.cc
+++ b/src/core/lib/resource_quota/arena.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/lib/resource_quota/arena.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <new>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/alloc.h"
 namespace grpc_core {
diff --git a/src/core/lib/resource_quota/arena.h b/src/core/lib/resource_quota/arena.h
index fd962df93a8..fa46c07c664 100644
--- a/src/core/lib/resource_quota/arena.h
+++ b/src/core/lib/resource_quota/arena.h
@@ -25,6 +25,8 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -32,9 +34,6 @@
 #include <memory>
 #include <utility>
 
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/alloc.h"
diff --git a/src/core/lib/resource_quota/connection_quota.cc b/src/core/lib/resource_quota/connection_quota.cc
index 846883f78c3..021628c3695 100644
--- a/src/core/lib/resource_quota/connection_quota.cc
+++ b/src/core/lib/resource_quota/connection_quota.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/lib/resource_quota/connection_quota.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 ConnectionQuota::ConnectionQuota() = default;
diff --git a/src/core/lib/resource_quota/connection_quota.h b/src/core/lib/resource_quota/connection_quota.h
index ac0aa6cdb29..4181a1878a1 100644
--- a/src/core/lib/resource_quota/connection_quota.h
+++ b/src/core/lib/resource_quota/connection_quota.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_CONNECTION_QUOTA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_CONNECTION_QUOTA_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <limits>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc
index ee785e62adf..a69792a7d10 100644
--- a/src/core/lib/resource_quota/memory_quota.cc
+++ b/src/core/lib/resource_quota/memory_quota.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/resource_quota/memory_quota.h"
 
+#include <grpc/event_engine/internal/memory_allocator_impl.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -29,11 +32,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/internal/memory_allocator_impl.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h"
 #include "src/core/lib/promise/loop.h"
diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h
index 39c7d83a48a..85395b448d3 100644
--- a/src/core/lib/resource_quota/memory_quota.h
+++ b/src/core/lib/resource_quota/memory_quota.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <array>
@@ -32,11 +35,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/src/core/lib/resource_quota/periodic_update.cc b/src/core/lib/resource_quota/periodic_update.cc
index b7f9e9b9c03..f75cddc041a 100644
--- a/src/core/lib/resource_quota/periodic_update.cc
+++ b/src/core/lib/resource_quota/periodic_update.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/resource_quota/periodic_update.h"
 
-#include <atomic>
-
 #include <grpc/support/port_platform.h>
 
+#include <atomic>
+
 #include "src/core/util/useful.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/resource_quota/periodic_update.h b/src/core/lib/resource_quota/periodic_update.h
index 7a91510ef77..950df574815 100644
--- a/src/core/lib/resource_quota/periodic_update.h
+++ b/src/core/lib/resource_quota/periodic_update.h
@@ -15,14 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <atomic>
 
 #include "absl/functional/function_ref.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/resource_quota/resource_quota.h b/src/core/lib/resource_quota/resource_quota.h
index 0704a162eef..ffe61903255 100644
--- a/src/core/lib/resource_quota/resource_quota.h
+++ b/src/core/lib/resource_quota/resource_quota.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H
 
-#include <string>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+#include <utility>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/thread_quota.h"
 #include "src/core/util/cpp_impl_of.h"
diff --git a/src/core/lib/resource_quota/thread_quota.cc b/src/core/lib/resource_quota/thread_quota.cc
index 73e8b224402..381375427e2 100644
--- a/src/core/lib/resource_quota/thread_quota.cc
+++ b/src/core/lib/resource_quota/thread_quota.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/resource_quota/thread_quota.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+
 namespace grpc_core {
 
 ThreadQuota::ThreadQuota() = default;
diff --git a/src/core/lib/resource_quota/thread_quota.h b/src/core/lib/resource_quota/thread_quota.h
index 965436f20df..18a6e13e7f1 100644
--- a/src/core/lib/resource_quota/thread_quota.h
+++ b/src/core/lib/resource_quota/thread_quota.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <limits>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/security/authorization/audit_logging.cc b/src/core/lib/security/authorization/audit_logging.cc
index 2f8ac055c1c..4a6b8b97b25 100644
--- a/src/core/lib/security/authorization/audit_logging.cc
+++ b/src/core/lib/security/authorization/audit_logging.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/lib/security/authorization/audit_logging.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <utility>
@@ -27,11 +31,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/stdout_logger.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/security/authorization/audit_logging.h b/src/core/lib/security/authorization/audit_logging.h
index 1f97120cd60..899e0dcc131 100644
--- a/src/core/lib/security/authorization/audit_logging.h
+++ b/src/core/lib/security/authorization/audit_logging.h
@@ -19,17 +19,16 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUDIT_LOGGING_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUDIT_LOGGING_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/sync.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/authorization/authorization_engine.h b/src/core/lib/security/authorization/authorization_engine.h
index 4dca42bea85..dcd8ec5d4fe 100644
--- a/src/core/lib/security/authorization/authorization_engine.h
+++ b/src/core/lib/security/authorization/authorization_engine.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H
 
-#include <string>
-
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/util/ref_counted.h"
 
diff --git a/src/core/lib/security/authorization/authorization_policy_provider.h b/src/core/lib/security/authorization/authorization_policy_provider.h
index 6dfdc8fb875..ce0a9c7604f 100644
--- a/src/core/lib/security/authorization/authorization_policy_provider.h
+++ b/src/core/lib/security/authorization/authorization_policy_provider.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/security/authorization/authorization_engine.h"
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/security/authorization/cel_authorization_engine.cc b/src/core/lib/security/authorization/cel_authorization_engine.cc
index d2d14ebbb8b..47d8f37a007 100644
--- a/src/core/lib/security/authorization/cel_authorization_engine.cc
+++ b/src/core/lib/security/authorization/cel_authorization_engine.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/security/authorization/cel_authorization_engine.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -26,8 +27,6 @@
 #include "upb/base/string_view.h"
 #include "upb/message/map.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/lib/security/authorization/cel_authorization_engine.h b/src/core/lib/security/authorization/cel_authorization_engine.h
index 5122b96cab5..03ea185d0bb 100644
--- a/src/core/lib/security/authorization/cel_authorization_engine.h
+++ b/src/core/lib/security/authorization/cel_authorization_engine.h
@@ -16,6 +16,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -24,13 +26,10 @@
 #include "absl/container/flat_hash_set.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
 #include "google/api/expr/v1alpha1/syntax.upb.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/security/authorization/mock_cel/activation.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/lib/security/authorization/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc
index 0a4e23d1923..ca572e13d45 100644
--- a/src/core/lib/security/authorization/evaluate_args.cc
+++ b/src/core/lib/security/authorization/evaluate_args.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/security/authorization/evaluate_args.h"
 
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/log/log.h"
@@ -21,10 +23,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/numbers.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/security/credentials/tls/tls_utils.h"
diff --git a/src/core/lib/security/authorization/evaluate_args.h b/src/core/lib/security/authorization/evaluate_args.h
index 69cf2ac4ee8..226df0aac8d 100644
--- a/src/core/lib/security/authorization/evaluate_args.h
+++ b/src/core/lib/security/authorization/evaluate_args.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.cc b/src/core/lib/security/authorization/grpc_authorization_engine.cc
index 4fed6af4fed..a2b38af3d39 100644
--- a/src/core/lib/security/authorization/grpc_authorization_engine.cc
+++ b/src/core/lib/security/authorization/grpc_authorization_engine.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <map>
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/lib/security/authorization/authorization_engine.h"
 
diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.h b/src/core/lib/security/authorization/grpc_authorization_engine.h
index 1ac877a5f4c..514d5343b04 100644
--- a/src/core/lib/security/authorization/grpc_authorization_engine.h
+++ b/src/core/lib/security/authorization/grpc_authorization_engine.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/authorization_engine.h"
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/security/authorization/matchers.h"
diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc
index 171fd61b3f1..8830bf5e599 100644
--- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc
+++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc
@@ -14,21 +14,19 @@
 
 #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h"
 
-#include <stdint.h>
-
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
+#include <stdint.h>
+
+#include <utility>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h
index f7e6aff40d7..bac11102126 100644
--- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h
+++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_POLICY_PROVIDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_POLICY_PROVIDER_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -23,11 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/security/authorization/authorization_engine.h"
 #include "src/core/lib/security/authorization/authorization_policy_provider.h"
 #include "src/core/lib/security/authorization/rbac_translator.h"
diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.cc b/src/core/lib/security/authorization/grpc_server_authz_filter.cc
index 540b2af1f67..8e3c1e2f276 100644
--- a/src/core/lib/security/authorization/grpc_server_authz_filter.cc
+++ b/src/core/lib/security/authorization/grpc_server_authz_filter.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/security/authorization/grpc_server_authz_filter.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -22,9 +24,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h
index 733142cfca3..10ad7281059 100644
--- a/src/core/lib/security/authorization/grpc_server_authz_filter.h
+++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/lib/security/authorization/matchers.cc b/src/core/lib/security/authorization/matchers.cc
index 887f74e79ed..c113514f233 100644
--- a/src/core/lib/security/authorization/matchers.cc
+++ b/src/core/lib/security/authorization/matchers.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/security/authorization/matchers.h"
 
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <string>
@@ -22,10 +24,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 
diff --git a/src/core/lib/security/authorization/matchers.h b/src/core/lib/security/authorization/matchers.h
index eaadd07b4e7..ce413534ef5 100644
--- a/src/core/lib/security/authorization/matchers.h
+++ b/src/core/lib/security/authorization/matchers.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -22,9 +23,6 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/security/authorization/rbac_policy.h"
diff --git a/src/core/lib/security/authorization/mock_cel/activation.h b/src/core/lib/security/authorization/mock_cel/activation.h
index 174aeac91e7..ca3cb392a25 100644
--- a/src/core/lib/security/authorization/mock_cel/activation.h
+++ b/src/core/lib/security/authorization/mock_cel/activation.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_ACTIVATION_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_ACTIVATION_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h
index 873d085ffe8..b9f94b15523 100644
--- a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h
+++ b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPR_BUILDER_FACTORY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPR_BUILDER_FACTORY_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/security/authorization/mock_cel/cel_expression.h"
 #include "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h"
 
diff --git a/src/core/lib/security/authorization/mock_cel/cel_expression.h b/src/core/lib/security/authorization/mock_cel/cel_expression.h
index 8e4a8b0c042..63da5c943b9 100644
--- a/src/core/lib/security/authorization/mock_cel/cel_expression.h
+++ b/src/core/lib/security/authorization/mock_cel/cel_expression.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPRESSION_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPRESSION_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <vector>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "google/api/expr/v1alpha1/syntax.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/mock_cel/activation.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
 
diff --git a/src/core/lib/security/authorization/mock_cel/cel_value.h b/src/core/lib/security/authorization/mock_cel/cel_value.h
index 5a7531121aa..2137595fe4f 100644
--- a/src/core/lib/security/authorization/mock_cel/cel_value.h
+++ b/src/core/lib/security/authorization/mock_cel/cel_value.h
@@ -30,6 +30,7 @@
 //    std::string* msg("test");
 //    CelValue value = CelValue::CreateString(msg);
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -39,8 +40,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace mock_cel {
 
diff --git a/src/core/lib/security/authorization/mock_cel/evaluator_core.h b/src/core/lib/security/authorization/mock_cel/evaluator_core.h
index 09f0add6c81..232db020d66 100644
--- a/src/core/lib/security/authorization/mock_cel/evaluator_core.h
+++ b/src/core/lib/security/authorization/mock_cel/evaluator_core.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_EVALUATOR_CORE_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_EVALUATOR_CORE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <set>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "google/api/expr/v1alpha1/syntax.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/mock_cel/activation.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_expression.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
diff --git a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
index 608d9d9cfa1..bd4993e3917 100644
--- a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
+++ b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_FLAT_EXPR_BUILDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_FLAT_EXPR_BUILDER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <set>
 #include <string>
@@ -23,9 +25,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "google/api/expr/v1alpha1/syntax.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/mock_cel/cel_expression.h"
 #include "src/core/lib/security/authorization/mock_cel/evaluator_core.h"
 
diff --git a/src/core/lib/security/authorization/rbac_policy.cc b/src/core/lib/security/authorization/rbac_policy.cc
index 6dfa7b3e3cf..de2ade9f16f 100644
--- a/src/core/lib/security/authorization/rbac_policy.cc
+++ b/src/core/lib/security/authorization/rbac_policy.cc
@@ -14,14 +14,14 @@
 
 #include "src/core/lib/security/authorization/rbac_policy.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 //
diff --git a/src/core/lib/security/authorization/rbac_policy.h b/src/core/lib/security/authorization/rbac_policy.h
index 03b4e283cde..9ad0bb0bca7 100644
--- a/src/core/lib/security/authorization/rbac_policy.h
+++ b/src/core/lib/security/authorization/rbac_policy.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <map>
@@ -23,10 +25,6 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/matchers.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc
index 342f9248371..7c3863e6824 100644
--- a/src/core/lib/security/authorization/rbac_translator.cc
+++ b/src/core/lib/security/authorization/rbac_translator.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/security/authorization/rbac_translator.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -31,11 +34,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/src/core/lib/security/authorization/rbac_translator.h b/src/core/lib/security/authorization/rbac_translator.h
index 18c1fed3b99..446583452a0 100644
--- a/src/core/lib/security/authorization/rbac_translator.h
+++ b/src/core/lib/security/authorization/rbac_translator.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/rbac_policy.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/authorization/stdout_logger.cc b/src/core/lib/security/authorization/stdout_logger.cc
index 9314d21a0e6..f2fc5eaa6a6 100644
--- a/src/core/lib/security/authorization/stdout_logger.cc
+++ b/src/core/lib/security/authorization/stdout_logger.cc
@@ -14,6 +14,10 @@
 
 #include "src/core/lib/security/authorization/stdout_logger.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdio>
 #include <memory>
 #include <string>
@@ -25,10 +29,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/src/core/lib/security/authorization/stdout_logger.h b/src/core/lib/security/authorization/stdout_logger.h
index a2186af7fb0..cc03d3a3252 100644
--- a/src/core/lib/security/authorization/stdout_logger.h
+++ b/src/core/lib/security/authorization/stdout_logger.h
@@ -15,16 +15,16 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_STDOUT_LOGGER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_STDOUT_LOGGER_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/src/core/lib/security/certificate_provider/certificate_provider_factory.h b/src/core/lib/security/certificate_provider/certificate_provider_factory.h
index 9da32e9233f..72412caa4e5 100644
--- a/src/core/lib/security/certificate_provider/certificate_provider_factory.h
+++ b/src/core/lib/security/certificate_provider/certificate_provider_factory.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
 
-#include <string>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/security/certificate_provider/certificate_provider_registry.cc b/src/core/lib/security/certificate_provider/certificate_provider_registry.cc
index 7a213fdc884..40b9a6a90c9 100644
--- a/src/core/lib/security/certificate_provider/certificate_provider_registry.cc
+++ b/src/core/lib/security/certificate_provider/certificate_provider_registry.cc
@@ -18,14 +18,14 @@
 
 #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void CertificateProviderRegistry::Builder::RegisterCertificateProviderFactory(
diff --git a/src/core/lib/security/certificate_provider/certificate_provider_registry.h b/src/core/lib/security/certificate_provider/certificate_provider_registry.h
index 84eee65d392..636884528d6 100644
--- a/src/core/lib/security/certificate_provider/certificate_provider_registry.h
+++ b/src/core/lib/security/certificate_provider/certificate_provider_registry.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc
index 67a219d9038..46fe754b728 100644
--- a/src/core/lib/security/context/security_context.cc
+++ b/src/core/lib/security/context/security_context.cc
@@ -18,19 +18,17 @@
 
 #include "src/core/lib/security/context/security_context.h"
 
-#include <string.h>
-
-#include <algorithm>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <string.h>
+
+#include <algorithm>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h
index cc3b21620a5..1a5b7afa320 100644
--- a/src/core/lib/security/context/security_context.h
+++ b/src/core/lib/security/context/security_context.h
@@ -19,19 +19,17 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H
 
-#include <stddef.h>
-
-#include <memory>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
+
+#include <memory>
+#include <utility>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/security/credentials/credentials.h"  // IWYU pragma: keep
diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc
index 45888d0e808..1e58abcf215 100644
--- a/src/core/lib/security/credentials/alts/alts_credentials.cc
+++ b/src/core/lib/security/credentials/alts/alts_credentials.cc
@@ -18,13 +18,13 @@
 
 #include "src/core/lib/security/credentials/alts/alts_credentials.h"
 
-#include <utility>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include <utility>
+
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
 #include "src/core/lib/security/security_connector/alts/alts_security_connector.h"
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment.cc b/src/core/lib/security/credentials/alts/check_gcp_environment.cc
index 864620c9a5a..37628d18321 100644
--- a/src/core/lib/security/credentials/alts/check_gcp_environment.cc
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment.cc
@@ -19,14 +19,13 @@
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 
 #include <ctype.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "absl/log/log.h"
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 const size_t kBiosDataBufferSize = 256;
 
 static char* trim(const char* src) {
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc
index c4d767a3d2b..47bb4b73c4d 100644
--- a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc
@@ -20,10 +20,9 @@
 
 #ifdef GPR_LINUX
 
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
+#include <string.h>
 
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc
index 4de3a24eae6..bf64fe60a36 100644
--- a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc
@@ -21,7 +21,6 @@
 #if !defined(GPR_LINUX) && !defined(GPR_WINDOWS)
 
 #include "absl/log/log.h"
-
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
index df6a6240974..462ba6bcb31 100644
--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
@@ -20,14 +20,13 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <shellapi.h>
 #include <stdio.h>
 #include <tchar.h>
 #include <windows.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc
index a6053a5d810..37a1856713a 100644
--- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc
+++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include "absl/log/log.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
 #include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
 
diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc
index 6b11ab3f623..a52dfe96173 100644
--- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc
+++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc
@@ -18,11 +18,11 @@
 
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
+
 grpc_alts_credentials_options* grpc_alts_credentials_options_copy(
     const grpc_alts_credentials_options* options) {
   if (options != nullptr && options->vtable != nullptr &&
diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc
index 3acc0708f62..e97ba305f17 100644
--- a/src/core/lib/security/credentials/call_creds_util.cc
+++ b/src/core/lib/security/credentials/call_creds_util.cc
@@ -16,16 +16,14 @@
 
 #include "src/core/lib/security/credentials/call_creds_util.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/core/lib/security/credentials/call_creds_util.h b/src/core/lib/security/credentials/call_creds_util.h
index 6e95f100f94..62fd38a5df7 100644
--- a/src/core/lib/security/credentials/call_creds_util.h
+++ b/src/core/lib/security/credentials/call_creds_util.h
@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H
 
-#include <string>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/transport/transport.h"
 
diff --git a/src/core/lib/security/credentials/channel_creds_registry.h b/src/core/lib/security/credentials/channel_creds_registry.h
index 17771ff8d9e..881bb607792 100644
--- a/src/core/lib/security/credentials/channel_creds_registry.h
+++ b/src/core/lib/security/credentials/channel_creds_registry.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc
index de2f7d143b9..cf55ff2da64 100644
--- a/src/core/lib/security/credentials/channel_creds_registry_init.cc
+++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -30,6 +23,12 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc
index d5d8c76baf4..81b6463421f 100644
--- a/src/core/lib/security/credentials/composite/composite_credentials.cc
+++ b/src/core/lib/security/credentials/composite/composite_credentials.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/security/credentials/composite/composite_credentials.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <cstring>
 #include <memory>
 #include <vector>
@@ -25,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h
index 64b05de2cf1..ff2728f0b4a 100644
--- a/src/core/lib/security/credentials/composite/composite_credentials.h
+++ b/src/core/lib/security/credentials/composite/composite_credentials.h
@@ -19,19 +19,18 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
 
-#include <algorithm>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/status/statusor.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
 
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc
index 6f43677d8f0..69a0180b93c 100644
--- a/src/core/lib/security/credentials/credentials.cc
+++ b/src/core/lib/security/credentials/credentials.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/lib/security/credentials/credentials.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h
index 57f0eaaa62b..2daef3c6b00 100644
--- a/src/core/lib/security/credentials/credentials.h
+++ b/src/core/lib/security/credentials/credentials.h
@@ -19,14 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H
 
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -34,6 +26,13 @@
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
index 3348e3c5aba..13a46dadda1 100644
--- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
@@ -15,6 +15,13 @@
 //
 #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <map>
@@ -28,15 +35,6 @@
 #include "absl/strings/str_replace.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/util/env.h"
diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h
index 3ccac92ad7a..a8a2f19ae47 100644
--- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/external/aws_request_signer.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
diff --git a/src/core/lib/security/credentials/external/aws_request_signer.cc b/src/core/lib/security/credentials/external/aws_request_signer.cc
index 87ca4b37918..82fb3fc814d 100644
--- a/src/core/lib/security/credentials/external/aws_request_signer.cc
+++ b/src/core/lib/security/credentials/external/aws_request_signer.cc
@@ -15,14 +15,15 @@
 //
 #include "src/core/lib/security/credentials/external/aws_request_signer.h"
 
-#include <utility>
-#include <vector>
-
+#include <grpc/support/port_platform.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/sha.h>
 
+#include <utility>
+#include <vector>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/escaping.h"
@@ -34,8 +35,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/lib/security/credentials/external/aws_request_signer.h b/src/core/lib/security/credentials/external/aws_request_signer.h
index 59a5390f795..12ef21342b9 100644
--- a/src/core/lib/security/credentials/external/aws_request_signer.h
+++ b/src/core/lib/security/credentials/external/aws_request_signer.h
@@ -17,11 +17,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/uri.h"
 
diff --git a/src/core/lib/security/credentials/external/external_account_credentials.cc b/src/core/lib/security/credentials/external/external_account_credentials.cc
index 7c4955bc09d..9f240d9b051 100644
--- a/src/core/lib/security/credentials/external/external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/external_account_credentials.cc
@@ -15,6 +15,13 @@
 
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -36,15 +43,6 @@
 #include "absl/strings/strip.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h"
 #include "src/core/lib/security/credentials/external/file_external_account_credentials.h"
diff --git a/src/core/lib/security/credentials/external/external_account_credentials.h b/src/core/lib/security/credentials/external/external_account_credentials.h
index 3323d21bbf0..bf6a5f1df81 100644
--- a/src/core/lib/security/credentials/external/external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/external_account_credentials.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_EXTERNAL_ACCOUNT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_EXTERNAL_ACCOUNT_CREDENTIALS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <functional>
@@ -25,10 +27,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc
index 6c8e1f06062..a02fb698c37 100644
--- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc
@@ -15,17 +15,16 @@
 //
 #include "src/core/lib/security/credentials/external/file_external_account_credentials.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h
index 093f0a02809..2428f92d21a 100644
--- a/src/core/lib/security/credentials/external/file_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_FILE_EXTERNAL_ACCOUNT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_FILE_EXTERNAL_ACCOUNT_CREDENTIALS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.cc b/src/core/lib/security/credentials/external/url_external_account_credentials.cc
index 39efb91d8f3..502700a4d64 100644
--- a/src/core/lib/security/credentials/external/url_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/url_external_account_credentials.cc
@@ -15,6 +15,13 @@
 //
 #include "src/core/lib/security/credentials/external/url_external_account_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <memory>
@@ -27,15 +34,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/transport/error_utils.h"
diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h
index d7a28777d2d..6d9e2c7fa97 100644
--- a/src/core/lib/security/credentials/external/url_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_URL_EXTERNAL_ACCOUNT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_URL_EXTERNAL_ACCOUNT_CREDENTIALS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
 #include "src/core/util/http_client/httpcli.h"
diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc
index 1e0f6f33eb4..aa61a12b68c 100644
--- a/src/core/lib/security/credentials/fake/fake_credentials.cc
+++ b/src/core/lib/security/credentials/fake/fake_credentials.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/security/security_connector/fake/fake_security_connector.h"
diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h
index fe4fb414593..77fe27268f9 100644
--- a/src/core/lib/security/credentials/fake/fake_credentials.h
+++ b/src/core/lib/security/credentials/fake/fake_credentials.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H
 
-#include <string>
-
-#include "absl/status/statusor.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc
index 8b3c8c8701d..31d00e7bfd3 100644
--- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc
+++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h"
 
+#include <grpc/support/time.h>
+
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -23,9 +25,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/transport/metadata.h"
 #include "src/core/lib/transport/status_conversion.h"
diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h
index 2e75547c402..7e3dfaa2abb 100644
--- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h
+++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h
@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GCP_SERVICE_ACCOUNT_IDENTITY_GCP_SERVICE_ACCOUNT_IDENTITY_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GCP_SERVICE_ACCOUNT_IDENTITY_GCP_SERVICE_ACCOUNT_IDENTITY_CREDENTIALS_H
 
-#include <string>
-#include <utility>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 
+#include <string>
+#include <utility>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.cc b/src/core/lib/security/credentials/google_default/credentials_generic.cc
index f09e5681c88..f07616d85ba 100644
--- a/src/core/lib/security/credentials/google_default/credentials_generic.cc
+++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/google_default/google_default_credentials.h"
 #include "src/core/util/env.h"
diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc
index 6581194e911..71999011093 100644
--- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc
+++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/lib/security/credentials/google_default/google_default_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <string.h>
 
 #include <memory>
@@ -30,16 +38,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h
index 889aebde57b..f9dc94e960e 100644
--- a/src/core/lib/security/credentials/google_default/google_default_credentials.h
+++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h
@@ -18,13 +18,13 @@
 
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H
-#include <utility>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc
index 8d855978676..15a7cd653ce 100644
--- a/src/core/lib/security/credentials/iam/iam_credentials.cc
+++ b/src/core/lib/security/credentials/iam/iam_credentials.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/security/credentials/iam/iam_credentials.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -26,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h
index aa8426048f1..837892211d0 100644
--- a/src/core/lib/security/credentials/iam/iam_credentials.h
+++ b/src/core/lib/security/credentials/iam/iam_credentials.h
@@ -19,15 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H
 
-#include <string>
-
-#include "absl/status/statusor.h"
-#include "absl/types/optional.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/status/statusor.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.cc b/src/core/lib/security/credentials/insecure/insecure_credentials.cc
index a4900ff3281..e9960725cc5 100644
--- a/src/core/lib/security/credentials/insecure/insecure_credentials.cc
+++ b/src/core/lib/security/credentials/insecure/insecure_credentials.cc
@@ -18,10 +18,10 @@
 
 #include "src/core/lib/security/credentials/insecure/insecure_credentials.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h"
 
diff --git a/src/core/lib/security/credentials/jwt/json_token.cc b/src/core/lib/security/credentials/jwt/json_token.cc
index 64c0f425985..eac638a1283 100644
--- a/src/core/lib/security/credentials/jwt/json_token.cc
+++ b/src/core/lib/security/credentials/jwt/json_token.cc
@@ -18,31 +18,28 @@
 
 #include "src/core/lib/security/credentials/jwt/json_token.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/rsa.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <string>
 #include <utility>
 
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/escaping.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/util/json_util.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/src/core/lib/security/credentials/jwt/json_token.h b/src/core/lib/security/credentials/jwt/json_token.h
index 5576b643ce1..ab4544dbf52 100644
--- a/src/core/lib/security/credentials/jwt/json_token.h
+++ b/src/core/lib/security/credentials/jwt/json_token.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H
 
-#include <openssl/crypto.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <openssl/crypto.h>
 
 #include "src/core/util/json/json.h"
 
diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc
index ab3cb4af773..c6239b7bc71 100644
--- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc
+++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc
@@ -17,6 +17,12 @@
 
 #include "src/core/lib/security/credentials/jwt/jwt_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -28,14 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h
index 26dfa169ad4..e666bfac489 100644
--- a/src/core/lib/security/credentials/jwt/jwt_credentials.h
+++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <string>
@@ -28,13 +33,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/jwt/json_token.h"
diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc
index 5f45ece8056..4d34a06d0dc 100644
--- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc
+++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc
@@ -18,16 +18,8 @@
 
 #include "src/core/lib/security/credentials/jwt/jwt_verifier.h"
 
+#include <grpc/support/port_platform.h>
 #include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
@@ -35,25 +27,30 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include <grpc/support/port_platform.h>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 #include <openssl/param_build.h>
 #endif
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/json.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/escaping.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h
index 9ff8ca53831..955e7efed72 100644
--- a/src/core/lib/security/credentials/jwt/jwt_verifier.h
+++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
 
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/lib/security/credentials/local/local_credentials.cc b/src/core/lib/security/credentials/local/local_credentials.cc
index 94f975d6d7d..21495ff55d0 100644
--- a/src/core/lib/security/credentials/local/local_credentials.cc
+++ b/src/core/lib/security/credentials/local/local_credentials.cc
@@ -18,11 +18,11 @@
 
 #include "src/core/lib/security/credentials/local/local_credentials.h"
 
-#include <utility>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/security/security_connector/local/local_security_connector.h"
 
 grpc_core::RefCountedPtr<grpc_channel_security_connector>
diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
index 216c038cbf2..0e7f7eb33cf 100644
--- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
+++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
@@ -18,6 +18,15 @@
 
 #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -34,17 +43,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/pollset_set.h"
diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
index bb91c8a524f..5cba69234d6 100644
--- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
+++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
@@ -19,6 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+
 #include <atomic>
 #include <string>
 #include <utility>
@@ -26,13 +32,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc
index 8fa2bcc6575..1e0bae22f94 100644
--- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc
+++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/security/credentials/plugin/plugin_credentials.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <memory>
 
@@ -26,10 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h
index 113955240c1..2c25fae8f22 100644
--- a/src/core/lib/security/credentials/plugin/plugin_credentials.h
+++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h
@@ -19,6 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -27,14 +33,6 @@
 
 #include "absl/container/inlined_vector.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/arena_promise.h"
diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc
index 86eb4518c8e..c434cb73678 100644
--- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc
+++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <string>
@@ -26,12 +30,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h
index ab4c9a12767..d0f947a537c 100644
--- a/src/core/lib/security/credentials/ssl/ssl_credentials.h
+++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h
@@ -18,16 +18,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H
 
-#include <stddef.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc
index 2472244f2c5..23ec403f16e 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc
@@ -16,13 +16,13 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/status/status.h"
+
 void grpc_tls_certificate_distributor::SetKeyMaterials(
     const std::string& cert_name, absl::optional<std::string> pem_root_certs,
     absl::optional<grpc_core::PemKeyCertPairList> pem_key_cert_pairs) {
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h
index f34e664d581..dd295d1cab7 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_DISTRIBUTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_DISTRIBUTOR_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -27,9 +29,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc
index a7ebb6cbdb2..f7a9a05c42c 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc
@@ -14,6 +14,7 @@
 // limitations under the License.
 //
 
+#include <grpc/support/port_platform.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
@@ -23,9 +24,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc
index 0bcabaa6505..db6c5bf98a5 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc
@@ -16,6 +16,10 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
+#include <grpc/credentials.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <time.h>
 
@@ -27,12 +31,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h
index cca18a1baeb..56f227d5ad4 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h
@@ -17,6 +17,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_PROVIDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_PROVIDER_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 
 #include <map>
@@ -27,11 +30,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc
index 1be015dcba7..47447ed536c 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <string>
@@ -23,11 +26,6 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/security/credentials/tls/tls_utils.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h
index 5e021948d2f..3b80d9bc852 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h
@@ -17,18 +17,17 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_VERIFIER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_VERIFIER_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <map>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
 #include "absl/status/status.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/unique_type_name.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
index 3176dc10caa..69f73476cae 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
 
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/tsi/ssl_transport_security.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc
index ce1fc4dd1d0..72a113cd592 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h"
 
-#include <limits.h>
-
 #include <grpc/support/port_platform.h>
+#include <limits.h>
 
 // IWYU pragma: no_include <ratio>
 #include <memory>
@@ -41,7 +40,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/span.h"
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h
index b9188740c5e..109d1aa4c41 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h
+++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CRL_PROVIDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CRL_PROVIDER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/support/port_platform.h>
+#include <openssl/crypto.h>
+
 #include <chrono>
 #include <functional>
 #include <memory>
@@ -26,19 +31,12 @@
 #include <string>
 #include <utility>
 
-#include <openssl/crypto.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/directory_reader.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
diff --git a/src/core/lib/security/credentials/tls/tls_credentials.cc b/src/core/lib/security/credentials/tls/tls_credentials.cc
index 5fd5abf419e..acb0d0154ee 100644
--- a/src/core/lib/security/credentials/tls/tls_credentials.cc
+++ b/src/core/lib/security/credentials/tls/tls_credentials.cc
@@ -18,18 +18,17 @@
 
 #include "src/core/lib/security/credentials/tls/tls_credentials.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
diff --git a/src/core/lib/security/credentials/tls/tls_utils.cc b/src/core/lib/security/credentials/tls/tls_utils.cc
index 3b17ad3f7f2..296839a8aea 100644
--- a/src/core/lib/security/credentials/tls/tls_utils.cc
+++ b/src/core/lib/security/credentials/tls/tls_utils.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/security/credentials/tls/tls_utils.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,8 +28,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Based on
diff --git a/src/core/lib/security/credentials/tls/tls_utils.h b/src/core/lib/security/credentials/tls/tls_utils.h
index c26f4e38bbd..d5d2f640a7b 100644
--- a/src/core/lib/security/credentials/tls/tls_utils.h
+++ b/src/core/lib/security/credentials/tls/tls_utils.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_UTILS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_UTILS_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Matches \a subject_alternative_name with \a matcher. Returns true if there
diff --git a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h
index 6283c044be8..94359e3727a 100644
--- a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h
+++ b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TOKEN_FETCHER_TOKEN_FETCHER_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TOKEN_FETCHER_TOKEN_FETCHER_CREDENTIALS_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <atomic>
 #include <memory>
 #include <utility>
@@ -25,9 +27,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/status/statusor.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/xds/xds_credentials.cc b/src/core/lib/security/credentials/xds/xds_credentials.cc
index a0e017498e2..2a98d0ec6e5 100644
--- a/src/core/lib/security/credentials/xds/xds_credentials.cc
+++ b/src/core/lib/security/credentials/xds/xds_credentials.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/lib/security/credentials/xds/xds_credentials.h"
 
-#include "absl/log/check.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h
index 554d7a57f26..53c16afcbcd 100644
--- a/src/core/lib/security/credentials/xds/xds_credentials.h
+++ b/src/core/lib/security/credentials/xds/xds_credentials.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_XDS_XDS_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_XDS_XDS_CREDENTIALS_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <functional>
@@ -27,12 +31,6 @@
 #include <vector>
 
 #include "absl/status/status.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc
index f30cecdd01a..a026a72f7f7 100644
--- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc
+++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc
@@ -18,6 +18,13 @@
 
 #include "src/core/lib/security/security_connector/alts/alts_security_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <algorithm>
@@ -28,15 +35,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc
index 20425dc2c91..b0373236168 100644
--- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc
+++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/lib/security/security_connector/fake/fake_security_connector.h"
 
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -31,13 +36,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
index 79ea0cd337c..da250fea598 100644
--- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
+++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h
index 9fc962b92ca..018689e5f78 100644
--- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h
+++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H
 
-#include <utility>
-
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc
index 52b657185a6..11a9c3f4957 100644
--- a/src/core/lib/security/security_connector/load_system_roots_supported.cc
+++ b/src/core/lib/security/security_connector/load_system_roots_supported.cc
@@ -16,26 +16,24 @@
 //
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \
     defined(GPR_APPLE)
 
 #include <dirent.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/load_system_roots.h"
diff --git a/src/core/lib/security/security_connector/load_system_roots_windows.cc b/src/core/lib/security/security_connector/load_system_roots_windows.cc
index 118f013c323..86fd628682c 100644
--- a/src/core/lib/security/security_connector/load_system_roots_windows.cc
+++ b/src/core/lib/security/security_connector/load_system_roots_windows.cc
@@ -23,13 +23,12 @@
 #pragma comment(lib, "crypt32")
 
 #include <esent.h>
-#include <wincrypt.h>
-
-#include <vector>
-
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
+#include <wincrypt.h>
+
+#include <vector>
 
 #include "src/core/lib/security/security_connector/load_system_roots.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc
index a61dc6aa4d0..5056494e6b2 100644
--- a/src/core/lib/security/security_connector/local/local_security_connector.cc
+++ b/src/core/lib/security/security_connector/local/local_security_connector.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/lib/security/security_connector/local/local_security_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <string>
@@ -30,13 +35,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc
index d3c9906f8b6..481175c76e0 100644
--- a/src/core/lib/security/security_connector/security_connector.cc
+++ b/src/core/lib/security/security_connector/security_connector.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/security/security_connector/security_connector.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h
index 2e44b14fe00..4c0b788eef4 100644
--- a/src/core/lib/security/security_connector/security_connector.h
+++ b/src/core/lib/security/security_connector/security_connector.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H
 
-#include <memory>
-
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
index 0ec65282f0c..0c8dc6043f8 100644
--- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
+++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -30,10 +32,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h
index 5362e7503bc..436e2c32913 100644
--- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h
+++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h
@@ -18,13 +18,12 @@
 
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H
-#include <stddef.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/ssl_transport_security.h"
diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc
index e3078062a89..2fcd67d1e85 100644
--- a/src/core/lib/security/security_connector/ssl_utils.cc
+++ b/src/core/lib/security/security_connector/ssl_utils.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -30,16 +38,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/ext/transport/chttp2/alpn/alpn.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h
index f60b679c763..08973d5b7fc 100644
--- a/src/core/lib/security/security_connector/ssl_utils.h
+++ b/src/core/lib/security/security_connector/ssl_utils.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_H
 
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
@@ -28,13 +33,6 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc
index b6c492fe458..d708ce8abfa 100644
--- a/src/core/lib/security/security_connector/tls/tls_security_connector.cc
+++ b/src/core/lib/security/security_connector/tls/tls_security_connector.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/lib/security/security_connector/tls/tls_security_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <memory>
@@ -29,13 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.h b/src/core/lib/security/security_connector/tls/tls_security_connector.h
index 3c4e90436dc..27e915a6143 100644
--- a/src/core/lib/security/security_connector/tls/tls_security_connector.h
+++ b/src/core/lib/security/security_connector/tls/tls_security_connector.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_TLS_TLS_SECURITY_CONNECTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_TLS_TLS_SECURITY_CONNECTOR_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 
@@ -26,12 +31,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h
index 71834db4403..fe386211bf0 100644
--- a/src/core/lib/security/transport/auth_filters.h
+++ b/src/core/lib/security/transport/auth_filters.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc
index a5740afcfa2..557f6b14450 100644
--- a/src/core/lib/security/transport/client_auth_filter.cc
+++ b/src/core/lib/security/transport/client_auth_filter.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <functional>
@@ -25,14 +31,6 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc
index 45e47aaa214..240e7c9d482 100644
--- a/src/core/lib/security/transport/server_auth_filter.cc
+++ b/src/core/lib/security/transport/server_auth_filter.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <atomic>
 #include <cstddef>
@@ -27,14 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/security/util/json_util.cc b/src/core/lib/security/util/json_util.cc
index c0b5a5b36cc..2cbc8ec7574 100644
--- a/src/core/lib/security/util/json_util.cc
+++ b/src/core/lib/security/util/json_util.cc
@@ -18,16 +18,15 @@
 
 #include "src/core/lib/security/util/json_util.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+
 #include <map>
 #include <string>
 #include <utility>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/iomgr/error.h"
 
 const char* grpc_json_get_string_property(const grpc_core::Json& json,
diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc
index 8b51c4d9059..88af7e0a20f 100644
--- a/src/core/lib/slice/percent_encoding.cc
+++ b/src/core/lib/slice/percent_encoding.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/slice/percent_encoding.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <cstdint>
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/bitset.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
index a7ff2198d03..52af6a4e288 100644
--- a/src/core/lib/slice/slice.cc
+++ b/src/core/lib/slice/slice.cc
@@ -18,16 +18,14 @@
 
 #include "src/core/lib/slice/slice.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <new>
 
 #include "absl/log/check.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 #include "src/core/util/memory.h"
diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h
index 5b70fa4ee52..6a84345d838 100644
--- a/src/core/lib/slice/slice.h
+++ b/src/core/lib/slice/slice.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_H
 
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,12 +27,6 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc
index 3d07c32334b..37be00ec16c 100644
--- a/src/core/lib/slice/slice_buffer.cc
+++ b/src/core/lib/slice/slice_buffer.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/lib/slice/slice_buffer.h"
 
-#include <string.h>
-
-#include <utility>
-
-#include "absl/log/check.h"
-
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
+#include <utility>
+
+#include "absl/log/check.h"
 #include "src/core/lib/slice/slice_internal.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/slice/slice_buffer.h b/src/core/lib/slice/slice_buffer.h
index cfd6d53a3bc..ab6c19d4f55 100644
--- a/src/core/lib/slice/slice_buffer.h
+++ b/src/core/lib/slice/slice_buffer.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_BUFFER_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_BUFFER_H
 
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <memory>
 #include <string>
 
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 
 // Copy the first n bytes of src into memory pointed to by dst.
diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h
index 093a77ecfb0..9c05f6fdacd 100644
--- a/src/core/lib/slice/slice_internal.h
+++ b/src/core/lib/slice/slice_internal.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_INTERNAL_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <cstddef>
@@ -27,10 +29,6 @@
 #include "absl/hash/hash.h"
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/memory.h"
 
 // Returns a pointer to the first slice in the slice buffer without giving
diff --git a/src/core/lib/slice/slice_refcount.h b/src/core/lib/slice/slice_refcount.h
index c27bb07a8e7..7ee670114a9 100644
--- a/src/core/lib/slice/slice_refcount.h
+++ b/src/core/lib/slice/slice_refcount.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_REFCOUNT_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_REFCOUNT_H
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
 #include <atomic>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/debug_location.h"
 
diff --git a/src/core/lib/slice/slice_string_helpers.h b/src/core/lib/slice/slice_string_helpers.h
index 94680e64c20..ea5805e99a0 100644
--- a/src/core/lib/slice/slice_string_helpers.h
+++ b/src/core/lib/slice/slice_string_helpers.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 // Calls gpr_dump on a slice.
 char* grpc_dump_slice(const grpc_slice& slice, uint32_t flags);
diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc
index 06e45623332..3a5b5666832 100644
--- a/src/core/lib/surface/byte_buffer.cc
+++ b/src/core/lib/surface/byte_buffer.cc
@@ -16,8 +16,6 @@
 //
 //
 
-#include <stddef.h>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
@@ -25,6 +23,7 @@
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc
index 0516b852a90..52bf3795c90 100644
--- a/src/core/lib/surface/byte_buffer_reader.cc
+++ b/src/core/lib/surface/byte_buffer_reader.cc
@@ -16,17 +16,15 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc
index 29c4277d284..95f42cf41f8 100644
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@@ -18,6 +18,19 @@
 
 #include "src/core/lib/surface/call.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.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/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -42,21 +55,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.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/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h
index 8c225b7379d..e95d3686663 100644
--- a/src/core/lib/surface/call.h
+++ b/src/core/lib/surface/call.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CALL_H
 
+#include <grpc/grpc.h>
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,12 +31,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/compression_types.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/surface/call_log_batch.cc b/src/core/lib/surface/call_log_batch.cc
index 4f6ec2153b6..2162ac2831b 100644
--- a/src/core/lib/surface/call_log_batch.cc
+++ b/src/core/lib/surface/call_log_batch.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -25,11 +28,6 @@
 
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/surface/call.h"
diff --git a/src/core/lib/surface/call_test_only.h b/src/core/lib/surface/call_test_only.h
index 2b1f98b1102..217f5dfc40e 100644
--- a/src/core/lib/surface/call_test_only.h
+++ b/src/core/lib/surface/call_test_only.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
 
-#include <stdint.h>
-
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 /// Return the message compression algorithm from \a call.
 ///
diff --git a/src/core/lib/surface/call_utils.cc b/src/core/lib/surface/call_utils.cc
index 18a78fb284e..e5949d9d200 100644
--- a/src/core/lib/surface/call_utils.cc
+++ b/src/core/lib/surface/call_utils.cc
@@ -14,6 +14,19 @@
 
 #include "src/core/lib/surface/call_utils.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.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/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -33,21 +46,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.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/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/src/core/lib/surface/call_utils.h b/src/core/lib/surface/call_utils.h
index de9c928fa74..269e2f25178 100644
--- a/src/core/lib/surface/call_utils.h
+++ b/src/core/lib/surface/call_utils.h
@@ -15,6 +15,19 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_UTILS_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CALL_UTILS_H
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.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/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -31,21 +44,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.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/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/cancel_callback.h"
 #include "src/core/lib/promise/map.h"
diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc
index 577ab734efa..df13bf3e37b 100644
--- a/src/core/lib/surface/channel.cc
+++ b/src/core/lib/surface/channel.cc
@@ -16,14 +16,13 @@
 
 #include "src/core/lib/surface/channel.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h
index fa8ac5468c8..f5105257ab4 100644
--- a/src/core/lib/surface/channel.h
+++ b/src/core/lib/surface/channel.h
@@ -17,6 +17,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <map>
 #include <string>
 
@@ -24,13 +30,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/compression_types.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/lib/surface/channel_create.cc b/src/core/lib/surface/channel_create.cc
index ef0fd5ba2c6..d8a243ceb27 100644
--- a/src/core/lib/surface/channel_create.cc
+++ b/src/core/lib/surface/channel_create.cc
@@ -16,12 +16,11 @@
 
 #include "src/core/lib/surface/channel_create.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/client_channel/direct_channel.h"
diff --git a/src/core/lib/surface/channel_create.h b/src/core/lib/surface/channel_create.h
index 0295eb92bc3..187748cc2a3 100644
--- a/src/core/lib/surface/channel_create.h
+++ b/src/core/lib/surface/channel_create.h
@@ -17,12 +17,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_CREATE_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_CREATE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/channel_stack_type.h"
diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc
index cebe053e34d..28d04651950 100644
--- a/src/core/lib/surface/channel_init.cc
+++ b/src/core/lib/surface/channel_init.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/surface/channel_init.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -33,9 +34,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h
index 628620228c5..7374c880a96 100644
--- a/src/core/lib/surface/channel_init.h
+++ b/src/core/lib/surface/channel_init.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <initializer_list>
@@ -29,9 +30,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
diff --git a/src/core/lib/surface/client_call.cc b/src/core/lib/surface/client_call.cc
index 05670b2e1bc..7f96a43b8aa 100644
--- a/src/core/lib/surface/client_call.cc
+++ b/src/core/lib/surface/client_call.cc
@@ -14,6 +14,19 @@
 
 #include "src/core/lib/surface/client_call.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.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/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -29,21 +42,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.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/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/promise/all_ok.h"
 #include "src/core/lib/promise/status_flag.h"
diff --git a/src/core/lib/surface/client_call.h b/src/core/lib/surface/client_call.h
index 8180c273ba2..d2f86e93d9d 100644
--- a/src/core/lib/surface/client_call.h
+++ b/src/core/lib/surface/client_call.h
@@ -15,19 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CLIENT_CALL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CLIENT_CALL_H
 
-#include <inttypes.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <atomic>
-#include <cstdint>
-#include <string>
-
-#include "absl/status/status.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
 #include <grpc/event_engine/event_engine.h>
@@ -41,7 +28,18 @@
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atomic>
+#include <cstdint>
+#include <string>
 
+#include "absl/status/status.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/promise/status_flag.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/call.h"
diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc
index 9d958defc98..5f25576771d 100644
--- a/src/core/lib/surface/completion_queue.cc
+++ b/src/core/lib/surface/completion_queue.cc
@@ -17,6 +17,12 @@
 //
 #include "src/core/lib/surface/completion_queue.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 
@@ -32,14 +38,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h
index 33dcb5ed5c1..5b8a634ddb0 100644
--- a/src/core/lib/surface/completion_queue.h
+++ b/src/core/lib/surface/completion_queue.h
@@ -21,10 +21,9 @@
 
 // Internal API for completion queues
 
-#include <stdint.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/lib/surface/completion_queue_factory.cc b/src/core/lib/surface/completion_queue_factory.cc
index dae6695b712..c88360772aa 100644
--- a/src/core/lib/surface/completion_queue_factory.cc
+++ b/src/core/lib/surface/completion_queue_factory.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/lib/surface/completion_queue_factory.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/completion_queue.h"
 
diff --git a/src/core/lib/surface/event_string.cc b/src/core/lib/surface/event_string.cc
index eafe18918f5..f0398ba2532 100644
--- a/src/core/lib/surface/event_string.cc
+++ b/src/core/lib/surface/event_string.cc
@@ -18,14 +18,14 @@
 
 #include "src/core/lib/surface/event_string.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 
-#include <grpc/support/port_platform.h>
-
 static void addhdr(grpc_event* ev, std::vector<std::string>* buf) {
   buf->push_back(absl::StrFormat("tag:%p", ev->tag));
 }
diff --git a/src/core/lib/surface/event_string.h b/src/core/lib/surface/event_string.h
index 9677aa84f64..d5709e76451 100644
--- a/src/core/lib/surface/event_string.h
+++ b/src/core/lib/surface/event_string.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H
 #define GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H
 
-#include <string>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 // Returns a string describing an event. Must be later freed with gpr_free()
 std::string grpc_event_string(grpc_event* ev);
 
diff --git a/src/core/lib/surface/filter_stack_call.cc b/src/core/lib/surface/filter_stack_call.cc
index 707d99a59fa..dc6ee088c29 100644
--- a/src/core/lib/surface/filter_stack_call.cc
+++ b/src/core/lib/surface/filter_stack_call.cc
@@ -14,6 +14,19 @@
 
 #include "src/core/lib/surface/filter_stack_call.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.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/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -29,21 +42,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.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/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
diff --git a/src/core/lib/surface/filter_stack_call.h b/src/core/lib/surface/filter_stack_call.h
index b4c304773c9..d9a8866d5e4 100644
--- a/src/core/lib/surface/filter_stack_call.h
+++ b/src/core/lib/surface/filter_stack_call.h
@@ -15,21 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_FILTER_STACK_CALL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_FILTER_STACK_CALL_H
 
-#include <inttypes.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <atomic>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_join.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
 #include <grpc/event_engine/event_engine.h>
@@ -43,7 +28,20 @@
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atomic>
+#include <cstdint>
+#include <string>
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc
index 233f6f97d16..3e2aae160ad 100644
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@@ -18,11 +18,6 @@
 
 #include "src/core/lib/surface/init.h"
 
-#include "absl/base/thread_annotations.h"
-#include "absl/log/log.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
-
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
@@ -31,6 +26,10 @@
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/log/log.h"
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/surface/init.h b/src/core/lib/surface/init.h
index 804b79c5d5b..9f9a4a46880 100644
--- a/src/core/lib/surface/init.h
+++ b/src/core/lib/surface/init.h
@@ -18,10 +18,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_INIT_H
 #define GRPC_SRC_CORE_LIB_SURFACE_INIT_H
 
-#include "absl/time/time.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/time/time.h"
+
 void grpc_maybe_wait_for_async_shutdown(void);
 
 // Returns false if the timeout expired before fully shut down.
diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc
index 8acfd80986d..64030cfbbe8 100644
--- a/src/core/lib/surface/lame_client.cc
+++ b/src/core/lib/surface/lame_client.cc
@@ -18,17 +18,16 @@
 
 #include "src/core/lib/surface/lame_client.h"
 
-#include <memory>
-#include <utility>
-
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <utility>
+
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/surface/lame_client.h b/src/core/lib/surface/lame_client.h
index 970c7630c48..85c4c6e2992 100644
--- a/src/core/lib/surface/lame_client.h
+++ b/src/core/lib/surface/lame_client.h
@@ -19,15 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H
 #define GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc
index ba306525f2c..ba9826e5118 100644
--- a/src/core/lib/surface/legacy_channel.cc
+++ b/src/core/lib/surface/legacy_channel.cc
@@ -18,18 +18,17 @@
 
 #include "src/core/lib/surface/legacy_channel.h"
 
-#include "absl/base/thread_annotations.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/types/optional.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/surface/legacy_channel.h b/src/core/lib/surface/legacy_channel.h
index 7ca47a6bb22..ee1c3f92c89 100644
--- a/src/core/lib/surface/legacy_channel.h
+++ b/src/core/lib/surface/legacy_channel.h
@@ -19,15 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_LEGACY_CHANNEL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_LEGACY_CHANNEL_H
 
-#include <string>
-
-#include "absl/status/statusor.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/status/statusor.h"
+#include "absl/types/optional.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/lib/surface/metadata_array.cc b/src/core/lib/surface/metadata_array.cc
index 666459e6e0a..ba3e8a36460 100644
--- a/src/core/lib/surface/metadata_array.cc
+++ b/src/core/lib/surface/metadata_array.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 #include "src/core/lib/debug/trace.h"
 
diff --git a/src/core/lib/surface/server_call.cc b/src/core/lib/surface/server_call.cc
index 32aadc25da9..ed1d0bb8426 100644
--- a/src/core/lib/surface/server_call.cc
+++ b/src/core/lib/surface/server_call.cc
@@ -14,18 +14,6 @@
 
 #include "src/core/lib/surface/server_call.h"
 
-#include <inttypes.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
 #include <grpc/event_engine/event_engine.h>
@@ -39,7 +27,17 @@
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "absl/log/check.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/promise/all_ok.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/surface/server_call.h b/src/core/lib/surface/server_call.h
index dcc9d86606e..a69673adc55 100644
--- a/src/core/lib/surface/server_call.h
+++ b/src/core/lib/surface/server_call.h
@@ -15,6 +15,19 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_SERVER_CALL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_SERVER_CALL_H
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.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/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -30,21 +43,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.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/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/call.h"
diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc
index 3a68a673c04..684cad74e53 100644
--- a/src/core/lib/surface/validate_metadata.cc
+++ b/src/core/lib/surface/validate_metadata.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/surface/validate_metadata.h"
 
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/bitset.h"
diff --git a/src/core/lib/surface/validate_metadata.h b/src/core/lib/surface/validate_metadata.h
index 03d08939894..f4630ea2d48 100644
--- a/src/core/lib/surface/validate_metadata.h
+++ b/src/core/lib/surface/validate_metadata.h
@@ -19,16 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_VALIDATE_METADATA_H
 #define GRPC_SRC_CORE_LIB_SURFACE_VALIDATE_METADATA_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <cstring>
 
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc
index ed2176bea61..90d7cf9429c 100644
--- a/src/core/lib/transport/bdp_estimator.cc
+++ b/src/core/lib/transport/bdp_estimator.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/transport/bdp_estimator.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -26,8 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 BdpEstimator::BdpEstimator(absl::string_view name)
diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h
index 487b04eb35d..c5879d939c3 100644
--- a/src/core/lib/transport/bdp_estimator.h
+++ b/src/core/lib/transport/bdp_estimator.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 
 #include <string>
@@ -26,10 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/lib/transport/call_arena_allocator.cc b/src/core/lib/transport/call_arena_allocator.cc
index 729b9fe51bb..a9b15cda290 100644
--- a/src/core/lib/transport/call_arena_allocator.cc
+++ b/src/core/lib/transport/call_arena_allocator.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/transport/call_arena_allocator.h"
 
-#include <algorithm>
-
 #include <grpc/support/port_platform.h>
 
+#include <algorithm>
+
 namespace grpc_core {
 
 void CallArenaAllocator::FinalizeArena(Arena* arena) {
diff --git a/src/core/lib/transport/call_arena_allocator.h b/src/core/lib/transport/call_arena_allocator.h
index d52bdf4ecf7..074f9a15772 100644
--- a/src/core/lib/transport/call_arena_allocator.h
+++ b/src/core/lib/transport/call_arena_allocator.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_ARENA_ALLOCATOR_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_ARENA_ALLOCATOR_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
 #include <cstddef>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc
index 822c266b0b3..a4d945f8067 100644
--- a/src/core/lib/transport/call_filters.cc
+++ b/src/core/lib/transport/call_filters.cc
@@ -14,11 +14,10 @@
 
 #include "src/core/lib/transport/call_filters.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/transport/metadata.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h
index 01d4c7614de..3dabd20e2f6 100644
--- a/src/core/lib/transport/call_filters.h
+++ b/src/core/lib/transport/call_filters.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <limits>
 #include <memory>
@@ -22,9 +24,6 @@
 #include <type_traits>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/latch.h"
 #include "src/core/lib/promise/map.h"
diff --git a/src/core/lib/transport/call_final_info.cc b/src/core/lib/transport/call_final_info.cc
index e5bf3a5a8a9..5808135551d 100644
--- a/src/core/lib/transport/call_final_info.cc
+++ b/src/core/lib/transport/call_final_info.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/transport/call_final_info.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 static void move64bits(uint64_t* from, uint64_t* to) {
   *to += *from;
   *from = 0;
diff --git a/src/core/lib/transport/call_final_info.h b/src/core/lib/transport/call_final_info.h
index fd407df6de8..2182e9df6b6 100644
--- a/src/core/lib/transport/call_final_info.h
+++ b/src/core/lib/transport/call_final_info.h
@@ -15,12 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H
 
-#include <cstdint>
-
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include <cstdint>
+
 struct grpc_transport_one_way_stats {
   uint64_t framing_bytes = 0;
   uint64_t data_bytes = 0;
diff --git a/src/core/lib/transport/call_spine.cc b/src/core/lib/transport/call_spine.cc
index 29cca71f9a1..93831a87b98 100644
--- a/src/core/lib/transport/call_spine.cc
+++ b/src/core/lib/transport/call_spine.cc
@@ -14,10 +14,9 @@
 
 #include "src/core/lib/transport/call_spine.h"
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/promise/for_each.h"
 #include "src/core/lib/promise/try_seq.h"
diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h
index c3d5687b971..a962c308f69 100644
--- a/src/core/lib/transport/call_spine.h
+++ b/src/core/lib/transport/call_spine.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/promise/detail/status.h"
 #include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/latch.h"
diff --git a/src/core/lib/transport/call_state.h b/src/core/lib/transport/call_state.h
index 33eca5e66b4..1c58a9d61a5 100644
--- a/src/core/lib/transport/call_state.h
+++ b/src/core/lib/transport/call_state.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc
index 9239f34f2be..126f4d2535d 100644
--- a/src/core/lib/transport/connectivity_state.cc
+++ b/src/core/lib/transport/connectivity_state.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/lib/transport/connectivity_state.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h
index a986c66e9f5..91e64aae485 100644
--- a/src/core/lib/transport/connectivity_state.h
+++ b/src/core/lib/transport/connectivity_state.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/work_serializer.h"
diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc
index 4a59efe3deb..ce28fa82c0a 100644
--- a/src/core/lib/transport/error_utils.cc
+++ b/src/core/lib/transport/error_utils.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/lib/transport/error_utils.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <stdint.h>
 
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/transport/status_conversion.h"
 #include "src/core/util/status_helper.h"
 
diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h
index 9510081d004..2abbe7a6f4c 100644
--- a/src/core/lib/transport/error_utils.h
+++ b/src/core/lib/transport/error_utils.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_ERROR_UTILS_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_ERROR_UTILS_H
 
-#include <string>
-
-#include "absl/status/status.h"
-
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/status/status.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/transport/http2_errors.h"
 #include "src/core/util/time.h"
diff --git a/src/core/lib/transport/interception_chain.cc b/src/core/lib/transport/interception_chain.cc
index 317c6cfa93a..14d8c83f793 100644
--- a/src/core/lib/transport/interception_chain.cc
+++ b/src/core/lib/transport/interception_chain.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/transport/interception_chain.h"
 
-#include <cstddef>
-
 #include <grpc/support/port_platform.h>
 
+#include <cstddef>
+
 #include "src/core/lib/transport/call_destination.h"
 #include "src/core/lib/transport/call_filters.h"
 #include "src/core/lib/transport/call_spine.h"
diff --git a/src/core/lib/transport/interception_chain.h b/src/core/lib/transport/interception_chain.h
index a204985afc0..db54104dafa 100644
--- a/src/core/lib/transport/interception_chain.h
+++ b/src/core/lib/transport/interception_chain.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_INTERCEPTION_CHAIN_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_INTERCEPTION_CHAIN_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/transport/call_destination.h"
 #include "src/core/lib/transport/call_filters.h"
 #include "src/core/lib/transport/call_spine.h"
diff --git a/src/core/lib/transport/message.cc b/src/core/lib/transport/message.cc
index a9435911a57..30f1a3088bb 100644
--- a/src/core/lib/transport/message.cc
+++ b/src/core/lib/transport/message.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/lib/transport/message.h"
 
-#include "absl/strings/str_cat.h"
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_cat.h"
+
 namespace grpc_core {
 
 std::string Message::DebugString() const {
diff --git a/src/core/lib/transport/metadata_batch.cc b/src/core/lib/transport/metadata_batch.cc
index 732a17e11ca..6dcbc0ace2b 100644
--- a/src/core/lib/transport/metadata_batch.cc
+++ b/src/core/lib/transport/metadata_batch.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/transport/metadata_batch.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -25,9 +26,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/transport/timeout_encoding.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h
index 4a2ca21bd27..005139af20b 100644
--- a/src/core/lib/transport/metadata_batch.h
+++ b/src/core/lib/transport/metadata_batch.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
 
+#include <grpc/impl/compression_types.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <cstdint>
@@ -33,11 +36,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/compression_types.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/transport/metadata_compression_traits.h b/src/core/lib/transport/metadata_compression_traits.h
index 05f8a9145f8..baa7e0ee906 100644
--- a/src/core/lib/transport/metadata_compression_traits.h
+++ b/src/core/lib/transport/metadata_compression_traits.h
@@ -15,9 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 namespace grpc_core {
 
diff --git a/src/core/lib/transport/parsed_metadata.h b/src/core/lib/transport/parsed_metadata.h
index 1ea9c9a2e4a..ac529c2e609 100644
--- a/src/core/lib/transport/parsed_metadata.h
+++ b/src/core/lib/transport/parsed_metadata.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -28,10 +30,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/lib/transport/promise_endpoint.cc b/src/core/lib/transport/promise_endpoint.cc
index 90b2e0ce5b8..b151388587f 100644
--- a/src/core/lib/transport/promise_endpoint.cc
+++ b/src/core/lib/transport/promise_endpoint.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/lib/transport/promise_endpoint.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <functional>
 #include <memory>
@@ -22,12 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h
index 0e69b82f7a1..18af1a763c4 100644
--- a/src/core/lib/transport/promise_endpoint.h
+++ b/src/core/lib/transport/promise_endpoint.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PROMISE_ENDPOINT_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_PROMISE_ENDPOINT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -29,13 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h"
 #include "src/core/lib/event_engine/query_extensions.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/transport/simple_slice_based_metadata.h b/src/core/lib/transport/simple_slice_based_metadata.h
index 01270a645c3..eed4ec06241 100644
--- a/src/core/lib/transport/simple_slice_based_metadata.h
+++ b/src/core/lib/transport/simple_slice_based_metadata.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/parsed_metadata.h"
 
diff --git a/src/core/lib/transport/timeout_encoding.cc b/src/core/lib/transport/timeout_encoding.cc
index 57621d835c0..845dbf7a26f 100644
--- a/src/core/lib/transport/timeout_encoding.cc
+++ b/src/core/lib/transport/timeout_encoding.cc
@@ -18,14 +18,14 @@
 
 #include "src/core/lib/transport/timeout_encoding.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <limits>
 
 #include "absl/base/attributes.h"
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h
index 9957640a95b..995650bc5b6 100644
--- a/src/core/lib/transport/timeout_encoding.h
+++ b/src/core/lib/transport/timeout_encoding.h
@@ -19,12 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
index 58d0869cf7e..fb189ff168e 100644
--- a/src/core/lib/transport/transport.cc
+++ b/src/core/lib/transport/transport.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/transport/transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -26,11 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/for_each.h"
diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h
index 9c34fb1efce..e0ed8b07d3c 100644
--- a/src/core/lib/transport/transport.h
+++ b/src/core/lib/transport/transport.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
@@ -32,13 +37,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc
index 7141161ed08..08b5e4656b6 100644
--- a/src/core/lib/transport/transport_op_string.cc
+++ b/src/core/lib/transport/transport_op_string.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/transport/connectivity_state.h"
diff --git a/src/core/load_balancing/.clang-format b/src/core/load_balancing/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/load_balancing/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/load_balancing/address_filtering.cc b/src/core/load_balancing/address_filtering.cc
index fe9834b170d..1a19cfca33a 100644
--- a/src/core/load_balancing/address_filtering.cc
+++ b/src/core/load_balancing/address_filtering.cc
@@ -16,14 +16,12 @@
 
 #include "src/core/load_balancing/address_filtering.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <utility>
 
 #include "absl/functional/function_ref.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/load_balancing/address_filtering.h b/src/core/load_balancing/address_filtering.h
index 7b7fda9ac74..31b45108285 100644
--- a/src/core/load_balancing/address_filtering.h
+++ b/src/core/load_balancing/address_filtering.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <utility>
@@ -24,9 +26,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_string.h"
diff --git a/src/core/load_balancing/backend_metric_data.h b/src/core/load_balancing/backend_metric_data.h
index 1f11e61e947..036298681de 100644
--- a/src/core/load_balancing/backend_metric_data.h
+++ b/src/core/load_balancing/backend_metric_data.h
@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Represents backend metrics reported by the backend to the client.
diff --git a/src/core/load_balancing/backend_metric_parser.cc b/src/core/load_balancing/backend_metric_parser.cc
index 6dc1275a65e..3b65399136a 100644
--- a/src/core/load_balancing/backend_metric_parser.cc
+++ b/src/core/load_balancing/backend_metric_parser.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/load_balancing/backend_metric_parser.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <map>
@@ -26,8 +27,6 @@
 #include "upb/message/map.h"
 #include "xds/data/orca/v3/orca_load_report.upb.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/load_balancing/backend_metric_parser.h b/src/core/load_balancing/backend_metric_parser.h
index cd499157d0a..c6bf0b08729 100644
--- a/src/core/load_balancing/backend_metric_parser.h
+++ b/src/core/load_balancing/backend_metric_parser.h
@@ -17,12 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_PARSER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_PARSER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/backend_metric_data.h"
 
 namespace grpc_core {
diff --git a/src/core/load_balancing/child_policy_handler.cc b/src/core/load_balancing/child_policy_handler.cc
index 4ec9127b555..5f6b545af9d 100644
--- a/src/core/load_balancing/child_policy_handler.cc
+++ b/src/core/load_balancing/child_policy_handler.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/child_policy_handler.h"
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
@@ -24,10 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/pollset_set.h"
diff --git a/src/core/load_balancing/child_policy_handler.h b/src/core/load_balancing/child_policy_handler.h
index 79b056a4070..e22da5cb322 100644
--- a/src/core/load_balancing/child_policy_handler.h
+++ b/src/core/load_balancing/child_policy_handler.h
@@ -16,13 +16,12 @@
 
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/src/core/load_balancing/delegating_helper.h b/src/core/load_balancing/delegating_helper.h
index 0852319d8a9..c504797b526 100644
--- a/src/core/load_balancing/delegating_helper.h
+++ b/src/core/load_balancing/delegating_helper.h
@@ -17,16 +17,15 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H
 
-#include <utility>
-
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/load_balancing/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc
index 7507aadc5b5..93161132732 100644
--- a/src/core/load_balancing/endpoint_list.cc
+++ b/src/core/load_balancing/endpoint_list.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/endpoint_list.h"
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -27,11 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/pollset_set.h"
diff --git a/src/core/load_balancing/endpoint_list.h b/src/core/load_balancing/endpoint_list.h
index eff8663d7e8..4ba3b60753a 100644
--- a/src/core/load_balancing/endpoint_list.h
+++ b/src/core/load_balancing/endpoint_list.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -26,10 +28,6 @@
 #include "absl/functional/function_ref.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc
index 4aff5f14580..90b12f05101 100644
--- a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc
+++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/load_balancing/grpclb/client_load_reporting_filter.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/map.h"
diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.h b/src/core/load_balancing/grpclb/client_load_reporting_filter.h
index 87fa1fee21b..07e0c43b8c2 100644
--- a/src/core/load_balancing/grpclb/client_load_reporting_filter.h
+++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc
index d6e82fbb134..a214f92c4db 100644
--- a/src/core/load_balancing/grpclb/grpclb.cc
+++ b/src/core/load_balancing/grpclb/grpclb.cc
@@ -58,6 +58,14 @@
 
 // IWYU pragma: no_include <sys/socket.h>
 
+#include <grpc/byte_buffer.h>
+#include <grpc/byte_buffer_reader.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -83,17 +91,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/byte_buffer_reader.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
@@ -144,6 +141,7 @@
 #include "src/core/util/useful.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/util/work_serializer.h"
+#include "upb/mem/arena.hpp"
 
 #define GRPC_GRPCLB_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_GRPCLB_RECONNECT_BACKOFF_MULTIPLIER 1.6
diff --git a/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc
index a0552c57c70..85b8ff6d6c6 100644
--- a/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc
+++ b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc
@@ -16,12 +16,11 @@
 
 #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/useful.h"
 
diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.cc b/src/core/load_balancing/grpclb/grpclb_client_stats.cc
index 6ed75719e9c..2f9f0a9842d 100644
--- a/src/core/load_balancing/grpclb/grpclb_client_stats.cc
+++ b/src/core/load_balancing/grpclb/grpclb_client_stats.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/load_balancing/grpclb/grpclb_client_stats.h"
 
-#include <string.h>
-
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <string.h>
 
 #include "src/core/util/sync.h"
 
diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.h b/src/core/load_balancing/grpclb/grpclb_client_stats.h
index d03462038f6..332f942fe52 100644
--- a/src/core/load_balancing/grpclb/grpclb_client_stats.h
+++ b/src/core/load_balancing/grpclb/grpclb_client_stats.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_CLIENT_STATS_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_CLIENT_STATS_H
 
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -26,10 +28,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/container/inlined_vector.h"
-
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/memory.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/load_balancing/grpclb/load_balancer_api.cc b/src/core/load_balancing/grpclb/load_balancer_api.cc
index 8cda3230ed5..6fd1eafd9ff 100644
--- a/src/core/load_balancing/grpclb/load_balancer_api.cc
+++ b/src/core/load_balancing/grpclb/load_balancer_api.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/load_balancing/grpclb/load_balancer_api.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -25,13 +27,9 @@
 #include "absl/log/log.h"
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/timestamp.upb.h"
-#include "upb/base/string_view.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/memory.h"
 #include "src/proto/grpc/lb/v1/load_balancer.upb.h"
+#include "upb/base/string_view.h"
 
 namespace grpc_core {
 
diff --git a/src/core/load_balancing/grpclb/load_balancer_api.h b/src/core/load_balancing/grpclb/load_balancer_api.h
index ebfdd0c84d6..c2aa2db7713 100644
--- a/src/core/load_balancing/grpclb/load_balancer_api.h
+++ b/src/core/load_balancing/grpclb/load_balancer_api.h
@@ -18,18 +18,16 @@
 
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_LOAD_BALANCER_API_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_LOAD_BALANCER_API_H
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "absl/strings/string_view.h"
-#include "upb/mem/arena.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/grpclb/grpclb_client_stats.h"
 #include "src/core/util/time.h"
+#include "upb/mem/arena.h"
 
 #define GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH 128
 #define GRPC_GRPCLB_SERVER_IP_ADDRESS_MAX_SIZE 16
diff --git a/src/core/load_balancing/health_check_client.cc b/src/core/load_balancing/health_check_client.cc
index b2d3f1ac3a9..0f28c4392ae 100644
--- a/src/core/load_balancing/health_check_client.cc
+++ b/src/core/load_balancing/health_check_client.cc
@@ -14,6 +14,11 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -31,15 +36,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/subchannel.h"
@@ -62,6 +58,8 @@
 #include "src/core/util/sync.h"
 #include "src/core/util/work_serializer.h"
 #include "src/proto/grpc/health/v1/health.upb.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/load_balancing/health_check_client.h b/src/core/load_balancing/health_check_client.h
index 9fe4c1cdf17..abe778f503d 100644
--- a/src/core/load_balancing/health_check_client.h
+++ b/src/core/load_balancing/health_check_client.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/util/work_serializer.h"
diff --git a/src/core/load_balancing/health_check_client_internal.h b/src/core/load_balancing/health_check_client_internal.h
index cded2e1df8c..187b3dec0fe 100644
--- a/src/core/load_balancing/health_check_client_internal.h
+++ b/src/core/load_balancing/health_check_client_internal.h
@@ -17,6 +17,9 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <set>
@@ -27,10 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/client_channel/subchannel_stream_client.h"
diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h
index bbfd775b028..d8116d8cb7a 100644
--- a/src/core/load_balancing/lb_policy.h
+++ b/src/core/load_balancing/lb_policy.h
@@ -17,6 +17,11 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -31,13 +36,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/load_balancing/lb_policy_factory.h b/src/core/load_balancing/lb_policy_factory.h
index d05d356b71d..c8b710b1247 100644
--- a/src/core/load_balancing/lb_policy_factory.h
+++ b/src/core/load_balancing/lb_policy_factory.h
@@ -17,11 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H
 
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/load_balancing/lb_policy_registry.cc b/src/core/load_balancing/lb_policy_registry.cc
index 1aaa2103941..b0b20139f76 100644
--- a/src/core/load_balancing/lb_policy_registry.cc
+++ b/src/core/load_balancing/lb_policy_registry.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/lb_policy_registry.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <map>
 #include <string>
@@ -29,10 +32,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/lb_policy.h"
 
 namespace grpc_core {
diff --git a/src/core/load_balancing/lb_policy_registry.h b/src/core/load_balancing/lb_policy_registry.h
index e0587f4856a..86bc7ccd2eb 100644
--- a/src/core/load_balancing/lb_policy_registry.h
+++ b/src/core/load_balancing/lb_policy_registry.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/load_balancing/oob_backend_metric.cc b/src/core/load_balancing/oob_backend_metric.cc
index 87e9528379e..4b29bd25847 100644
--- a/src/core/load_balancing/oob_backend_metric.cc
+++ b/src/core/load_balancing/oob_backend_metric.cc
@@ -16,6 +16,12 @@
 
 #include "src/core/load_balancing/oob_backend_metric.h"
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -28,16 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/duration.upb.h"
-#include "upb/mem/arena.hpp"
-#include "xds/service/orca/v3/orca.upb.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_stream_client.h"
@@ -56,6 +52,8 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
+#include "upb/mem/arena.hpp"
+#include "xds/service/orca/v3/orca.upb.h"
 
 namespace grpc_core {
 
diff --git a/src/core/load_balancing/oob_backend_metric.h b/src/core/load_balancing/oob_backend_metric.h
index 1c594d8e93c..1eacc08e54d 100644
--- a/src/core/load_balancing/oob_backend_metric.h
+++ b/src/core/load_balancing/oob_backend_metric.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/util/time.h"
diff --git a/src/core/load_balancing/oob_backend_metric_internal.h b/src/core/load_balancing/oob_backend_metric_internal.h
index f39e852b01f..647f45d7eaa 100644
--- a/src/core/load_balancing/oob_backend_metric_internal.h
+++ b/src/core/load_balancing/oob_backend_metric_internal.h
@@ -17,16 +17,15 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <set>
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/client_channel/subchannel_stream_client.h"
diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc
index aef81b7363d..448f3da2271 100644
--- a/src/core/load_balancing/outlier_detection/outlier_detection.cc
+++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -39,11 +42,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.h b/src/core/load_balancing/outlier_detection/outlier_detection.h
index d862941e1fa..c035e45c165 100644
--- a/src/core/load_balancing/outlier_detection/outlier_detection.h
+++ b/src/core/load_balancing/outlier_detection/outlier_detection.h
@@ -17,12 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>  // for uint32_t
 
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc
index c977a032c5d..c49b8ad2bfb 100644
--- a/src/core/load_balancing/pick_first/pick_first.cc
+++ b/src/core/load_balancing/pick_first/pick_first.cc
@@ -16,6 +16,10 @@
 
 #include "src/core/load_balancing/pick_first/pick_first.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -35,12 +39,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/load_balancing/priority/priority.cc b/src/core/load_balancing/priority/priority.cc
index a747c2ce17f..854ea3c4c79 100644
--- a/src/core/load_balancing/priority/priority.cc
+++ b/src/core/load_balancing/priority/priority.cc
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -33,12 +37,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc
index 5ca33543983..5613648b1b6 100644
--- a/src/core/load_balancing/ring_hash/ring_hash.cc
+++ b/src/core/load_balancing/ring_hash/ring_hash.cc
@@ -16,6 +16,10 @@
 
 #include "src/core/load_balancing/ring_hash/ring_hash.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -36,12 +40,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/load_balancing/ring_hash/ring_hash.h b/src/core/load_balancing/ring_hash/ring_hash.h
index da7e83b215a..95f17cbe81d 100644
--- a/src/core/load_balancing/ring_hash/ring_hash.h
+++ b/src/core/load_balancing/ring_hash/ring_hash.h
@@ -17,9 +17,8 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_RING_HASH_RING_HASH_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_RING_HASH_RING_HASH_H
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc
index a02da17484c..3024ebbef0d 100644
--- a/src/core/load_balancing/rls/rls.cc
+++ b/src/core/load_balancing/rls/rls.cc
@@ -22,6 +22,17 @@
 
 #include "src/core/load_balancing/rls/rls.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/byte_buffer_reader.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
@@ -51,21 +62,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/byte_buffer_reader.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -109,6 +105,8 @@
 #include "src/core/util/validation_errors.h"
 #include "src/core/util/work_serializer.h"
 #include "src/proto/grpc/lookup/v1/rls.upb.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
 
 using ::grpc_event_engine::experimental::EventEngine;
 
diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc
index 5c4c23370ed..44fa7f9104c 100644
--- a/src/core/load_balancing/round_robin/round_robin.cc
+++ b/src/core/load_balancing/round_robin/round_robin.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -33,10 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/subchannel_interface.h b/src/core/load_balancing/subchannel_interface.h
index b2d78fad05f..0042a9f0ea2 100644
--- a/src/core/load_balancing/subchannel_interface.h
+++ b/src/core/load_balancing/subchannel_interface.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc
index 785c0ff22d3..e74714db433 100644
--- a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc
+++ b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
@@ -25,8 +27,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h
index 7245ca9607a..936033848f7 100644
--- a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h
+++ b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,8 +27,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // StaticStrideScheduler implements a stride scheduler without the ability to
diff --git a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc
index c0403f84bd1..522b73ece7d 100644
--- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc
+++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -39,11 +42,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc
index 8f5075a3409..bebda9cba0d 100644
--- a/src/core/load_balancing/weighted_target/weighted_target.cc
+++ b/src/core/load_balancing/weighted_target/weighted_target.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/weighted_target/weighted_target.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -37,11 +40,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc
index 98072442af5..358d9c41194 100644
--- a/src/core/load_balancing/xds/cds.cc
+++ b/src/core/load_balancing/xds/cds.cc
@@ -14,6 +14,11 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc_security.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <map>
 #include <memory>
@@ -31,12 +36,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc
index 380ed7b108a..ba655bfb762 100644
--- a/src/core/load_balancing/xds/xds_cluster_impl.cc
+++ b/src/core/load_balancing/xds/xds_cluster_impl.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -33,10 +35,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/load_balancing/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc
index 4e72ca1170c..96ad1313aeb 100644
--- a/src/core/load_balancing/xds/xds_cluster_manager.cc
+++ b/src/core/load_balancing/xds/xds_cluster_manager.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -32,11 +35,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc
index 1c64eeb0a13..07d800e8df7 100644
--- a/src/core/load_balancing/xds/xds_override_host.cc
+++ b/src/core/load_balancing/xds/xds_override_host.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/xds/xds_override_host.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -42,11 +45,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/src/core/load_balancing/xds/xds_override_host.h b/src/core/load_balancing/xds/xds_override_host.h
index 387a5036491..55317bd4756 100644
--- a/src/core/load_balancing/xds/xds_override_host.h
+++ b/src/core/load_balancing/xds/xds_override_host.h
@@ -17,10 +17,9 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_OVERRIDE_HOST_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_OVERRIDE_HOST_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc
index efdb91844d6..6ac208dc5a8 100644
--- a/src/core/load_balancing/xds/xds_wrr_locality.cc
+++ b/src/core/load_balancing/xds/xds_wrr_locality.cc
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <map>
 #include <memory>
@@ -26,11 +30,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/resolver/.clang-format b/src/core/resolver/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/resolver/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/resolver/binder/binder_resolver.cc b/src/core/resolver/binder/binder_resolver.cc
index 30f7e46cc19..326cee10754 100644
--- a/src/core/resolver/binder/binder_resolver.cc
+++ b/src/core/resolver/binder/binder_resolver.cc
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
 #include "src/core/util/status_helper.h"
 
@@ -42,7 +41,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
index 564fa165d8d..7f866dff773 100644
--- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
+++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -31,11 +34,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
@@ -60,7 +58,6 @@
 #include <address_sorting/address_sorting.h>
 
 #include "absl/strings/str_cat.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/resolve_address.h"
diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.h b/src/core/resolver/dns/c_ares/dns_resolver_ares.h
index d8ce1c25c6b..0eb98efe38b 100644
--- a/src/core/resolver/dns/c_ares/dns_resolver_ares.h
+++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.h
@@ -14,10 +14,9 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/config/core_configuration.h"
 
 namespace grpc_core {
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
index 5a75c6c7431..eeaeddf0cdf 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
@@ -19,14 +19,12 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
 
-#include <memory>
-
 #include <ares.h>
-
-#include "absl/base/thread_annotations.h"
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include "absl/base/thread_annotations.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
index 634ab525e84..7341ffba639 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
@@ -23,6 +23,7 @@
 
 // IWYU pragma: no_include <ares_build.h>
 
+#include <ares.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ -33,12 +34,9 @@
 #include <unordered_set>
 #include <utility>
 
-#include <ares.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/ev_posix.h"
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
index d7757fb9fc4..6f988c8710d 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -20,23 +20,20 @@
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
 #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 
+#include <ares.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <map>
 #include <memory>
 #include <unordered_set>
 
-#include <ares.h>
-
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/sockaddr_windows.h"
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
index e0efc6075b6..cad4cfa1918 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/util/status_helper.h"
 
@@ -37,26 +36,23 @@
 
 #if GRPC_ARES == 1
 
+#include <address_sorting/address_sorting.h>
+#include <ares.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
 #include <string.h>
 #include <sys/types.h>  // IWYU pragma: keep
 
 #include <string>
 #include <utility>
 
-#include <address_sorting/address_sorting.h>
-#include <ares.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
index 5ed2f9cc51e..272ef463ac4 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
@@ -19,17 +19,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
 
+#include <ares.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
-#include <ares.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/resolver/dns/dns_resolver_plugin.cc b/src/core/resolver/dns/dns_resolver_plugin.cc
index 7e9870543b2..c40f628570e 100644
--- a/src/core/resolver/dns/dns_resolver_plugin.cc
+++ b/src/core/resolver/dns/dns_resolver_plugin.cc
@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/resolver/dns/dns_resolver_plugin.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/resolver/dns/c_ares/dns_resolver_ares.h"
diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
index c65b1d506fb..61ed5677943 100644
--- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
+++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -33,11 +36,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
index 555e91fedef..1a4fb852856 100644
--- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
+++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
@@ -13,10 +13,9 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/resolver/resolver.h"
 #include "src/core/resolver/resolver_factory.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/resolver/dns/event_engine/service_config_helper.cc b/src/core/resolver/dns/event_engine/service_config_helper.cc
index ba0b910e327..068ff200292 100644
--- a/src/core/resolver/dns/event_engine/service_config_helper.cc
+++ b/src/core/resolver/dns/event_engine/service_config_helper.cc
@@ -13,6 +13,7 @@
 // limitations under the License.
 #include "src/core/resolver/dns/event_engine/service_config_helper.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -20,9 +21,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/gethostname.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
diff --git a/src/core/resolver/dns/event_engine/service_config_helper.h b/src/core/resolver/dns/event_engine/service_config_helper.h
index 90bc82a96b6..5c89aa5e1e4 100644
--- a/src/core/resolver/dns/event_engine/service_config_helper.h
+++ b/src/core/resolver/dns/event_engine/service_config_helper.h
@@ -15,13 +15,13 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 absl::StatusOr<std::string> ChooseServiceConfig(
diff --git a/src/core/resolver/dns/native/dns_resolver.cc b/src/core/resolver/dns/native/dns_resolver.cc
index 8ee4b549f65..9c138bae997 100644
--- a/src/core/resolver/dns/native/dns_resolver.cc
+++ b/src/core/resolver/dns/native/dns_resolver.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ -27,10 +30,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/resolver/endpoint_addresses.cc b/src/core/resolver/endpoint_addresses.cc
index 7fc7d8d3335..aa5f46e3abd 100644
--- a/src/core/resolver/endpoint_addresses.cc
+++ b/src/core/resolver/endpoint_addresses.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/resolver/endpoint_addresses.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <string>
@@ -29,9 +30,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/resolver/endpoint_addresses.h b/src/core/resolver/endpoint_addresses.h
index 00a9e659784..bd5c0091be1 100644
--- a/src/core/resolver/endpoint_addresses.h
+++ b/src/core/resolver/endpoint_addresses.h
@@ -19,15 +19,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H
 #define GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H
 
+#include <grpc/support/port_platform.h>
+
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "absl/functional/function_ref.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
diff --git a/src/core/resolver/fake/fake_resolver.cc b/src/core/resolver/fake/fake_resolver.cc
index b2bbaf26193..a3ff19fb353 100644
--- a/src/core/resolver/fake/fake_resolver.cc
+++ b/src/core/resolver/fake/fake_resolver.cc
@@ -19,15 +19,14 @@
 
 #include "src/core/resolver/fake/fake_resolver.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/resolver/resolver_factory.h"
diff --git a/src/core/resolver/fake/fake_resolver.h b/src/core/resolver/fake/fake_resolver.h
index 5126c741577..c72187bcfc7 100644
--- a/src/core/resolver/fake/fake_resolver.h
+++ b/src/core/resolver/fake/fake_resolver.h
@@ -17,16 +17,15 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/resolver.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc
index 42e309f900c..7aa5ee7009c 100644
--- a/src/core/resolver/google_c2p/google_c2p_resolver.cc
+++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <random>
@@ -28,10 +31,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/resolver/polling_resolver.cc b/src/core/resolver/polling_resolver.cc
index 27806f1e5a9..83642ddd1c5 100644
--- a/src/core/resolver/polling_resolver.cc
+++ b/src/core/resolver/polling_resolver.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/resolver/polling_resolver.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -29,9 +30,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/src/core/resolver/polling_resolver.h b/src/core/resolver/polling_resolver.h
index fe405c3f1d4..c09ba6653c3 100644
--- a/src/core/resolver/polling_resolver.h
+++ b/src/core/resolver/polling_resolver.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/resolver/resolver.h b/src/core/resolver/resolver.h
index 389096c3d8f..5cabc99b270 100644
--- a/src/core/resolver/resolver.h
+++ b/src/core/resolver/resolver.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_RESOLVER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/src/core/resolver/resolver_factory.h b/src/core/resolver/resolver_factory.h
index 831b67c5cfc..41df42060fc 100644
--- a/src/core/resolver/resolver_factory.h
+++ b/src/core/resolver/resolver_factory.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H
 #define GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/resolver/resolver.h"
diff --git a/src/core/resolver/resolver_registry.cc b/src/core/resolver/resolver_registry.cc
index 3033fb6aecb..56a189bf307 100644
--- a/src/core/resolver/resolver_registry.cc
+++ b/src/core/resolver/resolver_registry.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/resolver/resolver_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
@@ -24,8 +26,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 //
diff --git a/src/core/resolver/resolver_registry.h b/src/core/resolver/resolver_registry.h
index 5e1d87fbf6b..c25f2524578 100644
--- a/src/core/resolver/resolver_registry.h
+++ b/src/core/resolver/resolver_registry.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H
 #define GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/resolver/resolver.h"
diff --git a/src/core/resolver/sockaddr/sockaddr_resolver.cc b/src/core/resolver/sockaddr/sockaddr_resolver.cc
index 1cd1ac310cf..6657faa4680 100644
--- a/src/core/resolver/sockaddr/sockaddr_resolver.cc
+++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -23,9 +25,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/resolver/xds/xds_config.cc b/src/core/resolver/xds/xds_config.cc
index 70158b1c365..b9e7f914513 100644
--- a/src/core/resolver/xds/xds_config.cc
+++ b/src/core/resolver/xds/xds_config.cc
@@ -23,7 +23,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/util/match.h"
 
 namespace grpc_core {
diff --git a/src/core/resolver/xds/xds_config.h b/src/core/resolver/xds/xds_config.h
index 784db2fc487..b5fb154663b 100644
--- a/src/core/resolver/xds/xds_config.h
+++ b/src/core/resolver/xds/xds_config.h
@@ -26,7 +26,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/xds/grpc/xds_cluster.h"
 #include "src/core/xds/grpc/xds_endpoint.h"
diff --git a/src/core/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc
index 3ed9fa1da92..ddc0dcdbfd9 100644
--- a/src/core/resolver/xds/xds_dependency_manager.cc
+++ b/src/core/resolver/xds/xds_dependency_manager.cc
@@ -21,7 +21,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/resolver/fake/fake_resolver.h"
diff --git a/src/core/resolver/xds/xds_dependency_manager.h b/src/core/resolver/xds/xds_dependency_manager.h
index dcb1738b4f1..5e8ea3a00c0 100644
--- a/src/core/resolver/xds/xds_dependency_manager.h
+++ b/src/core/resolver/xds/xds_dependency_manager.h
@@ -20,7 +20,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/resolver/resolver.h"
 #include "src/core/resolver/xds/xds_config.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc
index 833468a7b29..fb9d1da293a 100644
--- a/src/core/resolver/xds/xds_resolver.cc
+++ b/src/core/resolver/xds/xds_resolver.cc
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -42,12 +46,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "re2/re2.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/config_selector.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/resolver/xds/xds_resolver_attributes.h b/src/core/resolver/xds/xds_resolver_attributes.h
index 63f2684f2a1..c0d2795afe4 100644
--- a/src/core/resolver/xds/xds_resolver_attributes.h
+++ b/src/core/resolver/xds/xds_resolver_attributes.h
@@ -17,10 +17,9 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
 #define GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/util/unique_type_name.h"
 #include "src/core/xds/grpc/xds_route_config.h"
diff --git a/src/core/server/server.cc b/src/core/server/server.cc
index f88eb5925da..5ec784a5c96 100644
--- a/src/core/server/server.cc
+++ b/src/core/server/server.cc
@@ -16,6 +16,14 @@
 
 #include "src/core/server/server.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,16 +44,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/server/server.h b/src/core/server/server.h
index 4bd2273eac3..8f68c333eba 100644
--- a/src/core/server/server.h
+++ b/src/core/server/server.h
@@ -17,6 +17,12 @@
 #ifndef GRPC_SRC_CORE_SERVER_SERVER_H
 #define GRPC_SRC_CORE_SERVER_SERVER_H
 
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/passive_listener.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -37,14 +43,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/compression.h>
-#include <grpc/grpc.h>
-#include <grpc/passive_listener.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/server/server_call_tracer_filter.cc b/src/core/server/server_call_tracer_filter.cc
index b4fbdafde9c..692915750d3 100644
--- a/src/core/server/server_call_tracer_filter.cc
+++ b/src/core/server/server_call_tracer_filter.cc
@@ -16,15 +16,14 @@
 
 #include "src/core/server/server_call_tracer_filter.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/server/server_config_selector.h b/src/core/server/server_config_selector.h
index 4d766419809..4e2fda33c77 100644
--- a/src/core/server/server_config_selector.h
+++ b/src/core/server/server_config_selector.h
@@ -17,13 +17,12 @@
 #ifndef GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_H
 #define GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/server/server_config_selector_filter.cc b/src/core/server/server_config_selector_filter.cc
index 2f221e61426..53cfb0524aa 100644
--- a/src/core/server/server_config_selector_filter.cc
+++ b/src/core/server/server_config_selector_filter.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/server/server_config_selector_filter.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <utility>
@@ -23,9 +25,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
diff --git a/src/core/server/xds_channel_stack_modifier.cc b/src/core/server/xds_channel_stack_modifier.cc
index 15d2d3378f3..5a31507b138 100644
--- a/src/core/server/xds_channel_stack_modifier.cc
+++ b/src/core/server/xds_channel_stack_modifier.cc
@@ -18,12 +18,12 @@
 
 #include "src/core/server/xds_channel_stack_modifier.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <initializer_list>
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/server/xds_channel_stack_modifier.h b/src/core/server/xds_channel_stack_modifier.h
index 78810478d99..11ec0f06325 100644
--- a/src/core/server/xds_channel_stack_modifier.h
+++ b/src/core/server/xds_channel_stack_modifier.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_SERVER_XDS_CHANNEL_STACK_MODIFIER_H
 #define GRPC_SRC_CORE_SERVER_XDS_CHANNEL_STACK_MODIFIER_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/server/xds_server_config_fetcher.cc b/src/core/server/xds_server_config_fetcher.cc
index f8b523a293e..35b64a5e19e 100644
--- a/src/core/server/xds_server_config_fetcher.cc
+++ b/src/core/server/xds_server_config_fetcher.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -39,14 +45,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/service_config/service_config.h b/src/core/service_config/service_config.h
index f9c43c35011..801205ed43e 100644
--- a/src/core/service_config/service_config.h
+++ b/src/core/service_config/service_config.h
@@ -17,13 +17,11 @@
 #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_H
 #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_H
 
-#include <stddef.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/service_config/service_config_parser.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/service_config/service_config_call_data.h b/src/core/service_config/service_config_call_data.h
index 7c6bbcd2e39..87ead4b6330 100644
--- a/src/core/service_config/service_config_call_data.h
+++ b/src/core/service_config/service_config_call_data.h
@@ -17,13 +17,12 @@
 #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H
 #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/service_config/service_config_channel_arg_filter.cc b/src/core/service_config/service_config_channel_arg_filter.cc
index c17fa1a04d6..635dd184ca5 100644
--- a/src/core/service_config/service_config_channel_arg_filter.cc
+++ b/src/core/service_config/service_config_channel_arg_filter.cc
@@ -17,6 +17,9 @@
 // This filter reads GRPC_ARG_SERVICE_CONFIG and populates ServiceConfigCallData
 // in the call context per call for direct channels.
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -26,10 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/service_config/service_config_impl.cc b/src/core/service_config/service_config_impl.cc
index a52442e09ec..f678568957a 100644
--- a/src/core/service_config/service_config_impl.cc
+++ b/src/core/service_config/service_config_impl.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/service_config/service_config_impl.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <string>
@@ -25,9 +26,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/service_config/service_config_impl.h b/src/core/service_config/service_config_impl.h
index ca1d3d17dfb..9d6ae2a46d3 100644
--- a/src/core/service_config/service_config_impl.h
+++ b/src/core/service_config/service_config_impl.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H
 #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
@@ -27,10 +29,6 @@
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/service_config/service_config.h"
diff --git a/src/core/service_config/service_config_parser.cc b/src/core/service_config/service_config_parser.cc
index e679126375e..b3ff7392514 100644
--- a/src/core/service_config/service_config_parser.cc
+++ b/src/core/service_config/service_config_parser.cc
@@ -16,14 +16,13 @@
 
 #include "src/core/service_config/service_config_parser.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <string>
 
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 ServiceConfigParser ServiceConfigParser::Builder::Build() {
diff --git a/src/core/service_config/service_config_parser.h b/src/core/service_config/service_config_parser.h
index caac10a4bc8..763e7f89785 100644
--- a/src/core/service_config/service_config_parser.h
+++ b/src/core/service_config/service_config_parser.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H
 #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -25,9 +26,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
diff --git a/src/core/telemetry/call_tracer.cc b/src/core/telemetry/call_tracer.cc
index 873db2d192b..80191bcbbf3 100644
--- a/src/core/telemetry/call_tracer.cc
+++ b/src/core/telemetry/call_tracer.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/telemetry/call_tracer.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/context.h"
 #include "src/core/telemetry/tcp_tracer.h"
 
diff --git a/src/core/telemetry/call_tracer.h b/src/core/telemetry/call_tracer.h
index ab9185e2373..f91fa0b1fe1 100644
--- a/src/core/telemetry/call_tracer.h
+++ b/src/core/telemetry/call_tracer.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_CALL_TRACER_H
 #define GRPC_SRC_CORE_TELEMETRY_CALL_TRACER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/promise/context.h"
diff --git a/src/core/telemetry/histogram_view.h b/src/core/telemetry/histogram_view.h
index 62018d8b840..42da4be2690 100644
--- a/src/core/telemetry/histogram_view.h
+++ b/src/core/telemetry/histogram_view.h
@@ -15,9 +15,8 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_HISTOGRAM_VIEW_H
 #define GRPC_SRC_CORE_TELEMETRY_HISTOGRAM_VIEW_H
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 namespace grpc_core {
 
diff --git a/src/core/telemetry/metrics.cc b/src/core/telemetry/metrics.cc
index 45e2ab64bfc..9194a51d6d0 100644
--- a/src/core/telemetry/metrics.cc
+++ b/src/core/telemetry/metrics.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/telemetry/metrics.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
 namespace grpc_core {
diff --git a/src/core/telemetry/metrics.h b/src/core/telemetry/metrics.h
index b61e30d1fef..968534b7920 100644
--- a/src/core/telemetry/metrics.h
+++ b/src/core/telemetry/metrics.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_METRICS_H
 #define GRPC_SRC_CORE_TELEMETRY_METRICS_H
 
+#include <grpc/support/metrics.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <type_traits>
@@ -24,10 +27,6 @@
 #include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
-
-#include <grpc/support/metrics.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/src/core/telemetry/stats.cc b/src/core/telemetry/stats.cc
index c5137e71f85..4fff0f7ec37 100644
--- a/src/core/telemetry/stats.cc
+++ b/src/core/telemetry/stats.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/telemetry/stats.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -26,8 +27,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace stats_detail {
diff --git a/src/core/telemetry/stats.h b/src/core/telemetry/stats.h
index 8d783dea5d7..c5b64b429ab 100644
--- a/src/core/telemetry/stats.h
+++ b/src/core/telemetry/stats.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_STATS_H
 #define GRPC_SRC_CORE_TELEMETRY_STATS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -26,9 +27,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/telemetry/histogram_view.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/no_destruct.h"
diff --git a/src/core/telemetry/stats_data.cc b/src/core/telemetry/stats_data.cc
index a357b674844..1b59c68f9c5 100644
--- a/src/core/telemetry/stats_data.cc
+++ b/src/core/telemetry/stats_data.cc
@@ -16,9 +16,8 @@
 
 #include "src/core/telemetry/stats_data.h"
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 namespace grpc_core {
 namespace {
diff --git a/src/core/telemetry/stats_data.h b/src/core/telemetry/stats_data.h
index 1ac7579a994..9961302a868 100644
--- a/src/core/telemetry/stats_data.h
+++ b/src/core/telemetry/stats_data.h
@@ -17,15 +17,13 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H
 #define GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <atomic>
 #include <memory>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/telemetry/histogram_view.h"
 #include "src/core/util/per_cpu.h"
 
diff --git a/src/core/telemetry/tcp_tracer.h b/src/core/telemetry/tcp_tracer.h
index 1068678cab8..ac312d50523 100644
--- a/src/core/telemetry/tcp_tracer.h
+++ b/src/core/telemetry/tcp_tracer.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_TCP_TRACER_H
 #define GRPC_SRC_CORE_TELEMETRY_TCP_TRACER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,8 +28,6 @@
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Interface for TCP tracer implementations. Created by CallTracerInterface.
diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc
index a4b908b4bdd..d768f85b216 100644
--- a/src/core/tsi/alts/crypt/aes_gcm.cc
+++ b/src/core/tsi/alts/crypt/aes_gcm.cc
@@ -16,21 +16,18 @@
 //
 //
 
-#include <string.h>
-
-#include <memory>
-
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#include <string.h>
 
-#include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
+#include <memory>
 
+#include "absl/types/span.h"
 #include "src/core/tsi/alts/crypt/gsec.h"
 
 constexpr size_t kKdfKeyLen = 32;
diff --git a/src/core/tsi/alts/crypt/gsec.cc b/src/core/tsi/alts/crypt/gsec.cc
index 591ad2bceb5..d8382aa935f 100644
--- a/src/core/tsi/alts/crypt/gsec.cc
+++ b/src/core/tsi/alts/crypt/gsec.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <stdio.h>
+#include <string.h>
 
 static const char vtable_error_msg[] =
     "crypter or crypter->vtable has not been initialized properly";
diff --git a/src/core/tsi/alts/crypt/gsec.h b/src/core/tsi/alts/crypt/gsec.h
index 0407955d691..726295be26a 100644
--- a/src/core/tsi/alts/crypt/gsec.h
+++ b/src/core/tsi/alts/crypt/gsec.h
@@ -20,6 +20,9 @@
 #define GRPC_SRC_CORE_TSI_ALTS_CRYPT_GSEC_H
 
 #include <assert.h>
+#include <grpc/event_engine/port.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -28,10 +31,6 @@
 
 #include "absl/types/span.h"
 
-#include <grpc/event_engine/port.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Provides accessors to all information representing a gsec key. Owns all the
diff --git a/src/core/tsi/alts/frame_protector/alts_counter.cc b/src/core/tsi/alts/frame_protector/alts_counter.cc
index 5eede6067de..a13887d2a44 100644
--- a/src/core/tsi/alts/frame_protector/alts_counter.cc
+++ b/src/core/tsi/alts/frame_protector/alts_counter.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_counter.h"
 
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 static void maybe_copy_error_msg(const char* src, char** dst) {
   if (dst != nullptr && src != nullptr) {
diff --git a/src/core/tsi/alts/frame_protector/alts_counter.h b/src/core/tsi/alts/frame_protector/alts_counter.h
index 9ebc0892f73..246d1586653 100644
--- a/src/core/tsi/alts/frame_protector/alts_counter.h
+++ b/src/core/tsi/alts/frame_protector/alts_counter.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H
 #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
+#include <stdlib.h>
 
 // Main struct for a crypter counter managed within seal/unseal operations.
 typedef struct alts_counter {
diff --git a/src/core/tsi/alts/frame_protector/alts_crypter.cc b/src/core/tsi/alts/frame_protector/alts_crypter.cc
index 4938127df89..df767fb8a20 100644
--- a/src/core/tsi/alts/frame_protector/alts_crypter.cc
+++ b/src/core/tsi/alts/frame_protector/alts_crypter.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_crypter.h"
 
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 static void maybe_copy_error_msg(const char* src, char** dst) {
   if (dst != nullptr && src != nullptr) {
diff --git a/src/core/tsi/alts/frame_protector/alts_crypter.h b/src/core/tsi/alts/frame_protector/alts_crypter.h
index a660b30667c..5964fcbe7d5 100644
--- a/src/core/tsi/alts/frame_protector/alts_crypter.h
+++ b/src/core/tsi/alts/frame_protector/alts_crypter.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H
 #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H
 
-#include <stdbool.h>
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
+#include <string.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 
diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc
index b8593f225e2..534e8555465 100644
--- a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc
+++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_frame_protector.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -26,10 +28,6 @@
 
 #include "absl/log/log.h"
 #include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/frame_protector/alts_crypter.h"
 #include "src/core/tsi/alts/frame_protector/frame_handler.h"
diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.h b/src/core/tsi/alts/frame_protector/alts_frame_protector.h
index e1f7def8164..9ee925243e7 100644
--- a/src/core/tsi/alts/frame_protector/alts_frame_protector.h
+++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H
 #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/transport_security_interface.h"
 
diff --git a/src/core/tsi/alts/frame_protector/frame_handler.cc b/src/core/tsi/alts/frame_protector/frame_handler.cc
index a4e86f97998..7fcbcce34bb 100644
--- a/src/core/tsi/alts/frame_protector/frame_handler.cc
+++ b/src/core/tsi/alts/frame_protector/frame_handler.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/tsi/alts/frame_protector/frame_handler.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 #include <string.h>
@@ -25,10 +27,6 @@
 #include <algorithm>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/memory.h"
 
diff --git a/src/core/tsi/alts/frame_protector/frame_handler.h b/src/core/tsi/alts/frame_protector/frame_handler.h
index f0a32b4409a..62a9bd042a4 100644
--- a/src/core/tsi/alts/frame_protector/frame_handler.h
+++ b/src/core/tsi/alts/frame_protector/frame_handler.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H
 #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H
 
+#include <grpc/support/port_platform.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include <grpc/support/port_platform.h>
-
 const size_t kFrameMessageType = 0x06;
 const size_t kFrameLengthFieldSize = 4;
 const size_t kFrameMessageTypeFieldSize = 4;
diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc
index f5513e574d4..62cbe099c5a 100644
--- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc
+++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <list>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/numbers.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/channel.h"
@@ -38,6 +36,7 @@
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "src/core/util/sync.h"
+#include "upb/mem/arena.hpp"
 
 #define TSI_ALTS_INITIAL_BUFFER_SIZE 256
 
diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.cc b/src/core/tsi/alts/handshaker/alts_shared_resource.cc
index 06d4e5e1936..ec1fe812963 100644
--- a/src/core/tsi/alts/handshaker/alts_shared_resource.cc
+++ b/src/core/tsi/alts/handshaker/alts_shared_resource.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/tsi/alts/handshaker/alts_shared_resource.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
index 79b497bda7e..b25e14f1d85 100644
--- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
+++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
@@ -18,14 +18,6 @@
 
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "upb/mem/arena.hpp"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
@@ -33,7 +25,12 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/thd_id.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/channel.h"
@@ -43,6 +40,7 @@
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h"
 #include "src/core/util/memory.h"
 #include "src/core/util/sync.h"
+#include "upb/mem/arena.hpp"
 
 // Main struct for ALTS TSI handshaker.
 struct alts_tsi_handshaker {
diff --git a/src/core/tsi/alts/handshaker/alts_tsi_utils.cc b/src/core/tsi/alts/handshaker/alts_tsi_utils.cc
index 0c4325844bd..cc8f6dc78bd 100644
--- a/src/core/tsi/alts/handshaker/alts_tsi_utils.cc
+++ b/src/core/tsi/alts/handshaker/alts_tsi_utils.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/tsi/alts/handshaker/alts_tsi_utils.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 
diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.cc b/src/core/tsi/alts/handshaker/transport_security_common_api.cc
index 9506eaa3b6a..a7881e0d71f 100644
--- a/src/core/tsi/alts/handshaker/transport_security_common_api.cc
+++ b/src/core/tsi/alts/handshaker/transport_security_common_api.cc
@@ -18,11 +18,11 @@
 
 #include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/log.h"
 #include "upb/mem/arena.hpp"
 
-#include <grpc/support/port_platform.h>
-
 bool grpc_gcp_rpc_protocol_versions_set_max(
     grpc_gcp_rpc_protocol_versions* versions, uint32_t max_major,
     uint32_t max_minor) {
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc
index 89c5dcfaa6f..5bde0334f50 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h
index eb61d2ff2e3..8bf3a661467 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H
 #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc
index 2a568cd446e..cc10ddb8eb4 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h
index c4dd9ab152a..0e32bf42570 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H
 #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc
index d4e77898e35..76cf72290cc 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc
index 908ed2934fd..68db992e0bf 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "src/core/tsi/alts/frame_protector/alts_counter.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h
index e29ab55b502..858d19f3b88 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_IOVEC_RECORD_PROTOCOL_H
 #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_IOVEC_RECORD_PROTOCOL_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc
index fce90b47f48..cbf009e99ab 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -25,10 +27,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h
index 42c3dee0d35..d5dbd8c4891 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_ZERO_COPY_GRPC_PROTECTOR_H
 #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_ZERO_COPY_GRPC_PROTECTOR_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc
index e01dce2c687..98c073779b0 100644
--- a/src/core/tsi/fake_transport_security.cc
+++ b/src/core/tsi/fake_transport_security.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/tsi/fake_transport_security.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/src/core/tsi/local_transport_security.cc b/src/core/tsi/local_transport_security.cc
index bb25a25db41..ced2ef2baa1 100644
--- a/src/core/tsi/local_transport_security.cc
+++ b/src/core/tsi/local_transport_security.cc
@@ -18,16 +18,14 @@
 
 #include "src/core/tsi/local_transport_security.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc
index 510a55bfc27..b0f961a41c8 100644
--- a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc
+++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.h b/src/core/tsi/ssl/key_logging/ssl_key_logging.h
index c3752c1e7b0..472ddc70a09 100644
--- a/src/core/tsi/ssl/key_logging/ssl_key_logging.h
+++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.h
@@ -15,18 +15,16 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H
 #define GRPC_SRC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H
 
-#include <iostream>
-#include <map>
-
-#include <openssl/ssl.h>
-
-#include "absl/base/thread_annotations.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <openssl/ssl.h>
+
+#include <iostream>
+#include <map>
 
+#include "absl/base/thread_annotations.h"
 #include "src/core/util/memory.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/tsi/ssl/session_cache/ssl_session.h b/src/core/tsi/ssl/session_cache/ssl_session.h
index f990f3dfd52..fa57de48983 100644
--- a/src/core/tsi/ssl/session_cache/ssl_session.h
+++ b/src/core/tsi/ssl/session_cache/ssl_session.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_H
 #define GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_H
 
-#include <memory>
-
-#include <openssl/ssl.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <openssl/ssl.h>
+
+#include <memory>
 
 #include "src/core/util/ref_counted.h"
 
diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc
index 7c27f36e2ab..6e107c066c5 100644
--- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc
+++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/ssl/session_cache/ssl_session.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.h b/src/core/tsi/ssl/session_cache/ssl_session_cache.h
index 024262c9c90..b33b53aebf1 100644
--- a/src/core/tsi/ssl/session_cache/ssl_session_cache.h
+++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_CACHE_H
 #define GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_CACHE_H
 
-#include <map>
-
-#include <openssl/ssl.h>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <openssl/ssl.h>
+
+#include <map>
 
 #include "src/core/tsi/ssl/session_cache/ssl_session.h"
 #include "src/core/util/cpp_impl_of.h"
diff --git a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc
index ad78488415b..f44b4cb7335 100644
--- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc
+++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc
@@ -15,17 +15,15 @@
 // limitations under the License.
 //
 //
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/tsi/ssl/session_cache/ssl_session.h"
 #include "src/core/util/crash.h"
 
 #ifndef OPENSSL_IS_BORINGSSL
 
 #include "absl/memory/memory.h"
-
 #include "src/core/lib/slice/slice.h"
 
 // OpenSSL invalidates SSL_SESSION on SSL destruction making it pointless
diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc
index 47184174351..dbc47f85f72 100644
--- a/src/core/tsi/ssl_transport_security.cc
+++ b/src/core/tsi/ssl_transport_security.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/tsi/ssl_transport_security.h"
 
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <string.h>
 
 #include <cstdlib>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/surface/init.h"
 #include "src/core/tsi/transport_security_interface.h"
 
@@ -38,9 +37,12 @@
 #include <sys/socket.h>
 #endif
 
-#include <memory>
-#include <string>
-
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/thd_id.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>  // For OPENSSL_free
 #include <openssl/engine.h>
@@ -50,19 +52,14 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
+#include <memory>
+#include <string>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/thd_id.h>
-
 #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h"
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h"
diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h
index da3b260adbd..39e07011a22 100644
--- a/src/core/tsi/ssl_transport_security.h
+++ b/src/core/tsi/ssl_transport_security.h
@@ -19,16 +19,14 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H
 #define GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H
 
-#include <memory>
-
-#include <openssl/x509.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <openssl/x509.h>
 
+#include <memory>
+
+#include "absl/strings/string_view.h"
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 #include "src/core/tsi/ssl_transport_security_utils.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/src/core/tsi/ssl_transport_security_utils.cc b/src/core/tsi/ssl_transport_security_utils.cc
index d35baf4e618..5c3b828751e 100644
--- a/src/core/tsi/ssl_transport_security_utils.cc
+++ b/src/core/tsi/ssl_transport_security_utils.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/tsi/ssl_transport_security_utils.h"
 
+#include <grpc/support/port_platform.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/ec.h>
@@ -33,9 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/tsi/transport_security_interface.h"
 
 namespace grpc_core {
diff --git a/src/core/tsi/ssl_transport_security_utils.h b/src/core/tsi/ssl_transport_security_utils.h
index 5676d8ff3a9..a718627e6a1 100644
--- a/src/core/tsi/ssl_transport_security_utils.h
+++ b/src/core/tsi/ssl_transport_security_utils.h
@@ -19,16 +19,14 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_UTILS_H
 #define GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_UTILS_H
 
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/port_platform.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 #include "src/core/tsi/transport_security_interface.h"
 
diff --git a/src/core/tsi/ssl_types.h b/src/core/tsi/ssl_types.h
index 221636859d1..9fb89952358 100644
--- a/src/core/tsi/ssl_types.h
+++ b/src/core/tsi/ssl_types.h
@@ -27,9 +27,8 @@
 //                      function
 //
 
-#include <openssl/ssl.h>
-
 #include <grpc/support/port_platform.h>
+#include <openssl/ssl.h>
 
 #ifdef OPENSSL_IS_BORINGSSL
 #define TSI_INT_AS_SIZE(x) ((size_t)(x))
diff --git a/src/core/tsi/transport_security.cc b/src/core/tsi/transport_security.cc
index 72ad63df90e..ccbf3664e93 100644
--- a/src/core/tsi/transport_security.cc
+++ b/src/core/tsi/transport_security.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/tsi/transport_security.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <stdlib.h>
+#include <string.h>
 
 // --- tsi_result common implementation. ---
 
diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h
index 5fce3e15768..9f4524af212 100644
--- a/src/core/tsi/transport_security.h
+++ b/src/core/tsi/transport_security.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_H
 #define GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/src/core/tsi/transport_security_interface.h b/src/core/tsi/transport_security_interface.h
index d0b2e03386a..a0c0ad7865f 100644
--- a/src/core/tsi/transport_security_interface.h
+++ b/src/core/tsi/transport_security_interface.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H
 #define GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 
 // --- tsi result ---
diff --git a/src/core/util/.clang-format b/src/core/util/.clang-format
deleted file mode 100644
index 64387e9e515..00000000000
--- a/src/core/util/.clang-format
+++ /dev/null
@@ -1,53 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # port_platform.h is before almost everything
-  - Regex: '^<grpc/(support|impl/codegen)/port_platform.h>'
-    Priority: -100
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/util/alloc.cc b/src/core/util/alloc.cc
index b89d49ff102..2ce94f9db78 100644
--- a/src/core/util/alloc.cc
+++ b/src/core/util/alloc.cc
@@ -16,15 +16,12 @@
 //
 //
 
+#include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
-
 #include <stdlib.h>
 #include <string.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/crash.h"
 
 void* gpr_malloc(size_t size) {
diff --git a/src/core/util/atm.cc b/src/core/util/atm.cc
index 7e7a6834bb1..536163c110d 100644
--- a/src/core/util/atm.cc
+++ b/src/core/util/atm.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/avl.h b/src/core/util/avl.h
index 23a510e949f..f5bc9b8d888 100644
--- a/src/core/util/avl.h
+++ b/src/core/util/avl.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_AVL_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdlib.h>
 
 #include <algorithm>  // IWYU pragma: keep
diff --git a/src/core/util/backoff.cc b/src/core/util/backoff.cc
index edae00cf3c8..4367a47475d 100644
--- a/src/core/util/backoff.cc
+++ b/src/core/util/backoff.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/backoff.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 namespace grpc_core {
diff --git a/src/core/util/backoff.h b/src/core/util/backoff.h
index 34860793647..78f0948fe8d 100644
--- a/src/core/util/backoff.h
+++ b/src/core/util/backoff.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_BACKOFF_H
 
 #include "absl/random/random.h"
-
 #include "src/core/util/time.h"
 
 namespace grpc_core {
diff --git a/src/core/util/bitset.h b/src/core/util/bitset.h
index eec06814586..91b89d9925e 100644
--- a/src/core/util/bitset.h
+++ b/src/core/util/bitset.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_BITSET_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/core/util/chunked_vector.h b/src/core/util/chunked_vector.h
index b85c7e2e7ae..d3a1d6ba930 100644
--- a/src/core/util/chunked_vector.h
+++ b/src/core/util/chunked_vector.h
@@ -22,7 +22,6 @@
 #include <utility>
 
 #include "absl/log/check.h"
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/util/manual_constructor.h"
 
diff --git a/src/core/util/crash.cc b/src/core/util/crash.cc
index 9ab5a9852ba..c77412e2b96 100644
--- a/src/core/util/crash.cc
+++ b/src/core/util/crash.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/core/util/crash.h b/src/core/util/crash.h
index 9d0b19a5d0a..ece32088903 100644
--- a/src/core/util/crash.h
+++ b/src/core/util/crash.h
@@ -18,7 +18,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/debug_location.h"
 
 namespace grpc_core {
diff --git a/src/core/util/dual_ref_counted.h b/src/core/util/dual_ref_counted.h
index 6f3e3c43af6..4742c62bc2c 100644
--- a/src/core/util/dual_ref_counted.h
+++ b/src/core/util/dual_ref_counted.h
@@ -24,7 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/debug_location.h"
 #include "src/core/util/down_cast.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/util/event_log.cc b/src/core/util/event_log.cc
index 6bb1427f89e..66611150e6f 100644
--- a/src/core/util/event_log.cc
+++ b/src/core/util/event_log.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/event_log.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <atomic>
 
diff --git a/src/core/util/event_log.h b/src/core/util/event_log.h
index f77967d57f2..47254348db5 100644
--- a/src/core/util/event_log.h
+++ b/src/core/util/event_log.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_EVENT_LOG_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <atomic>
@@ -26,7 +25,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
-
 #include "src/core/util/per_cpu.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time_precise.h"
diff --git a/src/core/util/examine_stack.cc b/src/core/util/examine_stack.cc
index 96799b2a30c..a47f12472ca 100644
--- a/src/core/util/examine_stack.cc
+++ b/src/core/util/examine_stack.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/examine_stack.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 gpr_current_stack_trace_func g_current_stack_trace_provider = nullptr;
diff --git a/src/core/util/fork.cc b/src/core/util/fork.cc
index 35b211b42ff..27415423f1b 100644
--- a/src/core/util/fork.cc
+++ b/src/core/util/fork.cc
@@ -16,16 +16,15 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/fork.h"
 
-#include <utility>
-
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include <utility>
+
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/thread_local.h"
 #include "src/core/util/no_destruct.h"
diff --git a/src/core/util/gcp_metadata_query.cc b/src/core/util/gcp_metadata_query.cc
index 3543e46fa0e..cc9fd80cd1b 100644
--- a/src/core/util/gcp_metadata_query.cc
+++ b/src/core/util/gcp_metadata_query.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/gcp_metadata_query.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -31,11 +33,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/util/gcp_metadata_query.h b/src/core/util/gcp_metadata_query.h
index b2abde5cd4a..a72ff5ae4d0 100644
--- a/src/core/util/gcp_metadata_query.h
+++ b/src/core/util/gcp_metadata_query.h
@@ -23,7 +23,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/util/gethostname_host_name_max.cc b/src/core/util/gethostname_host_name_max.cc
index def6984395d..d446d67c35c 100644
--- a/src/core/util/gethostname_host_name_max.cc
+++ b/src/core/util/gethostname_host_name_max.cc
@@ -23,11 +23,10 @@
 
 #ifdef GRPC_POSIX_HOST_NAME_MAX
 
+#include <grpc/support/alloc.h>
 #include <limits.h>
 #include <unistd.h>
 
-#include <grpc/support/alloc.h>
-
 char* grpc_gethostname() {
   char* hostname = static_cast<char*>(gpr_malloc(HOST_NAME_MAX));
   if (gethostname(hostname, HOST_NAME_MAX) != 0) {
diff --git a/src/core/util/gethostname_sysconf.cc b/src/core/util/gethostname_sysconf.cc
index 414a02118a0..78d38cc869b 100644
--- a/src/core/util/gethostname_sysconf.cc
+++ b/src/core/util/gethostname_sysconf.cc
@@ -23,9 +23,8 @@
 
 #ifdef GRPC_POSIX_SYSCONF
 
-#include <unistd.h>
-
 #include <grpc/support/alloc.h>
+#include <unistd.h>
 
 char* grpc_gethostname() {
   size_t host_name_max = (size_t)sysconf(_SC_HOST_NAME_MAX);
diff --git a/src/core/util/gpr_time.cc b/src/core/util/gpr_time.cc
index ae2bd82f5bc..9368e51416b 100644
--- a/src/core/util/gpr_time.cc
+++ b/src/core/util/gpr_time.cc
@@ -18,17 +18,14 @@
 
 // Generic implementation of time calls.
 
+#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/time.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 
 int gpr_time_cmp(gpr_timespec a, gpr_timespec b) {
diff --git a/src/core/util/grpc_if_nametoindex.h b/src/core/util/grpc_if_nametoindex.h
index ad1f3fcc224..237cd034da8 100644
--- a/src/core/util/grpc_if_nametoindex.h
+++ b/src/core/util/grpc_if_nametoindex.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 // Returns the interface index corresponding to the interface "name" provided.
diff --git a/src/core/util/grpc_if_nametoindex_posix.cc b/src/core/util/grpc_if_nametoindex_posix.cc
index 1ec5f15cc99..1d5b866e5e0 100644
--- a/src/core/util/grpc_if_nametoindex_posix.cc
+++ b/src/core/util/grpc_if_nametoindex_posix.cc
@@ -26,7 +26,6 @@
 #include <net/if.h>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_if_nametoindex.h"
 
diff --git a/src/core/util/grpc_if_nametoindex_unsupported.cc b/src/core/util/grpc_if_nametoindex_unsupported.cc
index 767f41b67f6..cabca947c60 100644
--- a/src/core/util/grpc_if_nametoindex_unsupported.cc
+++ b/src/core/util/grpc_if_nametoindex_unsupported.cc
@@ -23,7 +23,6 @@
 #if GRPC_IF_NAMETOINDEX == 0 || !defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX)
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_if_nametoindex.h"
 
diff --git a/src/core/util/host_port.cc b/src/core/util/host_port.cc
index dad028d0b4a..3f2608951e3 100644
--- a/src/core/util/host_port.cc
+++ b/src/core/util/host_port.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/host_port.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
diff --git a/src/core/util/http_client/format_request.cc b/src/core/util/http_client/format_request.cc
index 1d785835e2b..8c56935dad0 100644
--- a/src/core/util/http_client/format_request.cc
+++ b/src/core/util/http_client/format_request.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/http_client/format_request.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -31,9 +31,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/util/http_client/httpcli.h"
 
 static void fill_common_header(const grpc_http_request* request,
diff --git a/src/core/util/http_client/format_request.h b/src/core/util/http_client/format_request.h
index ab9d6a9d7d5..e123234ce5c 100644
--- a/src/core/util/http_client/format_request.h
+++ b/src/core/util/http_client/format_request.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
 #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/util/http_client/parser.h"
 
diff --git a/src/core/util/http_client/httpcli.cc b/src/core/util/http_client/httpcli.cc
index c7b52e2de54..0eb2292d9b1 100644
--- a/src/core/util/http_client/httpcli.cc
+++ b/src/core/util/http_client/httpcli.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/http_client/httpcli.h"
 
+#include <grpc/grpc.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 
 #include <string>
@@ -29,11 +31,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
diff --git a/src/core/util/http_client/httpcli.h b/src/core/util/http_client/httpcli.h
index b041d190e07..8857d0df014 100644
--- a/src/core/util/http_client/httpcli.h
+++ b/src/core/util/http_client/httpcli.h
@@ -19,8 +19,9 @@
 #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H
 #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <functional>
@@ -32,10 +33,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/util/http_client/httpcli_security_connector.cc b/src/core/util/http_client/httpcli_security_connector.cc
index 45156af53d1..ac1e522bb99 100644
--- a/src/core/util/http_client/httpcli_security_connector.cc
+++ b/src/core/util/http_client/httpcli_security_connector.cc
@@ -16,8 +16,13 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <string>
@@ -27,14 +32,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/util/http_client/httpcli_ssl_credentials.h b/src/core/util/http_client/httpcli_ssl_credentials.h
index e06668f65b5..6593d66a3d6 100644
--- a/src/core/util/http_client/httpcli_ssl_credentials.h
+++ b/src/core/util/http_client/httpcli_ssl_credentials.h
@@ -17,9 +17,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
 #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/core/util/http_client/parser.cc b/src/core/util/http_client/parser.cc
index b0c7416c6c9..a490f212ee9 100644
--- a/src/core/util/http_client/parser.cc
+++ b/src/core/util/http_client/parser.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/http_client/parser.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -28,8 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 
-#include <grpc/support/alloc.h>
-
 static char* buf2str(void* buffer, size_t length) {
   char* out = static_cast<char*>(gpr_malloc(length + 1));
   memcpy(out, buffer, length);
diff --git a/src/core/util/http_client/parser.h b/src/core/util/http_client/parser.h
index 01727e0e4df..d1bdf767a89 100644
--- a/src/core/util/http_client/parser.h
+++ b/src/core/util/http_client/parser.h
@@ -19,13 +19,11 @@
 #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
 #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
 
+#include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
-#include <grpc/slice.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 
diff --git a/src/core/util/iphone/cpu.cc b/src/core/util/iphone/cpu.cc
index 26c3726fc13..820246594c7 100644
--- a/src/core/util/iphone/cpu.cc
+++ b/src/core/util/iphone/cpu.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
 
 #ifdef GPR_CPU_IPHONE
 
diff --git a/src/core/util/json/json.h b/src/core/util/json/json.h
index 9dbc95e3b94..a160fd3237f 100644
--- a/src/core/util/json/json.h
+++ b/src/core/util/json/json.h
@@ -17,9 +17,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_H
 #define GRPC_SRC_CORE_UTIL_JSON_JSON_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_core {
 
diff --git a/src/core/util/json/json_channel_args.h b/src/core/util/json/json_channel_args.h
index fe64a377faa..ad5b1c1f897 100644
--- a/src/core/util/json/json_channel_args.h
+++ b/src/core/util/json/json_channel_args.h
@@ -19,7 +19,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/json/json_args.h"
 
diff --git a/src/core/util/json/json_object_loader.cc b/src/core/util/json/json_object_loader.cc
index 0d6dd4588a5..0eb496f5a87 100644
--- a/src/core/util/json/json_object_loader.cc
+++ b/src/core/util/json/json_object_loader.cc
@@ -12,18 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json_object_loader.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
 
-#include <grpc/support/json.h>
-
 namespace grpc_core {
 namespace json_detail {
 
diff --git a/src/core/util/json/json_object_loader.h b/src/core/util/json/json_object_loader.h
index 1c1e8c565e1..96bd8655b91 100644
--- a/src/core/util/json/json_object_loader.h
+++ b/src/core/util/json/json_object_loader.h
@@ -31,7 +31,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/no_destruct.h"
diff --git a/src/core/util/json/json_reader.cc b/src/core/util/json/json_reader.cc
index bda35becad4..a93bb15a97e 100644
--- a/src/core/util/json/json_reader.cc
+++ b/src/core/util/json/json_reader.cc
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
-
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -34,9 +34,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/json.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/match.h"
 
diff --git a/src/core/util/json/json_reader.h b/src/core/util/json/json_reader.h
index 2b16d911981..127b3808807 100644
--- a/src/core/util/json/json_reader.h
+++ b/src/core/util/json/json_reader.h
@@ -21,7 +21,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/json/json.h"
 
 namespace grpc_core {
diff --git a/src/core/util/json/json_util.cc b/src/core/util/json/json_util.cc
index 88fdbb6755c..181882d7316 100644
--- a/src/core/util/json/json_util.cc
+++ b/src/core/util/json/json_util.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json_util.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/no_destruct.h"
diff --git a/src/core/util/json/json_util.h b/src/core/util/json/json_util.h
index a8abf9efb88..7cb5b8b1103 100644
--- a/src/core/util/json/json_util.h
+++ b/src/core/util/json/json_util.h
@@ -31,7 +31,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/time.h"
diff --git a/src/core/util/json/json_writer.cc b/src/core/util/json/json_writer.cc
index 009b31a4afc..37721f95228 100644
--- a/src/core/util/json/json_writer.cc
+++ b/src/core/util/json/json_writer.cc
@@ -17,7 +17,6 @@
 //
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -27,7 +26,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/json/json.h"
 
 namespace grpc_core {
diff --git a/src/core/util/latent_see.cc b/src/core/util/latent_see.cc
index c8331144407..277ed57b3c5 100644
--- a/src/core/util/latent_see.cc
+++ b/src/core/util/latent_see.cc
@@ -24,7 +24,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/util/ring_buffer.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h
index 1ace01110a6..f801c3c8685 100644
--- a/src/core/util/latent_see.h
+++ b/src/core/util/latent_see.h
@@ -34,7 +34,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/per_cpu.h"
 #include "src/core/util/ring_buffer.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/util/linux/cpu.cc b/src/core/util/linux/cpu.cc
index 61f1d5d58ff..41730292e89 100644
--- a/src/core/util/linux/cpu.cc
+++ b/src/core/util/linux/cpu.cc
@@ -25,15 +25,13 @@
 #ifdef GPR_CPU_LINUX
 
 #include <errno.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/sync.h>
 #include <sched.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/cpu.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/strerror.h"
 
diff --git a/src/core/util/load_file.cc b/src/core/util/load_file.cc
index 91ec375ba65..2fda3c55e62 100644
--- a/src/core/util/load_file.cc
+++ b/src/core/util/load_file.cc
@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/load_file.h"
 
 #include <errno.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -24,9 +25,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-
 namespace grpc_core {
 
 // Loads the content of a file into a slice. add_null_terminator will add a NULL
diff --git a/src/core/util/load_file.h b/src/core/util/load_file.h
index 5d3f7aa784f..980e0c11af6 100644
--- a/src/core/util/load_file.h
+++ b/src/core/util/load_file.h
@@ -20,7 +20,6 @@
 #include <string>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/slice/slice.h"
 
 namespace grpc_core {
diff --git a/src/core/util/log.cc b/src/core/util/log.cc
index cc353fcbd64..fb0119947c3 100644
--- a/src/core/util/log.cc
+++ b/src/core/util/log.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/log/log.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -27,11 +29,6 @@
 #include "absl/log/globals.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/log.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
diff --git a/src/core/util/manual_constructor.h b/src/core/util/manual_constructor.h
index 38d4695753f..10bf8155827 100644
--- a/src/core/util/manual_constructor.h
+++ b/src/core/util/manual_constructor.h
@@ -22,7 +22,6 @@
 // manually construct a region of memory with some type
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <utility>
diff --git a/src/core/util/match.h b/src/core/util/match.h
index 69b91f2fc9b..32d1445f9b3 100644
--- a/src/core/util/match.h
+++ b/src/core/util/match.h
@@ -20,7 +20,6 @@
 #include <utility>
 
 #include "absl/types/variant.h"
-
 #include "src/core/util/overload.h"
 
 namespace grpc_core {
diff --git a/src/core/util/matchers.cc b/src/core/util/matchers.cc
index a0a8b786bec..d4f6c3bd7e1 100644
--- a/src/core/util/matchers.cc
+++ b/src/core/util/matchers.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/matchers.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
diff --git a/src/core/util/matchers.h b/src/core/util/matchers.h
index 69992106b45..922e0632bc7 100644
--- a/src/core/util/matchers.h
+++ b/src/core/util/matchers.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_MATCHERS_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <memory>
diff --git a/src/core/util/memory.h b/src/core/util/memory.h
index eae0aaa4b83..9ced5cf2f64 100644
--- a/src/core/util/memory.h
+++ b/src/core/util/memory.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_UTIL_MEMORY_H
 #define GRPC_SRC_CORE_UTIL_MEMORY_H
 
+#include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
 #include <memory>
 #include <type_traits>
 
-#include <grpc/support/alloc.h>
-
 namespace grpc_core {
 
 class DefaultDeleteChar {
diff --git a/src/core/util/mpscq.cc b/src/core/util/mpscq.cc
index 45258346443..fd998e8c905 100644
--- a/src/core/util/mpscq.cc
+++ b/src/core/util/mpscq.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/mpscq.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 //
diff --git a/src/core/util/mpscq.h b/src/core/util/mpscq.h
index b4d48f78c3d..44502a0b352 100644
--- a/src/core/util/mpscq.h
+++ b/src/core/util/mpscq.h
@@ -24,7 +24,6 @@
 #include <atomic>
 
 #include "absl/log/check.h"
-
 #include "src/core/util/sync.h"
 
 namespace grpc_core {
diff --git a/src/core/util/msys/tmpfile.cc b/src/core/util/msys/tmpfile.cc
index 69eb209b149..5d7cf6484c6 100644
--- a/src/core/util/msys/tmpfile.cc
+++ b/src/core/util/msys/tmpfile.cc
@@ -20,14 +20,13 @@
 
 #ifdef GPR_MSYS_TMPFILE
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <io.h>
 #include <stdio.h>
 #include <string.h>
 #include <tchar.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/string_windows.h"
 #include "src/core/util/tmpfile.h"
diff --git a/src/core/util/notification.h b/src/core/util/notification.h
index 45acff0fda7..4fca3d26cb5 100644
--- a/src/core/util/notification.h
+++ b/src/core/util/notification.h
@@ -19,7 +19,6 @@
 
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
 #include "src/core/util/sync.h"
 
 namespace grpc_core {
diff --git a/src/core/util/per_cpu.cc b/src/core/util/per_cpu.cc
index 8412f399173..13098726bc7 100644
--- a/src/core/util/per_cpu.cc
+++ b/src/core/util/per_cpu.cc
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/per_cpu.h"
 
 #include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/per_cpu.h b/src/core/util/per_cpu.h
index 492ea2832b4..69648aa57fe 100644
--- a/src/core/util/per_cpu.h
+++ b/src/core/util/per_cpu.h
@@ -15,8 +15,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_PER_CPU_H
 #define GRPC_SRC_CORE_UTIL_PER_CPU_H
 
+#include <grpc/support/cpu.h>
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <algorithm>
@@ -24,8 +24,6 @@
 #include <limits>
 #include <memory>
 
-#include <grpc/support/cpu.h>
-
 // Sharded collections of objects
 // This used to be per-cpu, now it's much less so - but still a way to limit
 // contention.
diff --git a/src/core/util/posix/cpu.cc b/src/core/util/posix/cpu.cc
index 93e6cce0614..92a9e45635e 100644
--- a/src/core/util/posix/cpu.cc
+++ b/src/core/util/posix/cpu.cc
@@ -21,15 +21,13 @@
 #if defined(GPR_CPU_POSIX)
 
 #include <errno.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/sync.h>
 #include <pthread.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/cpu.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/posix/stat.cc b/src/core/util/posix/stat.cc
index e4c870f8dbd..5de6f456321 100644
--- a/src/core/util/posix/stat.cc
+++ b/src/core/util/posix/stat.cc
@@ -29,7 +29,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/stat.h"
 #include "src/core/util/strerror.h"
 
diff --git a/src/core/util/posix/string.cc b/src/core/util/posix/string.cc
index 51a16d33cba..f7fad2b9f93 100644
--- a/src/core/util/posix/string.cc
+++ b/src/core/util/posix/string.cc
@@ -20,13 +20,12 @@
 
 #ifdef GPR_POSIX_STRING
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 int gpr_asprintf(char** strp, const char* format, ...) {
   va_list args;
   int ret;
diff --git a/src/core/util/posix/sync.cc b/src/core/util/posix/sync.cc
index 255eec517a3..5529ee05c23 100644
--- a/src/core/util/posix/sync.cc
+++ b/src/core/util/posix/sync.cc
@@ -22,14 +22,12 @@
     !defined(GPR_CUSTOM_SYNC)
 
 #include <errno.h>
-#include <time.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <time.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 
 void gpr_mu_init(gpr_mu* mu) {
diff --git a/src/core/util/posix/thd.cc b/src/core/util/posix/thd.cc
index 6987e3ff2cd..764882dd676 100644
--- a/src/core/util/posix/thd.cc
+++ b/src/core/util/posix/thd.cc
@@ -19,7 +19,6 @@
 // Posix implementation for gpr threads.
 
 #include <grpc/support/port_platform.h>
-
 #include <inttypes.h>
 
 #include <csignal>
@@ -27,6 +26,9 @@
 
 #ifdef GPR_POSIX_SYNC
 
+#include <grpc/support/sync.h>
+#include <grpc/support/thd_id.h>
+#include <grpc/support/time.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,11 +36,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/sync.h>
-#include <grpc/support/thd_id.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/fork.h"
 #include "src/core/util/strerror.h"
diff --git a/src/core/util/posix/time.cc b/src/core/util/posix/time.cc
index a425a4721c6..ff444682101 100644
--- a/src/core/util/posix/time.cc
+++ b/src/core/util/posix/time.cc
@@ -28,11 +28,10 @@
 #ifdef __linux__
 #include <sys/syscall.h>
 #endif
-#include "absl/log/check.h"
-
 #include <grpc/support/atm.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 
 static struct timespec timespec_from_gpr(gpr_timespec gts) {
diff --git a/src/core/util/posix/tmpfile.cc b/src/core/util/posix/tmpfile.cc
index 51b900a3527..832391f1599 100644
--- a/src/core/util/posix/tmpfile.cc
+++ b/src/core/util/posix/tmpfile.cc
@@ -21,16 +21,14 @@
 #ifdef GPR_POSIX_TMPFILE
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/strerror.h"
 #include "src/core/util/string.h"
diff --git a/src/core/util/random_early_detection.cc b/src/core/util/random_early_detection.cc
index 882a7d530e9..d011ca25dc8 100644
--- a/src/core/util/random_early_detection.cc
+++ b/src/core/util/random_early_detection.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/random_early_detection.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/random/distributions.h"
 
 namespace grpc_core {
diff --git a/src/core/util/random_early_detection.h b/src/core/util/random_early_detection.h
index fb2ea8f51a4..6ff1c67fd12 100644
--- a/src/core/util/random_early_detection.h
+++ b/src/core/util/random_early_detection.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H
 
 #include <grpc/support/port_platform.h>
-
 #include <limits.h>
 
 #include <cstdint>
diff --git a/src/core/util/ref_counted.h b/src/core/util/ref_counted.h
index e32472d1c80..413e5d4f42a 100644
--- a/src/core/util/ref_counted.h
+++ b/src/core/util/ref_counted.h
@@ -27,7 +27,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/atomic_utils.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/down_cast.h"
diff --git a/src/core/util/ref_counted_ptr.h b/src/core/util/ref_counted_ptr.h
index 28829bc0d20..601cc45e2dc 100644
--- a/src/core/util/ref_counted_ptr.h
+++ b/src/core/util/ref_counted_ptr.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <iosfwd>
@@ -28,7 +27,6 @@
 #include <utility>
 
 #include "absl/hash/hash.h"
-
 #include "src/core/util/debug_location.h"
 #include "src/core/util/down_cast.h"
 
diff --git a/src/core/util/ref_counted_string.cc b/src/core/util/ref_counted_string.cc
index 2b3f6f66b36..6c2945adb9c 100644
--- a/src/core/util/ref_counted_string.cc
+++ b/src/core/util/ref_counted_string.cc
@@ -14,16 +14,14 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/ref_counted_string.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <new>
 
-#include <grpc/support/alloc.h>
-
 namespace grpc_core {
 
 RefCountedPtr<RefCountedString> RefCountedString::Make(absl::string_view src) {
diff --git a/src/core/util/ref_counted_string.h b/src/core/util/ref_counted_string.h
index ed3e93089ae..936d9c5742f 100644
--- a/src/core/util/ref_counted_string.h
+++ b/src/core/util/ref_counted_string.h
@@ -18,13 +18,11 @@
 #define GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <string>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/core/util/spinlock.h b/src/core/util/spinlock.h
index b95d324e988..fdbce0cad6d 100644
--- a/src/core/util/spinlock.h
+++ b/src/core/util/spinlock.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_SPINLOCK_H
 #define GRPC_SRC_CORE_UTIL_SPINLOCK_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 
 // Simple spinlock. No backoff strategy, gpr_spinlock_lock is almost always
 // a concurrency code smell. Code must _never_ block while holding a spinlock
diff --git a/src/core/util/stat.h b/src/core/util/stat.h
index e947c0a5de9..d3b5d4a6638 100644
--- a/src/core/util/stat.h
+++ b/src/core/util/stat.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_UTIL_STAT_H
 
 #include <grpc/support/port_platform.h>
-
 #include <time.h>
 
 #include "absl/status/status.h"
diff --git a/src/core/util/status_helper.cc b/src/core/util/status_helper.cc
index 339500e2b0c..3d69b20fde5 100644
--- a/src/core/util/status_helper.cc
+++ b/src/core/util/status_helper.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/status_helper.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <utility>
@@ -34,11 +33,10 @@
 #include "absl/time/clock.h"
 #include "google/protobuf/any.upb.h"
 #include "google/rpc/status.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/util/status_helper.h b/src/core/util/status_helper.h
index e2e089ce25e..d7fb53da7a5 100644
--- a/src/core/util/status_helper.h
+++ b/src/core/util/status_helper.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_STATUS_HELPER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <string>
@@ -30,7 +29,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
 #include "src/core/util/debug_location.h"
 
 extern "C" {
diff --git a/src/core/util/strerror.cc b/src/core/util/strerror.cc
index 868acee2c06..06ad2ea092a 100644
--- a/src/core/util/strerror.cc
+++ b/src/core/util/strerror.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/strerror.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/strings/str_format.h"
diff --git a/src/core/util/string.cc b/src/core/util/string.cc
index 3048a432a63..036a23afbb2 100644
--- a/src/core/util/string.cc
+++ b/src/core/util/string.cc
@@ -16,11 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/string.h"
 
 #include <ctype.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -30,10 +31,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/string.h b/src/core/util/string.h
index 66f3d0f8344..018980a2a89 100644
--- a/src/core/util/string.h
+++ b/src/core/util/string.h
@@ -20,14 +20,12 @@
 #define GRPC_SRC_CORE_UTIL_STRING_H
 
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
-#include <grpc/support/time.h>
-
 // String utility functions
 
 // Flags for gpr_dump function.
diff --git a/src/core/util/subprocess_posix.cc b/src/core/util/subprocess_posix.cc
index b421d50549c..ef4512b3734 100644
--- a/src/core/util/subprocess_posix.cc
+++ b/src/core/util/subprocess_posix.cc
@@ -21,6 +21,7 @@
 #ifdef GPR_POSIX_SUBPROCESS
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
 #include <signal.h>
 #include <string.h>
 #include <sys/wait.h>
@@ -31,9 +32,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/substitute.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/memory.h"
 #include "src/core/util/strerror.h"
 #include "src/core/util/subprocess.h"
diff --git a/src/core/util/subprocess_windows.cc b/src/core/util/subprocess_windows.cc
index c8760ec3ee7..71fd6497e78 100644
--- a/src/core/util/subprocess_windows.cc
+++ b/src/core/util/subprocess_windows.cc
@@ -20,6 +20,7 @@
 
 #ifdef GPR_WINDOWS_SUBPROCESS
 
+#include <grpc/support/alloc.h>
 #include <string.h>
 #include <tchar.h>
 #include <windows.h>
@@ -27,9 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "src/core/util/subprocess.h"
diff --git a/src/core/util/sync.cc b/src/core/util/sync.cc
index dd3db7e6423..7a5f24409ee 100644
--- a/src/core/util/sync.cc
+++ b/src/core/util/sync.cc
@@ -18,15 +18,13 @@
 
 // Generic implementation of synchronization primitives.
 
-#include <grpc/support/port_platform.h>
-
 #include <assert.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
+#include "absl/log/check.h"
+
 // Number of mutexes to allocate for events, to avoid lock contention.
 // Should be a prime.
 enum { event_sync_partitions = 31 };
diff --git a/src/core/util/sync.h b/src/core/util/sync.h
index c85d9e2ad77..77d1a54206f 100644
--- a/src/core/util/sync.h
+++ b/src/core/util/sync.h
@@ -20,13 +20,12 @@
 #define GRPC_SRC_CORE_UTIL_SYNC_H
 
 #include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpc/support/sync.h>
-
 #ifndef GPR_ABSEIL_SYNC
 #include "src/core/util/time_util.h"
 #endif
diff --git a/src/core/util/sync_abseil.cc b/src/core/util/sync_abseil.cc
index 9e837022532..688e4665612 100644
--- a/src/core/util/sync_abseil.cc
+++ b/src/core/util/sync_abseil.cc
@@ -21,17 +21,15 @@
 #if defined(GPR_ABSEIL_SYNC) && !defined(GPR_CUSTOM_SYNC)
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <time.h>
 
 #include "absl/base/call_once.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/time_util.h"
 
diff --git a/src/core/util/table.h b/src/core/util/table.h
index bd35c4963a8..d2ea9d42a97 100644
--- a/src/core/util/table.h
+++ b/src/core/util/table.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_TABLE_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <initializer_list>
@@ -26,7 +25,6 @@
 
 #include "absl/meta/type_traits.h"
 #include "absl/utility/utility.h"
-
 #include "src/core/util/bitset.h"
 
 namespace grpc_core {
diff --git a/src/core/util/tchar.cc b/src/core/util/tchar.cc
index f558b4cbc1d..ee9634be76a 100644
--- a/src/core/util/tchar.cc
+++ b/src/core/util/tchar.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/tchar.h"
 
+#include <grpc/support/port_platform.h>
+
 #ifdef GPR_WINDOWS
 
 namespace grpc_core {
diff --git a/src/core/util/thd.h b/src/core/util/thd.h
index ec0ae599f7f..61f229af97e 100644
--- a/src/core/util/thd.h
+++ b/src/core/util/thd.h
@@ -22,7 +22,7 @@
 /// Internal thread interface.
 
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/thd_id.h>
 #include <stddef.h>
 
 #include <memory>
@@ -31,8 +31,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 
-#include <grpc/support/thd_id.h>
-
 namespace grpc_core {
 namespace internal {
 
diff --git a/src/core/util/time.cc b/src/core/util/time.cc
index c5f899bc473..a15242f3b03 100644
--- a/src/core/util/time.cc
+++ b/src/core/util/time.cc
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <atomic>
 #include <chrono>
 #include <limits>
@@ -25,9 +26,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/no_destruct.h"
 
 // IWYU pragma: no_include <ratio>
diff --git a/src/core/util/time.h b/src/core/util/time.h
index cf242eba1cb..c51b3cf63ed 100644
--- a/src/core/util/time.h
+++ b/src/core/util/time.h
@@ -15,8 +15,9 @@
 #ifndef GRPC_SRC_CORE_UTIL_TIME_H
 #define GRPC_SRC_CORE_UTIL_TIME_H
 
+#include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <limits>
@@ -24,10 +25,6 @@
 #include <string>
 
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/time_precise.h"
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/time_averaged_stats.cc b/src/core/util/time_averaged_stats.cc
index dc6db49a011..caf52f72751 100644
--- a/src/core/util/time_averaged_stats.cc
+++ b/src/core/util/time_averaged_stats.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time_averaged_stats.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 TimeAveragedStats::TimeAveragedStats(double init_avg, double regress_weight,
diff --git a/src/core/util/time_precise.cc b/src/core/util/time_precise.cc
index 5274789c70e..0fe62929ef2 100644
--- a/src/core/util/time_precise.cc
+++ b/src/core/util/time_precise.cc
@@ -23,12 +23,11 @@
 #include <unistd.h>
 #endif
 
+#include <grpc/support/time.h>
+
 #include <algorithm>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/time_precise.h"
 
diff --git a/src/core/util/time_precise.h b/src/core/util/time_precise.h
index 9decb6d4cfd..285b710ab0a 100644
--- a/src/core/util/time_precise.h
+++ b/src/core/util/time_precise.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_TIME_PRECISE_H
 
 #include <grpc/support/port_platform.h>
-
 #include <grpc/support/time.h>
 
 // Depending on the platform gpr_get_cycle_counter() can have a resolution as
diff --git a/src/core/util/time_util.cc b/src/core/util/time_util.cc
index 4730e79184a..d20dca30e52 100644
--- a/src/core/util/time_util.cc
+++ b/src/core/util/time_util.cc
@@ -14,17 +14,15 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time_util.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <time.h>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/time.h>
-
 namespace grpc_core {
 
 gpr_timespec ToGprTimeSpec(absl::Duration duration) {
diff --git a/src/core/util/time_util.h b/src/core/util/time_util.h
index 61ad6d11a5b..29e599e5c96 100644
--- a/src/core/util/time_util.h
+++ b/src/core/util/time_util.h
@@ -18,11 +18,10 @@
 #define GRPC_SRC_CORE_UTIL_TIME_UTIL_H
 
 #include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 
 #include "absl/time/time.h"
 
-#include <grpc/support/time.h>
-
 namespace grpc_core {
 
 // Converts absl::Duration to gpr_timespec(GPR_TIMESPAN)
diff --git a/src/core/util/tmpfile.h b/src/core/util/tmpfile.h
index d1ed3d0558c..ecda0c0611a 100644
--- a/src/core/util/tmpfile.h
+++ b/src/core/util/tmpfile.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_TMPFILE_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdio.h>
 
 // Creates a temporary file from a prefix.
diff --git a/src/core/util/unique_type_name.h b/src/core/util/unique_type_name.h
index 29e63d8404f..fa723dc8d0c 100644
--- a/src/core/util/unique_type_name.h
+++ b/src/core/util/unique_type_name.h
@@ -22,7 +22,6 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/useful.h"
 
 // Provides a type name that is unique by instance rather than by
diff --git a/src/core/util/uri.cc b/src/core/util/uri.cc
index 82fb29d46e1..e6a94e57173 100644
--- a/src/core/util/uri.cc
+++ b/src/core/util/uri.cc
@@ -14,11 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/uri.h"
 
 #include <ctype.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
diff --git a/src/core/util/uuid_v4.cc b/src/core/util/uuid_v4.cc
index b0847a8d33e..7cbf7cb7020 100644
--- a/src/core/util/uuid_v4.cc
+++ b/src/core/util/uuid_v4.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/uuid_v4.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/strings/str_format.h"
 
 namespace grpc_core {
diff --git a/src/core/util/uuid_v4.h b/src/core/util/uuid_v4.h
index e7bf52c6409..84e8e576780 100644
--- a/src/core/util/uuid_v4.h
+++ b/src/core/util/uuid_v4.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_UUID_V4_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <string>
diff --git a/src/core/util/validation_errors.cc b/src/core/util/validation_errors.cc
index 047ea420161..5ab09f6d76d 100644
--- a/src/core/util/validation_errors.cc
+++ b/src/core/util/validation_errors.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/validation_errors.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <utility>
diff --git a/src/core/util/validation_errors.h b/src/core/util/validation_errors.h
index 5c075c12cce..4038d927c9a 100644
--- a/src/core/util/validation_errors.h
+++ b/src/core/util/validation_errors.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <map>
diff --git a/src/core/util/windows/directory_reader.cc b/src/core/util/windows/directory_reader.cc
index 02c7916798c..9ae07c6357b 100644
--- a/src/core/util/windows/directory_reader.cc
+++ b/src/core/util/windows/directory_reader.cc
@@ -29,7 +29,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/directory_reader.h"
 
 namespace grpc_core {
diff --git a/src/core/util/windows/stat.cc b/src/core/util/windows/stat.cc
index 8a08d087a5e..5ac15a407cf 100644
--- a/src/core/util/windows/stat.cc
+++ b/src/core/util/windows/stat.cc
@@ -24,7 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/stat.h"
 #include "src/core/util/strerror.h"
diff --git a/src/core/util/windows/string.cc b/src/core/util/windows/string.cc
index c95c4b3fb16..abe4d0a9867 100644
--- a/src/core/util/windows/string.cc
+++ b/src/core/util/windows/string.cc
@@ -22,13 +22,12 @@
 
 #ifdef GPR_WINDOWS_STRING
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/string.h"
 
 int gpr_asprintf(char** strp, const char* format, ...) {
diff --git a/src/core/util/windows/string_util.cc b/src/core/util/windows/string_util.cc
index 105ce0636c9..3cc97fbc2c0 100644
--- a/src/core/util/windows/string_util.cc
+++ b/src/core/util/windows/string_util.cc
@@ -24,17 +24,15 @@
 
 // Some platforms (namely msys) need wchar to be included BEFORE
 // anything else, especially strsafe.h.
-#include <wchar.h>
-
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <strsafe.h>
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-#include <grpc/support/string_util.h>
+#include <wchar.h>
 
 #include "src/core/util/string.h"
 #include "src/core/util/tchar.h"
diff --git a/src/core/util/windows/sync.cc b/src/core/util/windows/sync.cc
index 84c06503e2f..593037c5019 100644
--- a/src/core/util/windows/sync.cc
+++ b/src/core/util/windows/sync.cc
@@ -23,11 +23,10 @@
 #if defined(GPR_WINDOWS) && !defined(GPR_ABSEIL_SYNC) && \
     !defined(GPR_CUSTOM_SYNC)
 
-#include "absl/log/check.h"
-
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 
 void gpr_mu_init(gpr_mu* mu) {
diff --git a/src/core/util/windows/thd.cc b/src/core/util/windows/thd.cc
index 0423e21baa2..464d8a6d06c 100644
--- a/src/core/util/windows/thd.cc
+++ b/src/core/util/windows/thd.cc
@@ -21,16 +21,14 @@
 
 #ifdef GPR_WINDOWS
 
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/thd_id.h>
 #include <grpc/support/time.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/memory.h"
 #include "src/core/util/thd.h"
diff --git a/src/core/util/windows/time.cc b/src/core/util/windows/time.cc
index 62151a2b6a5..696083856a3 100644
--- a/src/core/util/windows/time.cc
+++ b/src/core/util/windows/time.cc
@@ -22,14 +22,12 @@
 
 #ifdef GPR_WINDOWS_TIME
 
+#include <grpc/support/time.h>
 #include <limits.h>
 #include <process.h>
 #include <sys/timeb.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/time_precise.h"
 
diff --git a/src/core/util/windows/tmpfile.cc b/src/core/util/windows/tmpfile.cc
index 44119406582..9acbf77e57c 100644
--- a/src/core/util/windows/tmpfile.cc
+++ b/src/core/util/windows/tmpfile.cc
@@ -20,14 +20,13 @@
 
 #ifdef GPR_WINDOWS_TMPFILE
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <io.h>
 #include <stdio.h>
 #include <string.h>
 #include <tchar.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/tchar.h"
 #include "src/core/util/tmpfile.h"
diff --git a/src/core/util/work_serializer.cc b/src/core/util/work_serializer.cc
index 35c509f5828..c9e0b1d9f45 100644
--- a/src/core/util/work_serializer.cc
+++ b/src/core/util/work_serializer.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/work_serializer.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -31,9 +31,6 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/util/work_serializer.h b/src/core/util/work_serializer.h
index 780fa4fb05e..d7bc41554d3 100644
--- a/src/core/util/work_serializer.h
+++ b/src/core/util/work_serializer.h
@@ -17,15 +17,13 @@
 #ifndef GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H
 #define GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H
 
+#include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
 #include <functional>
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/util/debug_location.h"
 #include "src/core/util/orphanable.h"
 
diff --git a/src/core/xds/grpc/certificate_provider_store.cc b/src/core/xds/grpc/certificate_provider_store.cc
index aef0c6c0783..1e7b9199d61 100644
--- a/src/core/xds/grpc/certificate_provider_store.cc
+++ b/src/core/xds/grpc/certificate_provider_store.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/xds/grpc/certificate_provider_store.h"
 
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 
diff --git a/src/core/xds/grpc/certificate_provider_store.h b/src/core/xds/grpc/certificate_provider_store.h
index 239d5ca74af..f5b01ca8a44 100644
--- a/src/core/xds/grpc/certificate_provider_store.h
+++ b/src/core/xds/grpc/certificate_provider_store.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H
 #define GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc b/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
index bbb76cfc22b..dd52e46d8e6 100644
--- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
+++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/xds/grpc/file_watcher_certificate_provider_factory.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <algorithm>
 #include <map>
 #include <memory>
@@ -26,10 +29,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h
index 493e993648c..ab50c1844f4 100644
--- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h
+++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
 #define GRPC_SRC_CORE_XDS_GRPC_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
 
-#include <string>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
diff --git a/src/core/xds/grpc/xds_audit_logger_registry.cc b/src/core/xds/grpc/xds_audit_logger_registry.cc
index ef041a4c933..a57e4295d89 100644
--- a/src/core/xds/grpc/xds_audit_logger_registry.cc
+++ b/src/core/xds/grpc/xds_audit_logger_registry.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_audit_logger_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <utility>
 
@@ -25,9 +27,6 @@
 #include "absl/types/optional.h"
 #include "envoy/config/core/v3/extension.upb.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/match.h"
 #include "src/core/util/validation_errors.h"
diff --git a/src/core/xds/grpc/xds_audit_logger_registry.h b/src/core/xds/grpc/xds_audit_logger_registry.h
index 92f7aadd302..cb35fd53d86 100644
--- a/src/core/xds/grpc/xds_audit_logger_registry.h
+++ b/src/core/xds/grpc/xds_audit_logger_registry.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_AUDIT_LOGGER_REGISTRY_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_AUDIT_LOGGER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.cc b/src/core/xds/grpc/xds_bootstrap_grpc.cc
index 34fbd8f1331..227aafc77f7 100644
--- a/src/core/xds/grpc/xds_bootstrap_grpc.cc
+++ b/src/core/xds/grpc/xds_bootstrap_grpc.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <string>
@@ -30,10 +32,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.h b/src/core/xds/grpc/xds_bootstrap_grpc.h
index ba13d2bddf3..94a006a17b2 100644
--- a/src/core/xds/grpc/xds_bootstrap_grpc.h
+++ b/src/core/xds/grpc/xds_bootstrap_grpc.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_BOOTSTRAP_GRPC_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_BOOTSTRAP_GRPC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -25,9 +27,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
diff --git a/src/core/xds/grpc/xds_certificate_provider.cc b/src/core/xds/grpc/xds_certificate_provider.cc
index fecc658d364..bf73d434ec9 100644
--- a/src/core/xds/grpc/xds_certificate_provider.cc
+++ b/src/core/xds/grpc/xds_certificate_provider.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/xds/grpc/xds_certificate_provider.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/functional/bind_front.h"
 #include "absl/log/check.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/src/core/xds/grpc/xds_certificate_provider.h b/src/core/xds/grpc/xds_certificate_provider.h
index 52b535af2db..1b916a879a4 100644
--- a/src/core/xds/grpc/xds_certificate_provider.h
+++ b/src/core/xds/grpc/xds_certificate_provider.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CERTIFICATE_PROVIDER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CERTIFICATE_PROVIDER_H
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -26,11 +30,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 #include "src/core/util/matchers.h"
diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc
index bc47f168b71..db3bcacb5ba 100644
--- a/src/core/xds/grpc/xds_client_grpc.cc
+++ b/src/core/xds/grpc/xds_client_grpc.cc
@@ -16,6 +16,13 @@
 
 #include "src/core/xds/grpc/xds_client_grpc.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+
 #include <algorithm>
 #include <cstddef>
 #include <memory>
@@ -30,15 +37,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "envoy/service/status/v3/csds.upb.h"
-#include "upb/base/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
@@ -64,6 +62,7 @@
 #include "src/core/xds/xds_client/xds_channel_args.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_transport.h"
+#include "upb/base/string_view.h"
 
 // If gRPC is built with -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="...", that string
 // will be appended to the user agent name reported to the xDS server.
diff --git a/src/core/xds/grpc/xds_client_grpc.h b/src/core/xds/grpc/xds_client_grpc.h
index bf6828f20f6..f52fdfc1dba 100644
--- a/src/core/xds/grpc/xds_client_grpc.h
+++ b/src/core/xds/grpc/xds_client_grpc.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc
index 09a7454d80f..b7633fa8fc7 100644
--- a/src/core/xds/grpc/xds_cluster.cc
+++ b/src/core/xds/grpc/xds_cluster.cc
@@ -18,7 +18,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/match.h"
 #include "src/core/util/time.h"
diff --git a/src/core/xds/grpc/xds_cluster.h b/src/core/xds/grpc/xds_cluster.h
index 7eea5d0b0fd..a2c6982acb1 100644
--- a/src/core/xds/grpc/xds_cluster.h
+++ b/src/core/xds/grpc/xds_cluster.h
@@ -23,7 +23,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
 #include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/xds_common_types.h"
diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc
index 1a6bbc2e2b6..5d1ff0540e6 100644
--- a/src/core/xds/grpc/xds_cluster_parser.cc
+++ b/src/core/xds/grpc/xds_cluster_parser.cc
@@ -44,9 +44,6 @@
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/text/encode.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
@@ -61,6 +58,8 @@
 #include "src/core/xds/grpc/xds_metadata_parser.h"
 #include "src/core/xds/xds_client/lrs_client.h"
 #include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
+#include "upb/base/string_view.h"
+#include "upb/text/encode.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_cluster_parser.h b/src/core/xds/grpc/xds_cluster_parser.h
index 109818a079f..59981e8ec2e 100644
--- a/src/core/xds/grpc/xds_cluster_parser.h
+++ b/src/core/xds/grpc/xds_cluster_parser.h
@@ -22,12 +22,11 @@
 #include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h"
 #include "envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/xds/grpc/xds_cluster.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_cluster_specifier_plugin.cc b/src/core/xds/grpc/xds_cluster_specifier_plugin.cc
index 8d77160224e..9e30ea84167 100644
--- a/src/core/xds/grpc/xds_cluster_specifier_plugin.cc
+++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <map>
@@ -25,17 +27,13 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/variant.h"
-#include "upb/base/status.hpp"
-#include "upb/json/encode.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upb.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h"
+#include "upb/base/status.hpp"
+#include "upb/json/encode.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_cluster_specifier_plugin.h b/src/core/xds/grpc/xds_cluster_specifier_plugin.h
index 4735ab749bc..4ae87310904 100644
--- a/src/core/xds/grpc/xds_cluster_specifier_plugin.h
+++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.h
@@ -17,19 +17,18 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_common_types.cc b/src/core/xds/grpc/xds_common_types.cc
index f1a84590602..0679d184b59 100644
--- a/src/core/xds/grpc/xds_common_types.cc
+++ b/src/core/xds/grpc/xds_common_types.cc
@@ -19,7 +19,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/util/match.h"
 
 namespace grpc_core {
diff --git a/src/core/xds/grpc/xds_common_types.h b/src/core/xds/grpc/xds_common_types.h
index 5bd838f1b77..b8c4ea1378d 100644
--- a/src/core/xds/grpc/xds_common_types.h
+++ b/src/core/xds/grpc/xds_common_types.h
@@ -22,7 +22,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/matchers.h"
 #include "src/core/util/validation_errors.h"
diff --git a/src/core/xds/grpc/xds_common_types_parser.cc b/src/core/xds/grpc/xds_common_types_parser.cc
index 8470b87d6b1..164fecc6728 100644
--- a/src/core/xds/grpc/xds_common_types_parser.cc
+++ b/src/core/xds/grpc/xds_common_types_parser.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -36,19 +38,15 @@
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/struct.upbdefs.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/base/status.hpp"
-#include "upb/json/encode.h"
-#include "upb/mem/arena.h"
-#include "xds/type/v3/typed_struct.upb.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/env.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/upb_utils.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/xds_client/xds_client.h"
+#include "upb/base/status.hpp"
+#include "upb/json/encode.h"
+#include "upb/mem/arena.h"
+#include "xds/type/v3/typed_struct.upb.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_common_types_parser.h b/src/core/xds/grpc/xds_common_types_parser.h
index 0db17b5f847..529e7abbd13 100644
--- a/src/core/xds/grpc/xds_common_types_parser.h
+++ b/src/core/xds/grpc/xds_common_types_parser.h
@@ -23,7 +23,6 @@
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
diff --git a/src/core/xds/grpc/xds_endpoint.h b/src/core/xds/grpc/xds_endpoint.h
index 4a07e5871c0..a74541d2543 100644
--- a/src/core/xds/grpc/xds_endpoint.h
+++ b/src/core/xds/grpc/xds_endpoint.h
@@ -24,7 +24,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/random/random.h"
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/xds/grpc/xds_endpoint_parser.cc b/src/core/xds/grpc/xds_endpoint_parser.cc
index bc11c1651e4..886052ae7cc 100644
--- a/src/core/xds/grpc/xds_endpoint_parser.cc
+++ b/src/core/xds/grpc/xds_endpoint_parser.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/xds/grpc/xds_endpoint_parser.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -39,10 +40,6 @@
 #include "envoy/config/endpoint/v3/endpoint_components.upb.h"
 #include "envoy/type/v3/percent.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/text/encode.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -55,6 +52,7 @@
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/grpc/xds_health_status.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/text/encode.h"
 
 // IWYU pragma: no_include "absl/meta/type_traits.h"
 
diff --git a/src/core/xds/grpc/xds_endpoint_parser.h b/src/core/xds/grpc/xds_endpoint_parser.h
index ababdd775bf..e543bab6356 100644
--- a/src/core/xds/grpc/xds_endpoint_parser.h
+++ b/src/core/xds/grpc/xds_endpoint_parser.h
@@ -19,12 +19,11 @@
 
 #include "absl/strings/string_view.h"
 #include "envoy/config/endpoint/v3/endpoint.upbdefs.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/xds/grpc/xds_endpoint.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_health_status.h b/src/core/xds/grpc/xds_health_status.h
index 6f4e346a268..0f4c5bf0b00 100644
--- a/src/core/xds/grpc/xds_health_status.h
+++ b/src/core/xds/grpc/xds_health_status.h
@@ -22,7 +22,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-
 #include "src/core/resolver/endpoint_addresses.h"
 
 // Channel arg key for xDS health status.
diff --git a/src/core/xds/grpc/xds_http_fault_filter.cc b/src/core/xds/grpc/xds_http_fault_filter.cc
index bf078f9d0d0..cc5b22bcb15 100644
--- a/src/core/xds/grpc/xds_http_fault_filter.cc
+++ b/src/core/xds/grpc/xds_http_fault_filter.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/xds/grpc/xds_http_fault_filter.h"
 
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -30,11 +33,6 @@
 #include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h"
 #include "envoy/type/v3/percent.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/xds/grpc/xds_http_fault_filter.h b/src/core/xds/grpc/xds_http_fault_filter.h
index d36b7761e17..0fb5d2b6c91 100644
--- a/src/core/xds/grpc/xds_http_fault_filter.h
+++ b/src/core/xds/grpc/xds_http_fault_filter.h
@@ -17,19 +17,18 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_filter.h b/src/core/xds/grpc/xds_http_filter.h
index 888b5db75b0..4625b44ca3e 100644
--- a/src/core/xds/grpc/xds_http_filter.h
+++ b/src/core/xds/grpc/xds_http_filter.h
@@ -23,8 +23,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/transport/interception_chain.h"
@@ -33,6 +31,7 @@
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_filter_registry.cc b/src/core/xds/grpc/xds_http_filter_registry.cc
index 9decfded32d..38222b521af 100644
--- a/src/core/xds/grpc/xds_http_filter_registry.cc
+++ b/src/core/xds/grpc/xds_http_filter_registry.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <utility>
 #include <vector>
@@ -24,9 +26,6 @@
 #include "absl/types/variant.h"
 #include "envoy/extensions/filters/http/router/v3/router.upb.h"
 #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/xds_http_fault_filter.h"
 #include "src/core/xds/grpc/xds_http_gcp_authn_filter.h"
diff --git a/src/core/xds/grpc/xds_http_filter_registry.h b/src/core/xds/grpc/xds_http_filter_registry.h
index 79547d35d86..a34ad7625a7 100644
--- a/src/core/xds/grpc/xds_http_filter_registry.h
+++ b/src/core/xds/grpc/xds_http_filter_registry.h
@@ -26,8 +26,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/transport/interception_chain.h"
@@ -35,6 +33,7 @@
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc
index 72e964fe74a..11de97f5c6b 100644
--- a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc
+++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_http_gcp_authn_filter.h"
 
+#include <grpc/support/json.h>
+
 #include <string>
 #include <utility>
 
@@ -24,9 +26,6 @@
 #include "absl/types/variant.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h"
-
-#include <grpc/support/json.h>
-
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h"
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.h b/src/core/xds/grpc/xds_http_gcp_authn_filter.h
index 5a015e2ad81..11d07912bd2 100644
--- a/src/core/xds/grpc/xds_http_gcp_authn_filter.h
+++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.h
@@ -20,14 +20,13 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_rbac_filter.cc b/src/core/xds/grpc/xds_http_rbac_filter.cc
index 381a2c31fdb..af819a7117e 100644
--- a/src/core/xds/grpc/xds_http_rbac_filter.cc
+++ b/src/core/xds/grpc/xds_http_rbac_filter.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_http_rbac_filter.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -38,11 +40,6 @@
 #include "envoy/type/matcher/v3/string.upb.h"
 #include "envoy/type/v3/range.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/message/map.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/rbac/rbac_filter.h"
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -55,6 +52,7 @@
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/xds_client/xds_client.h"
+#include "upb/message/map.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_rbac_filter.h b/src/core/xds/grpc/xds_http_rbac_filter.h
index 47a0f01c33c..b5533057750 100644
--- a/src/core/xds/grpc/xds_http_rbac_filter.h
+++ b/src/core/xds/grpc/xds_http_rbac_filter.h
@@ -17,19 +17,18 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.cc b/src/core/xds/grpc/xds_http_stateful_session_filter.cc
index a1442a1f392..acdc66551de 100644
--- a/src/core/xds/grpc/xds_http_stateful_session_filter.cc
+++ b/src/core/xds/grpc/xds_http_stateful_session_filter.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/xds/grpc/xds_http_stateful_session_filter.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <utility>
 
@@ -28,10 +31,6 @@
 #include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h"
 #include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h"
 #include "envoy/type/http/v3/cookie.upb.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.h b/src/core/xds/grpc/xds_http_stateful_session_filter.h
index 8327a7759f0..6dccd4b1a19 100644
--- a/src/core/xds/grpc/xds_http_stateful_session_filter.h
+++ b/src/core/xds/grpc/xds_http_stateful_session_filter.h
@@ -17,19 +17,18 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_lb_policy_registry.cc b/src/core/xds/grpc/xds_lb_policy_registry.cc
index f126855eb2b..cff37249417 100644
--- a/src/core/xds/grpc/xds_lb_policy_registry.cc
+++ b/src/core/xds/grpc/xds_lb_policy_registry.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -31,10 +33,6 @@
 #include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h"
 #include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/util/time.h"
diff --git a/src/core/xds/grpc/xds_lb_policy_registry.h b/src/core/xds/grpc/xds_lb_policy_registry.h
index 2396cb8a88d..06dcaa19c75 100644
--- a/src/core/xds/grpc/xds_lb_policy_registry.h
+++ b/src/core/xds/grpc/xds_lb_policy_registry.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "envoy/config/cluster/v3/cluster.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
diff --git a/src/core/xds/grpc/xds_listener.cc b/src/core/xds/grpc/xds_listener.cc
index c67483c41a6..1bbff1e7918 100644
--- a/src/core/xds/grpc/xds_listener.cc
+++ b/src/core/xds/grpc/xds_listener.cc
@@ -19,7 +19,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/util/match.h"
 
diff --git a/src/core/xds/grpc/xds_listener.h b/src/core/xds/grpc/xds_listener.h
index 29b51923283..823a2a4f7f5 100644
--- a/src/core/xds/grpc/xds_listener.h
+++ b/src/core/xds/grpc/xds_listener.h
@@ -29,7 +29,6 @@
 
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/time.h"
 #include "src/core/xds/grpc/xds_common_types.h"
diff --git a/src/core/xds/grpc/xds_listener_parser.cc b/src/core/xds/grpc/xds_listener_parser.cc
index 3449b5875da..325705e30bb 100644
--- a/src/core/xds/grpc/xds_listener_parser.cc
+++ b/src/core/xds/grpc/xds_listener_parser.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/xds/grpc/xds_listener_parser.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <set>
@@ -43,10 +44,6 @@
 #include "google/protobuf/any.upb.h"
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/text/encode.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
@@ -59,6 +56,7 @@
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/grpc/xds_route_config_parser.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/text/encode.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_listener_parser.h b/src/core/xds/grpc/xds_listener_parser.h
index 1a0e1e95004..908da7b995b 100644
--- a/src/core/xds/grpc/xds_listener_parser.h
+++ b/src/core/xds/grpc/xds_listener_parser.h
@@ -20,14 +20,13 @@
 #include "absl/strings/string_view.h"
 #include "envoy/config/listener/v3/listener.upbdefs.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
 #include "src/core/xds/grpc/xds_listener.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_metadata.h b/src/core/xds/grpc/xds_metadata.h
index 94857712136..63e2178ffb0 100644
--- a/src/core/xds/grpc/xds_metadata.h
+++ b/src/core/xds/grpc/xds_metadata.h
@@ -24,7 +24,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/down_cast.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_writer.h"
diff --git a/src/core/xds/grpc/xds_metadata_parser.cc b/src/core/xds/grpc/xds_metadata_parser.cc
index cb355371c47..1ec9e7a106a 100644
--- a/src/core/xds/grpc/xds_metadata_parser.cc
+++ b/src/core/xds/grpc/xds_metadata_parser.cc
@@ -23,15 +23,14 @@
 #include "absl/types/variant.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h"
-#include "upb/base/string_view.h"
-#include "upb/text/encode.h"
-
 #include "src/core/util/env.h"
 #include "src/core/util/string.h"
 #include "src/core/util/upb_utils.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
+#include "upb/base/string_view.h"
+#include "upb/text/encode.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_metadata_parser.h b/src/core/xds/grpc/xds_metadata_parser.h
index a3cca589308..7cb9d55daa7 100644
--- a/src/core/xds/grpc/xds_metadata_parser.h
+++ b/src/core/xds/grpc/xds_metadata_parser.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_METADATA_PARSER_H
 
 #include "envoy/config/core/v3/base.upb.h"
-
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_metadata.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
diff --git a/src/core/xds/grpc/xds_route_config.cc b/src/core/xds/grpc/xds_route_config.cc
index 82d670207ee..5c94d6a8824 100644
--- a/src/core/xds/grpc/xds_route_config.cc
+++ b/src/core/xds/grpc/xds_route_config.cc
@@ -26,7 +26,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "re2/re2.h"
-
 #include "src/core/util/match.h"
 #include "src/core/util/matchers.h"
 
diff --git a/src/core/xds/grpc/xds_route_config.h b/src/core/xds/grpc/xds_route_config.h
index b6af799af1c..8b562ecab11 100644
--- a/src/core/xds/grpc/xds_route_config.h
+++ b/src/core/xds/grpc/xds_route_config.h
@@ -28,7 +28,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "re2/re2.h"
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/util/matchers.h"
 #include "src/core/util/time.h"
diff --git a/src/core/xds/grpc/xds_route_config_parser.cc b/src/core/xds/grpc/xds_route_config_parser.cc
index 55ffc7ced1a..fc94e71e07b 100644
--- a/src/core/xds/grpc/xds_route_config_parser.cc
+++ b/src/core/xds/grpc/xds_route_config_parser.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_route_config_parser.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -51,13 +53,6 @@
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/wrappers.upb.h"
 #include "re2/re2.h"
-#include "upb/base/string_view.h"
-#include "upb/message/map.h"
-#include "upb/text/encode.h"
-
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
@@ -78,6 +73,9 @@
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
 #include "src/core/xds/grpc/xds_routing.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/base/string_view.h"
+#include "upb/message/map.h"
+#include "upb/text/encode.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_route_config_parser.h b/src/core/xds/grpc/xds_route_config_parser.h
index 644c55e7198..d5909c9fcf8 100644
--- a/src/core/xds/grpc/xds_route_config_parser.h
+++ b/src/core/xds/grpc/xds_route_config_parser.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_PARSER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_PARSER_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -31,10 +32,6 @@
 #include "envoy/config/route/v3/route.upb.h"
 #include "envoy/config/route/v3/route.upbdefs.h"
 #include "re2/re2.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
@@ -45,6 +42,7 @@
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_routing.cc b/src/core/xds/grpc/xds_routing.cc
index 2d8668326be..95f6cb7446f 100644
--- a/src/core/xds/grpc/xds_routing.cc
+++ b/src/core/xds/grpc/xds_routing.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/xds/grpc/xds_routing.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -30,9 +31,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/matchers.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
diff --git a/src/core/xds/grpc/xds_routing.h b/src/core/xds/grpc/xds_routing.h
index 696599d8463..85309137635 100644
--- a/src/core/xds/grpc/xds_routing.h
+++ b/src/core/xds/grpc/xds_routing.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <map>
@@ -28,9 +29,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
diff --git a/src/core/xds/grpc/xds_server_grpc.cc b/src/core/xds/grpc/xds_server_grpc.cc
index dca1d0b87c0..99654977e81 100644
--- a/src/core/xds/grpc/xds_server_grpc.cc
+++ b/src/core/xds/grpc/xds_server_grpc.cc
@@ -25,7 +25,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
diff --git a/src/core/xds/grpc/xds_transport_grpc.cc b/src/core/xds/grpc/xds_transport_grpc.cc
index 5bc75266959..ef0186a2f8a 100644
--- a/src/core/xds/grpc/xds_transport_grpc.cc
+++ b/src/core/xds/grpc/xds_transport_grpc.cc
@@ -16,16 +16,6 @@
 
 #include "src/core/xds/grpc/xds_transport_grpc.h"
 
-#include <string.h>
-
-#include <functional>
-#include <memory>
-#include <string_view>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/event_engine/event_engine.h>
@@ -35,7 +25,15 @@
 #include <grpc/impl/propagation_bits.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
+#include <functional>
+#include <memory>
+#include <string_view>
+#include <utility>
+
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/xds/grpc/xds_transport_grpc.h b/src/core/xds/grpc/xds_transport_grpc.h
index 7615d19f6c8..b057c054ae3 100644
--- a/src/core/xds/grpc/xds_transport_grpc.h
+++ b/src/core/xds/grpc/xds_transport_grpc.h
@@ -17,18 +17,17 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/xds/xds_client/lrs_client.cc b/src/core/xds/xds_client/lrs_client.cc
index d8059321d9e..3ff9d42c0a9 100644
--- a/src/core/xds/xds_client/lrs_client.cc
+++ b/src/core/xds/xds_client/lrs_client.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/xds_client/lrs_client.h"
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <memory>
 #include <set>
 #include <string>
@@ -31,13 +33,6 @@
 #include "envoy/service/load_stats/v3/lrs.upb.h"
 #include "envoy/service/load_stats/v3/lrs.upbdefs.h"
 #include "google/protobuf/duration.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.h"
-#include "upb/text/encode.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/backoff.h"
@@ -52,6 +47,10 @@
 #include "src/core/xds/xds_client/xds_api.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_locality.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.h"
+#include "upb/text/encode.h"
 
 #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6
diff --git a/src/core/xds/xds_client/lrs_client.h b/src/core/xds/xds_client/lrs_client.h
index 36fabc56fe3..eef921d953f 100644
--- a/src/core/xds/xds_client/lrs_client.h
+++ b/src/core/xds/xds_client/lrs_client.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_LRS_CLIENT_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_LRS_CLIENT_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <atomic>
 #include <map>
 #include <memory>
@@ -28,10 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/util/dual_ref_counted.h"
@@ -50,6 +48,7 @@
 #include "src/core/xds/xds_client/xds_metrics.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_transport.h"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/xds_client/xds_api.cc b/src/core/xds/xds_client/xds_api.cc
index 50522961920..5223aa16795 100644
--- a/src/core/xds/xds_client/xds_api.cc
+++ b/src/core/xds/xds_client/xds_api.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/xds/xds_client/xds_api.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -38,19 +41,14 @@
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/timestamp.upb.h"
 #include "google/rpc/status.upb.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/upb_utils.h"
+#include "src/core/xds/xds_client/xds_client.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.hpp"
 #include "upb/reflection/def.h"
 #include "upb/text/encode.h"
 
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
-#include "src/core/util/json/json.h"
-#include "src/core/util/upb_utils.h"
-#include "src/core/xds/xds_client/xds_client.h"
-
 // IWYU pragma: no_include "upb/msg_internal.h"
 
 namespace grpc_core {
diff --git a/src/core/xds/xds_client/xds_api.h b/src/core/xds/xds_client/xds_api.h
index 207e78a297a..74d688dddef 100644
--- a/src/core/xds/xds_client/xds_api.h
+++ b/src/core/xds/xds_client/xds_api.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <map>
@@ -29,16 +30,13 @@
 #include "absl/strings/string_view.h"
 #include "envoy/admin/v3/config_dump_shared.upb.h"
 #include "envoy/service/status/v3/csds.upb.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_locality.h"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.cc b/src/core/xds/xds_client/xds_backend_metric_propagation.cc
index 1d514a0f25c..edb2f852f71 100644
--- a/src/core/xds/xds_client/xds_backend_metric_propagation.cc
+++ b/src/core/xds/xds_client/xds_backend_metric_propagation.cc
@@ -20,7 +20,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/util/useful.h"
 
 namespace grpc_core {
diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.h b/src/core/xds/xds_client/xds_backend_metric_propagation.h
index 4216c0ac47e..3b9af885f71 100644
--- a/src/core/xds/xds_client/xds_backend_metric_propagation.h
+++ b/src/core/xds/xds_client/xds_backend_metric_propagation.h
@@ -20,7 +20,6 @@
 #include <string>
 
 #include "absl/container/flat_hash_set.h"
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/core/xds/xds_client/xds_bootstrap.cc b/src/core/xds/xds_client/xds_bootstrap.cc
index b6f5edfc9e2..718ac64bab3 100644
--- a/src/core/xds/xds_client/xds_bootstrap.cc
+++ b/src/core/xds/xds_client/xds_bootstrap.cc
@@ -16,10 +16,9 @@
 
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/types/optional.h"
 #include "src/core/util/env.h"
 #include "src/core/util/string.h"
 
diff --git a/src/core/xds/xds_client/xds_bootstrap.h b/src/core/xds/xds_client/xds_bootstrap.h
index cd802bbfa63..62f929b4c9d 100644
--- a/src/core/xds/xds_client/xds_bootstrap.h
+++ b/src/core/xds/xds_client/xds_bootstrap.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H
 
-#include <string>
-
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "src/core/util/json/json.h"
 
 namespace grpc_core {
diff --git a/src/core/xds/xds_client/xds_client.cc b/src/core/xds/xds_client/xds_client.cc
index 6381f8ba38c..d9b13e2980d 100644
--- a/src/core/xds/xds_client/xds_client.cc
+++ b/src/core/xds/xds_client/xds_client.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/xds_client/xds_client.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -40,12 +42,6 @@
 #include "envoy/service/status/v3/csds.upb.h"
 #include "google/protobuf/any.upb.h"
 #include "google/protobuf/timestamp.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/backoff.h"
 #include "src/core/util/debug_location.h"
@@ -57,6 +53,8 @@
 #include "src/core/xds/xds_client/xds_api.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_locality.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.h"
 
 #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6
diff --git a/src/core/xds/xds_client/xds_client.h b/src/core/xds/xds_client/xds_client.h
index b5d4faa0b90..5b97b363d14 100644
--- a/src/core/xds/xds_client/xds_client.h
+++ b/src/core/xds/xds_client/xds_client.h
@@ -17,6 +17,9 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <set>
@@ -28,11 +31,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/orphanable.h"
@@ -48,6 +46,7 @@
 #include "src/core/xds/xds_client/xds_metrics.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_transport.h"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/xds_client/xds_locality.h b/src/core/xds/xds_client/xds_locality.h
index 3223ff48c34..7fb469ba415 100644
--- a/src/core/xds/xds_client/xds_locality.h
+++ b/src/core/xds/xds_client/xds_locality.h
@@ -24,7 +24,6 @@
 
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/xds/xds_client/xds_metrics.h b/src/core/xds/xds_client/xds_metrics.h
index 5262e02e084..6e562296396 100644
--- a/src/core/xds/xds_client/xds_metrics.h
+++ b/src/core/xds/xds_client/xds_metrics.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_core {
 
 // An interface for XdsClient to report metrics.
diff --git a/src/core/xds/xds_client/xds_resource_type.h b/src/core/xds/xds_client/xds_resource_type.h
index dade8ce0f83..642ff2e7119 100644
--- a/src/core/xds/xds_client/xds_resource_type.h
+++ b/src/core/xds/xds_client/xds_resource_type.h
@@ -16,19 +16,18 @@
 
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/xds_client/xds_resource_type_impl.h b/src/core/xds/xds_client/xds_resource_type_impl.h
index a927f796b5e..0b97edb6aa0 100644
--- a/src/core/xds/xds_client/xds_resource_type_impl.h
+++ b/src/core/xds/xds_client/xds_resource_type_impl.h
@@ -16,13 +16,12 @@
 
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
diff --git a/src/core/xds/xds_client/xds_transport.h b/src/core/xds/xds_client/xds_transport.h
index b471b31477c..9d7f98f6bf5 100644
--- a/src/core/xds/xds_client/xds_transport.h
+++ b/src/core/xds/xds_client/xds_transport.h
@@ -22,7 +22,6 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
diff --git a/src/cpp/client/call_credentials.cc b/src/cpp/client/call_credentials.cc
index 88ccd07ea1f..3ecc72d5980 100644
--- a/src/cpp/client/call_credentials.cc
+++ b/src/cpp/client/call_credentials.cc
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/security/credentials.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/security/credentials/credentials.h"
 
 namespace grpc {
diff --git a/src/cpp/client/channel_cc.cc b/src/cpp/client/channel_cc.cc
index 457f9db37aa..e99c416d175 100644
--- a/src/cpp/client/channel_cc.cc
+++ b/src/cpp/client/channel_cc.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <atomic>
-#include <cstring>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/slice.h>
@@ -41,6 +32,14 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/slice.h>
 
+#include <atomic>
+#include <cstring>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/iomgr.h"
 
 namespace grpc {
diff --git a/src/cpp/client/channel_credentials.cc b/src/cpp/client/channel_credentials.cc
index 321af7783da..e27643c2846 100644
--- a/src/cpp/client/channel_credentials.cc
+++ b/src/cpp/client/channel_credentials.cc
@@ -11,16 +11,16 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <memory>
-#include <string>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace grpc {
 
 ChannelCredentials::ChannelCredentials(grpc_channel_credentials* c_creds)
diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc
index ac480c87153..e338d440b9c 100644
--- a/src/cpp/client/client_context.cc
+++ b/src/cpp/client/client_context.cc
@@ -16,17 +16,6 @@
 //
 //
 
-#include <stdlib.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
@@ -40,7 +29,16 @@
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/client_interceptor.h>
+#include <stdlib.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 
 namespace grpc {
diff --git a/src/cpp/client/create_channel.cc b/src/cpp/client/create_channel.cc
index a2db03ae9ea..5385e3094e0 100644
--- a/src/cpp/client/create_channel.cc
+++ b/src/cpp/client/create_channel.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/status.h>
 #include <grpcpp/channel.h>
@@ -31,6 +26,11 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "src/cpp/client/create_channel_internal.h"
 
 namespace grpc {
diff --git a/src/cpp/client/create_channel_internal.cc b/src/cpp/client/create_channel_internal.cc
index e54910f46a3..31b6fa013ab 100644
--- a/src/cpp/client/create_channel_internal.cc
+++ b/src/cpp/client/create_channel_internal.cc
@@ -18,13 +18,13 @@
 
 #include "src/cpp/client/create_channel_internal.h"
 
+#include <grpcpp/channel.h>
+
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <grpcpp/channel.h>
-
 namespace grpc {
 
 std::shared_ptr<Channel> CreateChannelInternal(
diff --git a/src/cpp/client/create_channel_internal.h b/src/cpp/client/create_channel_internal.h
index 264ad575aac..02e555e77bb 100644
--- a/src/cpp/client/create_channel_internal.h
+++ b/src/cpp/client/create_channel_internal.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CPP_CLIENT_CREATE_CHANNEL_INTERNAL_H
 #define GRPC_SRC_CPP_CLIENT_CREATE_CHANNEL_INTERNAL_H
 
-#include <memory>
-#include <string>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/support/client_interceptor.h>
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace grpc {
 
 std::shared_ptr<Channel> CreateChannelInternal(
diff --git a/src/cpp/client/create_channel_posix.cc b/src/cpp/client/create_channel_posix.cc
index e1d6653ed55..9f25b4bfbb8 100644
--- a/src/cpp/client/create_channel_posix.cc
+++ b/src/cpp/client/create_channel_posix.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_posix.h>
@@ -30,6 +25,11 @@
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "src/cpp/client/create_channel_internal.h"
 
 namespace grpc {
diff --git a/src/cpp/client/cronet_credentials.cc b/src/cpp/client/cronet_credentials.cc
index da133a62f9c..0bae55aa657 100644
--- a/src/cpp/client/cronet_credentials.cc
+++ b/src/cpp/client/cronet_credentials.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_cronet.h>
 #include <grpcpp/channel.h>
@@ -29,6 +24,11 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "src/cpp/client/create_channel_internal.h"
 
 namespace grpc {
diff --git a/src/cpp/client/global_callback_hook.cc b/src/cpp/client/global_callback_hook.cc
index 2431508b7b3..e117214d1cc 100644
--- a/src/cpp/client/global_callback_hook.cc
+++ b/src/cpp/client/global_callback_hook.cc
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/support/global_callback_hook.h>
+
 #include <memory>
 
 #include "absl/base/no_destructor.h"
 #include "absl/log/check.h"
 
-#include <grpcpp/support/global_callback_hook.h>
-
 namespace grpc {
 
 static absl::NoDestructor<std::shared_ptr<GlobalCallbackHook>> g_callback_hook(
diff --git a/src/cpp/client/insecure_credentials.cc b/src/cpp/client/insecure_credentials.cc
index 0f3d000bd29..89dcadfc409 100644
--- a/src/cpp/client/insecure_credentials.cc
+++ b/src/cpp/client/insecure_credentials.cc
@@ -15,8 +15,6 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/channel.h>
@@ -24,6 +22,8 @@
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
 
+#include <memory>
+
 namespace grpc {
 namespace {
 class InsecureChannelCredentialsImpl final : public ChannelCredentials {
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc
index 5c1804fbc66..e46561afb64 100644
--- a/src/cpp/client/secure_credentials.cc
+++ b/src/cpp/client/secure_credentials.cc
@@ -18,19 +18,6 @@
 
 #include "src/cpp/client/secure_credentials.h"
 
-#include <string.h>
-
-#include <map>
-#include <memory>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_join.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
@@ -45,7 +32,18 @@
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
+#include <string.h>
+
+#include <map>
+#include <memory>
+#include <utility>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_join.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/security/util/json_util.h"
 #include "src/core/util/env.h"
diff --git a/src/cpp/client/xds_credentials.cc b/src/cpp/client/xds_credentials.cc
index e3fefd04c47..b9771e2d340 100644
--- a/src/cpp/client/xds_credentials.cc
+++ b/src/cpp/client/xds_credentials.cc
@@ -16,14 +16,14 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/credentials.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
+
 namespace grpc {
 class XdsChannelCredentialsImpl final : public ChannelCredentials {
  public:
diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc
index 770b07085e3..7617ca64670 100644
--- a/src/cpp/common/alarm.cc
+++ b/src/cpp/common/alarm.cc
@@ -15,14 +15,6 @@
 //
 //
 
-#include <atomic>
-#include <functional>
-#include <memory>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
@@ -32,6 +24,13 @@
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/completion_queue_tag.h>
 
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <utility>
+
+#include "absl/log/check.h"
+#include "absl/status/status.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/cpp/common/alts_context.cc b/src/cpp/common/alts_context.cc
index b8fed615a42..cdcf53ee59e 100644
--- a/src/cpp/common/alts_context.cc
+++ b/src/cpp/common/alts_context.cc
@@ -16,19 +16,17 @@
 //
 //
 
+#include <grpc/grpc_security_constants.h>
+#include <grpcpp/security/alts_context.h>
 #include <stddef.h>
 
 #include <map>
 #include <string>
 
-#include "upb/base/string_view.h"
-#include "upb/message/map.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpcpp/security/alts_context.h>
-
 #include "src/proto/grpc/gcp/altscontext.upb.h"
 #include "src/proto/grpc/gcp/transport_security_common.upb.h"
+#include "upb/base/string_view.h"
+#include "upb/message/map.h"
 
 namespace grpc {
 namespace experimental {
diff --git a/src/cpp/common/alts_util.cc b/src/cpp/common/alts_util.cc
index df1a8a8cf5b..1a0a2149b1f 100644
--- a/src/cpp/common/alts_util.cc
+++ b/src/cpp/common/alts_util.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "absl/log/log.h"
-#include "upb/mem/arena.hpp"
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/security/alts_context.h>
 #include <grpcpp/security/alts_util.h>
@@ -31,8 +23,15 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "absl/log/log.h"
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
 #include "src/proto/grpc/gcp/altscontext.upb.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc {
 namespace experimental {
diff --git a/src/cpp/common/auth_property_iterator.cc b/src/cpp/common/auth_property_iterator.cc
index 10e71d3a174..854e999115e 100644
--- a/src/cpp/common/auth_property_iterator.cc
+++ b/src/cpp/common/auth_property_iterator.cc
@@ -16,12 +16,12 @@
 //
 //
 
-#include <utility>
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <utility>
+
 namespace grpc {
 
 AuthPropertyIterator::AuthPropertyIterator()
diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc
index fc09938b99f..af1838571ca 100644
--- a/src/cpp/common/channel_arguments.cc
+++ b/src/cpp/common/channel_arguments.cc
@@ -15,19 +15,18 @@
 // limitations under the License.
 //
 //
-#include <algorithm>
-#include <list>
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/compression_types.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <algorithm>
+#include <list>
+#include <string>
+#include <vector>
+
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
 
diff --git a/src/cpp/common/completion_queue_cc.cc b/src/cpp/common/completion_queue_cc.cc
index 88396bfbbc6..ebaf659acc2 100644
--- a/src/cpp/common/completion_queue_cc.cc
+++ b/src/cpp/common/completion_queue_cc.cc
@@ -15,12 +15,6 @@
 //
 //
 
-#include <vector>
-
-#include "absl/base/thread_annotations.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/sync.h>
@@ -29,6 +23,11 @@
 #include <grpcpp/impl/completion_queue_tag.h>
 #include <grpcpp/impl/grpc_library.h>
 
+#include <vector>
+
+#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/thd.h"
 #include "src/core/util/useful.h"
diff --git a/src/cpp/common/insecure_create_auth_context.cc b/src/cpp/common/insecure_create_auth_context.cc
index b4c02d39b36..785357e1806 100644
--- a/src/cpp/common/insecure_create_auth_context.cc
+++ b/src/cpp/common/insecure_create_auth_context.cc
@@ -15,11 +15,11 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpcpp/security/auth_context.h>
 
+#include <memory>
+
 namespace grpc {
 
 std::shared_ptr<const AuthContext> CreateAuthContext(grpc_call* call) {
diff --git a/src/cpp/common/resource_quota_cc.cc b/src/cpp/common/resource_quota_cc.cc
index 075a4f71d76..253edd04ba4 100644
--- a/src/cpp/common/resource_quota_cc.cc
+++ b/src/cpp/common/resource_quota_cc.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/resource_quota.h>
 #include <stddef.h>
 
 #include <string>
 
-#include <grpc/grpc.h>
-#include <grpcpp/resource_quota.h>
-
 namespace grpc {
 
 ResourceQuota::ResourceQuota() : impl_(grpc_resource_quota_create(nullptr)) {}
diff --git a/src/cpp/common/secure_auth_context.cc b/src/cpp/common/secure_auth_context.cc
index c1b69efe4d5..ccf362b58be 100644
--- a/src/cpp/common/secure_auth_context.cc
+++ b/src/cpp/common/secure_auth_context.cc
@@ -18,10 +18,10 @@
 
 #include "src/cpp/common/secure_auth_context.h"
 
-#include <algorithm>
-
 #include <grpc/grpc_security.h>
 
+#include <algorithm>
+
 namespace grpc {
 
 std::vector<grpc::string_ref> SecureAuthContext::GetPeerIdentity() const {
diff --git a/src/cpp/common/secure_auth_context.h b/src/cpp/common/secure_auth_context.h
index 8da3e971c22..405036faa05 100644
--- a/src/cpp/common/secure_auth_context.h
+++ b/src/cpp/common/secure_auth_context.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_SRC_CPP_COMMON_SECURE_AUTH_CONTEXT_H
 #define GRPC_SRC_CPP_COMMON_SECURE_AUTH_CONTEXT_H
 
-#include <string>
-#include <vector>
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <string>
+#include <vector>
+
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/cpp/common/secure_create_auth_context.cc b/src/cpp/common/secure_create_auth_context.cc
index 8492655b4aa..3c1caeaccb5 100644
--- a/src/cpp/common/secure_create_auth_context.cc
+++ b/src/cpp/common/secure_create_auth_context.cc
@@ -15,12 +15,12 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
 
+#include <memory>
+
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/cpp/common/secure_auth_context.h"
diff --git a/src/cpp/common/tls_certificate_provider.cc b/src/cpp/common/tls_certificate_provider.cc
index 88c684b3a45..091e478b9ba 100644
--- a/src/cpp/common/tls_certificate_provider.cc
+++ b/src/cpp/common/tls_certificate_provider.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/tls_certificate_provider.h>
 
+#include <string>
+#include <vector>
+
+#include "absl/log/check.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
 namespace grpc {
diff --git a/src/cpp/common/tls_certificate_verifier.cc b/src/cpp/common/tls_certificate_verifier.cc
index d298cf26773..dfbd2e1c3e1 100644
--- a/src/cpp/common/tls_certificate_verifier.cc
+++ b/src/cpp/common/tls_certificate_verifier.cc
@@ -14,16 +14,6 @@
 // limitations under the License.
 //
 
-#include <stddef.h>
-
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/status.h>
@@ -33,6 +23,15 @@
 #include <grpcpp/security/tls_certificate_verifier.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
+#include <stddef.h>
+
+#include <algorithm>
+#include <functional>
+#include <map>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
 
 namespace grpc {
 namespace experimental {
diff --git a/src/cpp/common/tls_credentials_options.cc b/src/cpp/common/tls_credentials_options.cc
index 74e74128322..339a714bd2d 100644
--- a/src/cpp/common/tls_credentials_options.cc
+++ b/src/cpp/common/tls_credentials_options.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <string>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security.h>
@@ -30,6 +25,11 @@
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/security/tls_crl_provider.h>
 
+#include <memory>
+#include <string>
+
+#include "absl/log/check.h"
+
 namespace grpc {
 namespace experimental {
 
diff --git a/src/cpp/common/validate_service_config.cc b/src/cpp/common/validate_service_config.cc
index f8f662d87b3..6869617036a 100644
--- a/src/cpp/common/validate_service_config.cc
+++ b/src/cpp/common/validate_service_config.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/support/validate_service_config.h>
+
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/support/validate_service_config.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc
index 44824d66f72..dbfe28ab0a5 100644
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <string>
-
 #include <grpcpp/grpcpp.h>
 
+#include <string>
+
 namespace grpc {
 std::string Version() { return GRPC_CPP_VERSION_STRING; }
 }  // namespace grpc
diff --git a/src/cpp/ext/chaotic_good.cc b/src/cpp/ext/chaotic_good.cc
index 7268598118e..31c36231a9c 100644
--- a/src/cpp/ext/chaotic_good.cc
+++ b/src/cpp/ext/chaotic_good.cc
@@ -14,10 +14,10 @@
 
 #include "src/cpp/ext/chaotic_good.h"
 
-#include <memory>
-
 #include <grpc/grpc.h>
 
+#include <memory>
+
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 
diff --git a/src/cpp/ext/chaotic_good.h b/src/cpp/ext/chaotic_good.h
index b203f473e59..73fed2bd632 100644
--- a/src/cpp/ext/chaotic_good.h
+++ b/src/cpp/ext/chaotic_good.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CPP_EXT_CHAOTIC_GOOD_H
 #define GRPC_SRC_CPP_EXT_CHAOTIC_GOOD_H
 
-#include <memory>
-
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
 namespace grpc {
 
 std::shared_ptr<ChannelCredentials> ChaoticGoodInsecureChannelCredentials();
diff --git a/src/cpp/ext/csm/csm_observability.cc b/src/cpp/ext/csm/csm_observability.cc
index a5f61794660..66a2194f0e5 100644
--- a/src/cpp/ext/csm/csm_observability.cc
+++ b/src/cpp/ext/csm/csm_observability.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/csm/csm_observability.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/csm_observability.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -30,10 +33,6 @@
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/resource/resource_detector.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/csm_observability.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/uri.h"
 #include "src/core/xds/grpc/xds_enabled_server.h"
diff --git a/src/cpp/ext/csm/csm_observability.h b/src/cpp/ext/csm/csm_observability.h
index 8e623cb4edf..a42831a4f4a 100644
--- a/src/cpp/ext/csm/csm_observability.h
+++ b/src/cpp/ext/csm/csm_observability.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_CSM_CSM_OBSERVABILITY_H
 #define GRPC_SRC_CPP_EXT_CSM_CSM_OBSERVABILITY_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc
index bd922460fb9..5934554d10d 100644
--- a/src/cpp/ext/csm/metadata_exchange.cc
+++ b/src/cpp/ext/csm/metadata_exchange.cc
@@ -18,6 +18,8 @@
 
 #include "src/cpp/ext/csm/metadata_exchange.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -34,11 +36,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "opentelemetry/sdk/resource/semantic_conventions.h"
-#include "upb/base/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/telemetry/call_tracer.h"
@@ -48,6 +45,7 @@
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/load_file.h"
 #include "src/cpp/ext/otel/key_value_iterable.h"
+#include "upb/base/string_view.h"
 
 namespace grpc {
 namespace internal {
diff --git a/src/cpp/ext/csm/metadata_exchange.h b/src/cpp/ext/csm/metadata_exchange.h
index 4487dcbb74e..0830acdd7ef 100644
--- a/src/cpp/ext/csm/metadata_exchange.h
+++ b/src/cpp/ext/csm/metadata_exchange.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_EXT_CSM_METADATA_EXCHANGE_H
 #define GRPC_SRC_CPP_EXT_CSM_METADATA_EXCHANGE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -27,13 +29,10 @@
 #include "absl/strings/string_view.h"
 #include "google/protobuf/struct.upb.h"
 #include "opentelemetry/sdk/common/attribute_utils.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/cpp/ext/otel/otel_plugin.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc {
 namespace internal {
diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc
index 001c1fa8d18..d865b75147c 100644
--- a/src/cpp/ext/filters/census/client_filter.cc
+++ b/src/cpp/ext/filters/census/client_filter.cc
@@ -18,6 +18,12 @@
 
 #include "src/cpp/ext/filters/census/client_filter.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/support/status.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -42,14 +48,6 @@
 #include "opencensus/trace/span.h"
 #include "opencensus/trace/span_context.h"
 #include "opencensus/trace/status_code.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/src/cpp/ext/filters/census/client_filter.h b/src/cpp/ext/filters/census/client_filter.h
index 8e2f4057c3b..e1ee13b087f 100644
--- a/src/cpp/ext/filters/census/client_filter.h
+++ b/src/cpp/ext/filters/census/client_filter.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CLIENT_FILTER_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CLIENT_FILTER_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/interceptor.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/cpp/ext/filters/census/context.cc b/src/cpp/ext/filters/census/context.cc
index 21d10f1fd28..2545b34e7ad 100644
--- a/src/cpp/ext/filters/census/context.cc
+++ b/src/cpp/ext/filters/census/context.cc
@@ -18,15 +18,14 @@
 
 #include "src/cpp/ext/filters/census/context.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <new>
 
 #include "opencensus/tags/context_util.h"
 #include "opencensus/tags/tag_map.h"
 #include "opencensus/trace/context_util.h"
 #include "opencensus/trace/propagation/grpc_trace_bin.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/transport/transport.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/cpp/ext/filters/census/rpc_encoding.h"
diff --git a/src/cpp/ext/filters/census/context.h b/src/cpp/ext/filters/census/context.h
index 503823a427e..fcee9407139 100644
--- a/src/cpp/ext/filters/census/context.h
+++ b/src/cpp/ext/filters/census/context.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CONTEXT_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CONTEXT_H
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,13 +31,6 @@
 #include "absl/strings/strip.h"
 #include "opencensus/trace/span.h"
 #include "opencensus/trace/span_context.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc
index f41d6d687e8..cb407b21cdb 100644
--- a/src/cpp/ext/filters/census/grpc_plugin.cc
+++ b/src/cpp/ext/filters/census/grpc_plugin.cc
@@ -18,17 +18,16 @@
 
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/server_context.h>
+
 #include <atomic>
 
 #include "absl/base/attributes.h"
 #include "absl/strings/string_view.h"
 #include "opencensus/tags/tag_key.h"
 #include "opencensus/trace/span.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/surface/channel_stack_type.h"
diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h
index 553857c96b7..af647d33af1 100644
--- a/src/cpp/ext/filters/census/grpc_plugin.h
+++ b/src/cpp/ext/filters/census/grpc_plugin.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
+
 #include <algorithm>
 #include <map>
 #include <string>
@@ -30,9 +33,6 @@
 #include "opencensus/tags/tag_key.h"
 #include "opencensus/tags/tag_map.h"
 
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-
 namespace grpc {
 
 // The following using declarations have been added to prevent breaking users
diff --git a/src/cpp/ext/filters/census/measures.cc b/src/cpp/ext/filters/census/measures.cc
index 5710d04dc6e..c5f0d973d6e 100644
--- a/src/cpp/ext/filters/census/measures.cc
+++ b/src/cpp/ext/filters/census/measures.cc
@@ -18,11 +18,10 @@
 
 #include "src/cpp/ext/filters/census/measures.h"
 
-#include "opencensus/stats/stats.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/opencensus.h>
 
+#include "opencensus/stats/stats.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/filters/census/measures.h b/src/cpp/ext/filters/census/measures.h
index 78a58c6732a..5d0f39022c5 100644
--- a/src/cpp/ext/filters/census/measures.h
+++ b/src/cpp/ext/filters/census/measures.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_MEASURES_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_MEASURES_H
 
-#include "opencensus/stats/stats.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "opencensus/stats/stats.h"
+
 namespace grpc {
 
 ::opencensus::stats::MeasureInt64 RpcClientSentMessagesPerRpc();
diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h
index 2b98d4cb861..6b50bc0c756 100644
--- a/src/cpp/ext/filters/census/open_census_call_tracer.h
+++ b/src/cpp/ext/filters/census/open_census_call_tracer.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_OPEN_CENSUS_CALL_TRACER_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_OPEN_CENSUS_CALL_TRACER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+#include <grpcpp/opencensus.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -33,11 +36,6 @@
 #include "opencensus/trace/span_context.h"
 #include "opencensus/trace/span_id.h"
 #include "opencensus/trace/trace_id.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/cpp/ext/filters/census/rpc_encoding.h b/src/cpp/ext/filters/census/rpc_encoding.h
index a42b4d8c9e6..ad474d81e1b 100644
--- a/src/cpp/ext/filters/census/rpc_encoding.h
+++ b/src/cpp/ext/filters/census/rpc_encoding.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_RPC_ENCODING_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_RPC_ENCODING_H
 
+#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 <grpc/support/port_platform.h>
-
 namespace grpc {
 namespace internal {
 
diff --git a/src/cpp/ext/filters/census/server_call_tracer.cc b/src/cpp/ext/filters/census/server_call_tracer.cc
index e98b21ec0bc..bb6fb57f793 100644
--- a/src/cpp/ext/filters/census/server_call_tracer.cc
+++ b/src/cpp/ext/filters/census/server_call_tracer.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/filters/census/server_call_tracer.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -40,11 +43,6 @@
 #include "opencensus/trace/span_context.h"
 #include "opencensus/trace/span_id.h"
 #include "opencensus/trace/trace_id.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/src/cpp/ext/filters/census/views.cc b/src/cpp/ext/filters/census/views.cc
index 068c9089413..3fa27ff57a6 100644
--- a/src/cpp/ext/filters/census/views.cc
+++ b/src/cpp/ext/filters/census/views.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
+
 #include <vector>
 
 #include "absl/time/time.h"
 #include "opencensus/stats/stats.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/gcp/environment_autodetect.cc b/src/cpp/ext/gcp/environment_autodetect.cc
index 77f74608ee3..98365f3164f 100644
--- a/src/cpp/ext/gcp/environment_autodetect.cc
+++ b/src/cpp/ext/gcp/environment_autodetect.cc
@@ -18,6 +18,11 @@
 
 #include "src/cpp/ext/gcp/environment_autodetect.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpcpp/impl/grpc_library.h>
+
 #include <memory>
 #include <utility>
 
@@ -27,12 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpcpp/impl/grpc_library.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/cpp/ext/gcp/environment_autodetect.h b/src/cpp/ext/gcp/environment_autodetect.h
index b45eb9ed2c1..21ccfdf47a7 100644
--- a/src/cpp/ext/gcp/environment_autodetect.h
+++ b/src/cpp/ext/gcp/environment_autodetect.h
@@ -17,6 +17,9 @@
 #ifndef GRPC_SRC_CPP_EXT_GCP_ENVIRONMENT_AUTODETECT_H
 #define GRPC_SRC_CPP_EXT_GCP_ENVIRONMENT_AUTODETECT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -25,10 +28,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/sync.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/gcp/observability.cc b/src/cpp/ext/gcp/observability.cc
index ef508c89dd9..ba60e112724 100644
--- a/src/cpp/ext/gcp/observability.cc
+++ b/src/cpp/ext/gcp/observability.cc
@@ -14,6 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/ext/gcp_observability.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -37,15 +44,6 @@
 #include "opencensus/stats/stats.h"
 #include "opencensus/trace/sampler.h"
 #include "opencensus/trace/trace_config.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/ext/gcp_observability.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/notification.h"
diff --git a/src/cpp/ext/gcp/observability_config.cc b/src/cpp/ext/gcp/observability_config.cc
index f6ffcf94d6a..64246249f01 100644
--- a/src/cpp/ext/gcp/observability_config.cc
+++ b/src/cpp/ext/gcp/observability_config.cc
@@ -16,6 +16,9 @@
 
 #include "src/cpp/ext/gcp/observability_config.h"
 
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,11 +30,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/transport/error_utils.h"
diff --git a/src/cpp/ext/gcp/observability_config.h b/src/cpp/ext/gcp/observability_config.h
index 5fb18f3fae6..bc7d347a6e8 100644
--- a/src/cpp/ext/gcp/observability_config.h
+++ b/src/cpp/ext/gcp/observability_config.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_CONFIG_H
 #define GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_CONFIG_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <map>
@@ -26,9 +27,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
diff --git a/src/cpp/ext/gcp/observability_logging_sink.cc b/src/cpp/ext/gcp/observability_logging_sink.cc
index 0a370d87606..302cbc7be4d 100644
--- a/src/cpp/ext/gcp/observability_logging_sink.cc
+++ b/src/cpp/ext/gcp/observability_logging_sink.cc
@@ -18,6 +18,14 @@
 
 #include "src/cpp/ext/gcp/observability_logging_sink.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/status.h>
+
 #include <algorithm>
 #include <map>
 #include <utility>
@@ -33,15 +41,6 @@
 #include "google/logging/v2/logging.grpc.pb.h"
 #include "google/logging/v2/logging.pb.h"
 #include "google/protobuf/text_format.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/util/env.h"
 #include "src/core/util/json/json.h"
diff --git a/src/cpp/ext/gcp/observability_logging_sink.h b/src/cpp/ext/gcp/observability_logging_sink.h
index f4703721f3d..a61765118c2 100644
--- a/src/cpp/ext/gcp/observability_logging_sink.h
+++ b/src/cpp/ext/gcp/observability_logging_sink.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_LOGGING_SINK_H
 #define GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_LOGGING_SINK_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <map>
@@ -30,10 +32,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "google/logging/v2/logging.grpc.pb.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/logging/logging_sink.h"
 #include "src/core/util/sync.h"
 #include "src/cpp/ext/gcp/environment_autodetect.h"
diff --git a/src/cpp/ext/otel/key_value_iterable.h b/src/cpp/ext/otel/key_value_iterable.h
index caad77aee36..b3d8d7d747f 100644
--- a/src/cpp/ext/otel/key_value_iterable.h
+++ b/src/cpp/ext/otel/key_value_iterable.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_KEY_VALUE_ITERABLE_H
 #define GRPC_SRC_CPP_EXT_OTEL_KEY_VALUE_ITERABLE_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <utility>
@@ -31,9 +32,6 @@
 #include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/otel/otel_plugin.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/otel/otel_client_call_tracer.cc b/src/cpp/ext/otel/otel_client_call_tracer.cc
index 88750fca3e3..bf5b3aba61f 100644
--- a/src/cpp/ext/otel/otel_client_call_tracer.cc
+++ b/src/cpp/ext/otel/otel_client_call_tracer.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/otel/otel_client_call_tracer.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <array>
@@ -38,11 +41,6 @@
 #include "absl/types/span.h"
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/metrics/sync_instruments.h"
-
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/status_util.h"
diff --git a/src/cpp/ext/otel/otel_client_call_tracer.h b/src/cpp/ext/otel/otel_client_call_tracer.h
index c94219f2152..e489c7fa5f3 100644
--- a/src/cpp/ext/otel/otel_client_call_tracer.h
+++ b/src/cpp/ext/otel/otel_client_call_tracer.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_CLIENT_CALL_TRACER_H
 #define GRPC_SRC_CPP_EXT_OTEL_OTEL_CLIENT_CALL_TRACER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <memory>
@@ -28,10 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc
index 7f71ec517f6..c55c4584358 100644
--- a/src/cpp/ext/otel/otel_plugin.cc
+++ b/src/cpp/ext/otel/otel_plugin.cc
@@ -18,6 +18,10 @@
 
 #include "src/cpp/ext/otel/otel_plugin.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/version_info.h>
+
 #include <memory>
 #include <type_traits>
 #include <utility>
@@ -29,11 +33,6 @@
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/nostd/variant.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/version_info.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/cpp/ext/otel/otel_plugin.h b/src/cpp/ext/otel/otel_plugin.h
index 9b0c4328673..2199596ed62 100644
--- a/src/cpp/ext/otel/otel_plugin.h
+++ b/src/cpp/ext/otel/otel_plugin.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_PLUGIN_H
 #define GRPC_SRC_CPP_EXT_OTEL_OTEL_PLUGIN_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/impl/server_builder_option.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -37,11 +40,6 @@
 #include "opentelemetry/metrics/observer_result.h"
 #include "opentelemetry/metrics/sync_instruments.h"
 #include "opentelemetry/nostd/shared_ptr.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/impl/server_builder_option.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/telemetry/metrics.h"
diff --git a/src/cpp/ext/otel/otel_server_call_tracer.cc b/src/cpp/ext/otel/otel_server_call_tracer.cc
index 6fd4785672d..0e5d42febad 100644
--- a/src/cpp/ext/otel/otel_server_call_tracer.cc
+++ b/src/cpp/ext/otel/otel_server_call_tracer.cc
@@ -18,6 +18,8 @@
 
 #include "src/cpp/ext/otel/otel_server_call_tracer.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <array>
 #include <memory>
 #include <string>
@@ -32,9 +34,6 @@
 #include "absl/types/span.h"
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/metrics/sync_instruments.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/src/cpp/ext/otel/otel_server_call_tracer.h b/src/cpp/ext/otel/otel_server_call_tracer.h
index 9d13d669b6d..b4f32f6ae84 100644
--- a/src/cpp/ext/otel/otel_server_call_tracer.h
+++ b/src/cpp/ext/otel/otel_server_call_tracer.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_SERVER_CALL_TRACER_H
 #define GRPC_SRC_CPP_EXT_OTEL_OTEL_SERVER_CALL_TRACER_H
 
-#include "absl/strings/strip.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/strip.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/cpp/ext/otel/otel_plugin.h"
diff --git a/src/cpp/ext/proto_server_reflection.cc b/src/cpp/ext/proto_server_reflection.cc
index 95a30d892a9..075fc72ef3c 100644
--- a/src/cpp/ext/proto_server_reflection.cc
+++ b/src/cpp/ext/proto_server_reflection.cc
@@ -18,13 +18,13 @@
 
 #include "src/cpp/ext/proto_server_reflection.h"
 
-#include <unordered_set>
-#include <vector>
-
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/interceptor.h>
 #include <grpcpp/support/sync_stream.h>
 
+#include <unordered_set>
+#include <vector>
+
 // IWYU pragma: no_include "google/protobuf/descriptor.h"
 // IWYU pragma: no_include <google/protobuf/descriptor.h>
 // IWYU pragma: no_include "src/proto/grpc/reflection/v1/reflection.pb.h"
diff --git a/src/cpp/ext/proto_server_reflection.h b/src/cpp/ext/proto_server_reflection.h
index 989e0bd3e23..9f1ba787ff0 100644
--- a/src/cpp/ext/proto_server_reflection.h
+++ b/src/cpp/ext/proto_server_reflection.h
@@ -19,18 +19,18 @@
 #ifndef GRPC_SRC_CPP_EXT_PROTO_SERVER_REFLECTION_H
 #define GRPC_SRC_CPP_EXT_PROTO_SERVER_REFLECTION_H
 
-#include <memory>
-#include <string>
-#include <unordered_set>
-#include <utility>
-#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 <memory>
+#include <string>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
 #include "src/proto/grpc/reflection/v1/reflection.grpc.pb.h"
 #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h"
 
diff --git a/src/cpp/ext/proto_server_reflection_plugin.cc b/src/cpp/ext/proto_server_reflection_plugin.cc
index 4299884055d..d880fc127a1 100644
--- a/src/cpp/ext/proto_server_reflection_plugin.cc
+++ b/src/cpp/ext/proto_server_reflection_plugin.cc
@@ -16,14 +16,14 @@
 //
 //
 
-#include <memory>
-#include <string>
-
 #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 <memory>
+#include <string>
+
 #include "src/core/lib/config/config_vars.h"
 #include "src/cpp/ext/proto_server_reflection.h"
 
diff --git a/src/cpp/server/authorization_policy_provider.cc b/src/cpp/server/authorization_policy_provider.cc
index bc34cdf44f8..efd67c7d968 100644
--- a/src/cpp/server/authorization_policy_provider.cc
+++ b/src/cpp/server/authorization_policy_provider.cc
@@ -12,15 +12,15 @@
 // 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 <grpcpp/security/authorization_policy_provider.h>
 #include <grpcpp/support/status.h>
 
+#include <memory>
+#include <string>
+
 namespace grpc {
 namespace experimental {
 
diff --git a/src/cpp/server/backend_metric_recorder.cc b/src/cpp/server/backend_metric_recorder.cc
index 40a19f3a72f..6670878c7c2 100644
--- a/src/cpp/server/backend_metric_recorder.cc
+++ b/src/cpp/server/backend_metric_recorder.cc
@@ -16,6 +16,8 @@
 
 #include "src/cpp/server/backend_metric_recorder.h"
 
+#include <grpcpp/ext/call_metric_recorder.h>
+#include <grpcpp/ext/server_metric_recorder.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -25,10 +27,6 @@
 #include <utility>
 
 #include "absl/log/log.h"
-
-#include <grpcpp/ext/call_metric_recorder.h>
-#include <grpcpp/ext/server_metric_recorder.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 
diff --git a/src/cpp/server/backend_metric_recorder.h b/src/cpp/server/backend_metric_recorder.h
index 0863d2b6a31..a556cb9b57f 100644
--- a/src/cpp/server/backend_metric_recorder.h
+++ b/src/cpp/server/backend_metric_recorder.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CPP_SERVER_BACKEND_METRIC_RECORDER_H
 #define GRPC_SRC_CPP_SERVER_BACKEND_METRIC_RECORDER_H
 
+#include <grpcpp/ext/call_metric_recorder.h>
+#include <grpcpp/ext/server_metric_recorder.h>
+#include <grpcpp/impl/sync.h>
+#include <grpcpp/support/string_ref.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -26,12 +30,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpcpp/ext/call_metric_recorder.h>
-#include <grpcpp/ext/server_metric_recorder.h>
-#include <grpcpp/impl/sync.h>
-#include <grpcpp/support/string_ref.h>
-
 #include "src/core/ext/filters/backend_metrics/backend_metric_provider.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 
diff --git a/src/cpp/server/channel_argument_option.cc b/src/cpp/server/channel_argument_option.cc
index 8ddad683cfd..957f99f79ed 100644
--- a/src/cpp/server/channel_argument_option.cc
+++ b/src/cpp/server/channel_argument_option.cc
@@ -16,15 +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 <memory>
+#include <string>
+#include <vector>
+
 namespace grpc {
 
 std::unique_ptr<ServerBuilderOption> MakeChannelArgumentOption(
diff --git a/src/cpp/server/channelz/channelz_service.cc b/src/cpp/server/channelz/channelz_service.cc
index 5b9b2ff2553..3d2dbfe089f 100644
--- a/src/cpp/server/channelz/channelz_service.cc
+++ b/src/cpp/server/channelz/channelz_service.cc
@@ -18,12 +18,12 @@
 
 #include "src/cpp/server/channelz/channelz_service.h"
 
-#include <memory>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>
 
+#include <memory>
+
 // IWYU pragma: no_include "google/protobuf/json/json.h"
 // IWYU pragma: no_include "google/protobuf/util/json_util.h"
 
diff --git a/src/cpp/server/channelz/channelz_service_plugin.cc b/src/cpp/server/channelz/channelz_service_plugin.cc
index a3d842ca145..e69b707e7bf 100644
--- a/src/cpp/server/channelz/channelz_service_plugin.cc
+++ b/src/cpp/server/channelz/channelz_service_plugin.cc
@@ -16,15 +16,15 @@
 //
 //
 
-#include <memory>
-#include <string>
-
 #include <grpc/support/port_platform.h>
 #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 <memory>
+#include <string>
+
 #include "src/cpp/server/channelz/channelz_service.h"
 
 namespace grpc {
diff --git a/src/cpp/server/csds/csds.cc b/src/cpp/server/csds/csds.cc
index d82d2b381c6..bda3a3e0112 100644
--- a/src/cpp/server/csds/csds.cc
+++ b/src/cpp/server/csds/csds.cc
@@ -18,17 +18,17 @@
 
 #include "src/cpp/server/csds/csds.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/support/interceptor.h>
+#include <grpcpp/support/slice.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/support/interceptor.h>
-#include <grpcpp/support/slice.h>
-
 namespace grpc {
 namespace xds {
 namespace experimental {
diff --git a/src/cpp/server/dynamic_thread_pool.h b/src/cpp/server/dynamic_thread_pool.h
index 30da5d1de52..90be3414c7f 100644
--- a/src/cpp/server/dynamic_thread_pool.h
+++ b/src/cpp/server/dynamic_thread_pool.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CPP_SERVER_DYNAMIC_THREAD_POOL_H
 #define GRPC_SRC_CPP_SERVER_DYNAMIC_THREAD_POOL_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <functional>
 #include <memory>
 
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/cpp/server/thread_pool_interface.h"
 
diff --git a/src/cpp/server/external_connection_acceptor_impl.cc b/src/cpp/server/external_connection_acceptor_impl.cc
index 208ac0a37f2..5623dbfa36c 100644
--- a/src/cpp/server/external_connection_acceptor_impl.cc
+++ b/src/cpp/server/external_connection_acceptor_impl.cc
@@ -18,16 +18,16 @@
 
 #include "src/cpp/server/external_connection_acceptor_impl.h"
 
+#include <grpcpp/server_builder.h>
+#include <grpcpp/support/byte_buffer.h>
+#include <grpcpp/support/channel_arguments.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpcpp/server_builder.h>
-#include <grpcpp/support/byte_buffer.h>
-#include <grpcpp/support/channel_arguments.h>
-
 namespace grpc {
 namespace internal {
 namespace {
diff --git a/src/cpp/server/external_connection_acceptor_impl.h b/src/cpp/server/external_connection_acceptor_impl.h
index 3e23eb8a0c0..2ff036fe9ec 100644
--- a/src/cpp/server/external_connection_acceptor_impl.h
+++ b/src/cpp/server/external_connection_acceptor_impl.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_SRC_CPP_SERVER_EXTERNAL_CONNECTION_ACCEPTOR_IMPL_H
 #define GRPC_SRC_CPP_SERVER_EXTERNAL_CONNECTION_ACCEPTOR_IMPL_H
 
-#include <memory>
-#include <string>
-
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <string>
+
 #include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/cpp/server/health/default_health_check_service.cc b/src/cpp/server/health/default_health_check_service.cc
index 179bdf7a2ed..bb86083bb54 100644
--- a/src/cpp/server/health/default_health_check_service.cc
+++ b/src/cpp/server/health/default_health_check_service.cc
@@ -18,6 +18,11 @@
 
 #include "src/cpp/server/health/default_health_check_service.h"
 
+#include <grpc/slice.h>
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/impl/rpc_service_method.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/support/slice.h>
 #include <stdint.h>
 
 #include <memory>
@@ -25,17 +30,10 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
+#include "src/proto/grpc/health/v1/health.upb.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.hpp"
 
-#include <grpc/slice.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/support/slice.h>
-
-#include "src/proto/grpc/health/v1/health.upb.h"
-
 #define MAX_SERVICE_NAME_LENGTH 200
 
 namespace grpc {
diff --git a/src/cpp/server/health/default_health_check_service.h b/src/cpp/server/health/default_health_check_service.h
index 042b057b08f..3a12f66f3a6 100644
--- a/src/cpp/server/health/default_health_check_service.h
+++ b/src/cpp/server/health/default_health_check_service.h
@@ -19,14 +19,6 @@
 #ifndef GRPC_SRC_CPP_SERVER_HEALTH_DEFAULT_HEALTH_CHECK_SERVICE_H
 #define GRPC_SRC_CPP_SERVER_HEALTH_DEFAULT_HEALTH_CHECK_SERVICE_H
 
-#include <stddef.h>
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include "absl/base/thread_annotations.h"
-
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/impl/service_type.h>
@@ -34,7 +26,13 @@
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/server_callback.h>
 #include <grpcpp/support/status.h>
+#include <stddef.h>
 
+#include <map>
+#include <memory>
+#include <string>
+
+#include "absl/base/thread_annotations.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/cpp/server/health/health_check_service_server_builder_option.cc b/src/cpp/server/health/health_check_service_server_builder_option.cc
index c4eac98b470..d353c9c4129 100644
--- 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,15 +16,15 @@
 //
 //
 
-#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>
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 namespace grpc {
 
 HealthCheckServiceServerBuilderOption::HealthCheckServiceServerBuilderOption(
diff --git a/src/cpp/server/insecure_server_credentials.cc b/src/cpp/server/insecure_server_credentials.cc
index a48b9cb93c7..3636fc057c8 100644
--- a/src/cpp/server/insecure_server_credentials.cc
+++ b/src/cpp/server/insecure_server_credentials.cc
@@ -16,13 +16,13 @@
 //
 //
 
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_metadata_processor.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
 namespace grpc {
 namespace {
 class InsecureServerCredentialsImpl final : public ServerCredentials {
diff --git a/src/cpp/server/load_reporter/constants.h b/src/cpp/server/load_reporter/constants.h
index 13b29946441..840a53b9c14 100644
--- a/src/cpp/server/load_reporter/constants.h
+++ b/src/cpp/server/load_reporter/constants.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_CONSTANTS_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_CONSTANTS_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc {
 namespace load_reporter {
 
diff --git a/src/cpp/server/load_reporter/get_cpu_stats.h b/src/cpp/server/load_reporter/get_cpu_stats.h
index 76d91ede495..876202cc148 100644
--- a/src/cpp/server/load_reporter/get_cpu_stats.h
+++ b/src/cpp/server/load_reporter/get_cpu_stats.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_GET_CPU_STATS_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_GET_CPU_STATS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc {
 namespace load_reporter {
 
diff --git a/src/cpp/server/load_reporter/get_cpu_stats_linux.cc b/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
index 4742481c373..ee2fa144c16 100644
--- a/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
+++ b/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #ifdef GPR_LINUX
 
 #include <inttypes.h>
diff --git a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc
index debc4a556b6..70b8c0851e3 100644
--- a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc
+++ b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc
@@ -21,7 +21,6 @@
 #if !defined(GPR_LINUX) && !defined(GPR_WINDOWS) && !defined(GPR_APPLE)
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/cpp/server/load_reporter/get_cpu_stats.h"
 
diff --git a/src/cpp/server/load_reporter/load_data_store.cc b/src/cpp/server/load_reporter/load_data_store.cc
index 649c073efe1..5faa03a4fad 100644
--- a/src/cpp/server/load_reporter/load_data_store.cc
+++ b/src/cpp/server/load_reporter/load_data_store.cc
@@ -18,6 +18,7 @@
 
 #include "src/cpp/server/load_reporter/load_data_store.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -28,9 +29,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/socket_utils.h"
 #include "src/cpp/server/load_reporter/constants.h"
 
diff --git a/src/cpp/server/load_reporter/load_data_store.h b/src/cpp/server/load_reporter/load_data_store.h
index efb102c0909..e27b64ce2e7 100644
--- a/src/cpp/server/load_reporter/load_data_store.h
+++ b/src/cpp/server/load_reporter/load_data_store.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_DATA_STORE_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_DATA_STORE_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/support/config.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -28,9 +30,6 @@
 #include <unordered_map>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-#include <grpcpp/support/config.h>
-
 namespace grpc {
 namespace load_reporter {
 
diff --git a/src/cpp/server/load_reporter/load_reporter.cc b/src/cpp/server/load_reporter/load_reporter.cc
index 6af88e8ba7f..c2aae6635fc 100644
--- a/src/cpp/server/load_reporter/load_reporter.cc
+++ b/src/cpp/server/load_reporter/load_reporter.cc
@@ -18,6 +18,7 @@
 
 #include "src/cpp/server/load_reporter/load_reporter.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdio.h>
 
@@ -30,9 +31,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "opencensus/tags/tag_key.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/server/load_reporter/constants.h"
 #include "src/cpp/server/load_reporter/get_cpu_stats.h"
 
diff --git a/src/cpp/server/load_reporter/load_reporter.h b/src/cpp/server/load_reporter/load_reporter.h
index 4b08ca05bfc..b0123724b6a 100644
--- a/src/cpp/server/load_reporter/load_reporter.h
+++ b/src/cpp/server/load_reporter/load_reporter.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_H
 
+#include <google/protobuf/repeated_ptr_field.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -31,13 +33,8 @@
 #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/port_platform.h>
-
 #include "src/core/util/sync.h"
 #include "src/cpp/server/load_reporter/load_data_store.h"
 #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h"
diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
index fc452fc8ced..6b0adc5b254 100644
--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
@@ -18,17 +18,14 @@
 
 #include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h"
 
-#include <inttypes.h>
-
 #include <google/protobuf/repeated_ptr_field.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 #include <grpcpp/support/status.h>
+#include <inttypes.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/cpp/server/load_reporter/constants.h"
 
 // IWYU pragma: no_include "google/protobuf/duration.pb.h"
diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
index 80210b4af7d..e5597a38188 100644
--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_ASYNC_SERVICE_IMPL_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_ASYNC_SERVICE_IMPL_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/interceptor.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -28,13 +33,6 @@
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/interceptor.h>
-
 #include "src/core/util/sync.h"
 #include "src/core/util/thd.h"
 #include "src/cpp/server/load_reporter/load_reporter.h"
diff --git 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
index ec1926beb1a..665a63fbf9d 100644
--- 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
@@ -16,16 +16,16 @@
 //
 //
 
-#include <algorithm>
-#include <memory>
-#include <vector>
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/ext/server_load_reporting.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <algorithm>
+#include <memory>
+#include <vector>
+
 #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h"
 
 namespace grpc {
diff --git 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
index 766386178ed..248145aa311 100644
--- 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
@@ -18,12 +18,12 @@
 
 #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/server_builder.h>
 
+#include <utility>
+
 namespace grpc {
 namespace load_reporter {
 
diff --git 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
index c1370ec348e..7492fe22d6d 100644
--- 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
@@ -19,15 +19,15 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTING_SERVICE_SERVER_BUILDER_PLUGIN_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTING_SERVICE_SERVER_BUILDER_PLUGIN_H
 
-#include <memory>
-#include <string>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <string>
+
 #include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h"
 
 namespace grpc {
diff --git a/src/cpp/server/load_reporter/util.cc b/src/cpp/server/load_reporter/util.cc
index 043d4ebb480..4d2ddc9c42c 100644
--- a/src/cpp/server/load_reporter/util.cc
+++ b/src/cpp/server/load_reporter/util.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/load_reporting.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/server_load_reporting.h>
+#include <grpcpp/server_context.h>
 #include <string.h>
 
 #include <cmath>
@@ -23,11 +27,6 @@
 
 #include "absl/log/log.h"
 
-#include <grpc/load_reporting.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/server_load_reporting.h>
-#include <grpcpp/server_context.h>
-
 namespace grpc {
 namespace load_reporter {
 namespace experimental {
diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc
index 45829844e8f..6d5175d87e4 100644
--- a/src/cpp/server/orca/orca_service.cc
+++ b/src/cpp/server/orca/orca_service.cc
@@ -14,23 +14,6 @@
 // limitations under the License.
 //
 
-#include <stddef.h>
-
-#include <map>
-#include <memory>
-#include <utility>
-
-#include "absl/base/thread_annotations.h"
-#include "absl/log/check.h"
-#include "absl/strings/string_view.h"
-#include "absl/time/time.h"
-#include "absl/types/optional.h"
-#include "google/protobuf/duration.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-#include "xds/data/orca/v3/orca_load_report.upb.h"
-#include "xds/service/orca/v3/orca.upb.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpcpp/ext/orca_service.h>
 #include <grpcpp/ext/server_metric_recorder.h>
@@ -43,7 +26,18 @@
 #include <grpcpp/support/server_callback.h>
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
+#include <stddef.h>
+
+#include <map>
+#include <memory>
+#include <utility>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
+#include "absl/strings/string_view.h"
+#include "absl/time/time.h"
+#include "absl/types/optional.h"
+#include "google/protobuf/duration.upb.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/load_balancing/backend_metric_data.h"
@@ -52,6 +46,10 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
 #include "src/cpp/server/backend_metric_recorder.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
+#include "xds/data/orca/v3/orca_load_report.upb.h"
+#include "xds/service/orca/v3/orca.upb.h"
 
 namespace grpc {
 namespace experimental {
diff --git a/src/cpp/server/secure_server_credentials.cc b/src/cpp/server/secure_server_credentials.cc
index 4a68e8e33c2..a522a9fdcdd 100644
--- a/src/cpp/server/secure_server_credentials.cc
+++ b/src/cpp/server/secure_server_credentials.cc
@@ -18,10 +18,6 @@
 
 #include "src/cpp/server/secure_server_credentials.h"
 
-#include <memory>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
 #include <grpcpp/security/auth_metadata_processor.h>
@@ -30,6 +26,10 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include "src/cpp/common/secure_auth_context.h"
 
 namespace grpc {
diff --git a/src/cpp/server/secure_server_credentials.h b/src/cpp/server/secure_server_credentials.h
index 3167b257a4b..cb1b9927f77 100644
--- a/src/cpp/server/secure_server_credentials.h
+++ b/src/cpp/server/secure_server_credentials.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_SRC_CPP_SERVER_SECURE_SERVER_CREDENTIALS_H
 #define GRPC_SRC_CPP_SERVER_SECURE_SERVER_CREDENTIALS_H
 
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_metadata_processor.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
 #include "src/cpp/server/thread_pool_interface.h"
 
 namespace grpc {
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index b20aa88113c..1e611449931 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -16,18 +16,6 @@
 //
 //
 
-#include <limits.h>
-#include <string.h>
-
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/compression_types.h>
@@ -47,7 +35,17 @@
 #include <grpcpp/server_interface.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/server_interceptor.h>
+#include <limits.h>
+#include <string.h>
 
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/ext/transport/chttp2/server/chttp2_server.h"
 #include "src/core/server/server.h"
 #include "src/core/util/string.h"
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 8996e78b4d8..49cb31dcb48 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -15,24 +15,6 @@
 //
 //
 
-#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/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
@@ -67,7 +49,23 @@
 #include <grpcpp/support/server_interceptor.h>
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
+#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/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index ed1080aeaf6..ca8e3a4728f 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -17,22 +17,6 @@
 //
 
 #include <assert.h>
-
-#include <atomic>
-#include <cstdlib>
-#include <functional>
-#include <map>
-#include <memory>
-#include <new>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
@@ -56,6 +40,20 @@
 #include <grpcpp/support/server_interceptor.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <atomic>
+#include <cstdlib>
+#include <functional>
+#include <map>
+#include <memory>
+#include <new>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/util/crash.h"
diff --git a/src/cpp/server/xds_server_credentials.cc b/src/cpp/server/xds_server_credentials.cc
index df05e254d45..6ce2d70570b 100644
--- a/src/cpp/server/xds_server_credentials.cc
+++ b/src/cpp/server/xds_server_credentials.cc
@@ -16,14 +16,14 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
+
 namespace grpc {
 
 std::shared_ptr<ServerCredentials> XdsServerCredentials(
diff --git a/src/cpp/thread_manager/thread_manager.cc b/src/cpp/thread_manager/thread_manager.cc
index 3128e1c6f41..6cdf78c95bc 100644
--- a/src/cpp/thread_manager/thread_manager.cc
+++ b/src/cpp/thread_manager/thread_manager.cc
@@ -23,7 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/cpp/util/byte_buffer_cc.cc b/src/cpp/util/byte_buffer_cc.cc
index 687df553505..939e38d19e4 100644
--- a/src/cpp/util/byte_buffer_cc.cc
+++ b/src/cpp/util/byte_buffer_cc.cc
@@ -16,9 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <vector>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/grpc.h>
@@ -28,6 +25,9 @@
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
 
+#include <algorithm>
+#include <vector>
+
 namespace grpc {
 
 Status ByteBuffer::TrySingleSlice(Slice* slice) const {
diff --git a/src/cpp/util/status.cc b/src/cpp/util/status.cc
index 3fcaebf8ad0..7d2bdd5566d 100644
--- a/src/cpp/util/status.cc
+++ b/src/cpp/util/status.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <memory>
-
 #include <grpcpp/support/status.h>
 
+#include <memory>
+
 namespace grpc {
 
 const Status& Status::OK = Status();
diff --git a/src/cpp/util/string_ref.cc b/src/cpp/util/string_ref.cc
index 67b2e018a6f..ed60bc6683c 100644
--- a/src/cpp/util/string_ref.cc
+++ b/src/cpp/util/string_ref.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <stddef.h>
-
 #include <grpcpp/support/string_ref.h>
+#include <stddef.h>
 
 namespace grpc {
 
diff --git a/src/cpp/util/time_cc.cc b/src/cpp/util/time_cc.cc
index 458a0e0cf75..64e164a020c 100644
--- a/src/cpp/util/time_cc.cc
+++ b/src/cpp/util/time_cc.cc
@@ -16,12 +16,12 @@
 //
 //
 
-#include <chrono>
-#include <cstdint>
-
 #include <grpc/support/time.h>
 #include <grpcpp/support/time.h>
 
+#include <chrono>
+#include <cstdint>
+
 // IWYU pragma: no_include <ratio>
 
 using std::chrono::duration_cast;
diff --git a/src/objective-c/tests/CppCronetTests/TestHelper.h b/src/objective-c/tests/CppCronetTests/TestHelper.h
index 738161918ed..886c696eca2 100644
--- a/src/objective-c/tests/CppCronetTests/TestHelper.h
+++ b/src/objective-c/tests/CppCronetTests/TestHelper.h
@@ -20,15 +20,14 @@
 #define GRPC_TEST_CPP_IOS_CRONETTESTS_TESTHELPER_H
 
 #import <XCTest/XCTest.h>
-
-#import <map>
-#import <sstream>
-
 #import <grpc/support/time.h>
 #import <grpcpp/support/client_interceptor.h>
 #import <grpcpp/support/config.h>
 #import <grpcpp/support/string_ref.h>
 
+#import <map>
+#import <sstream>
+
 #import "src/proto/grpc/testing/echo.grpc.pb.h"
 
 const char* const kServerFinishAfterNReads = "server_finish_after_n_reads";
diff --git a/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc
index 21c6521f922..66b83488752 100644
--- a/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc
+++ b/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc
@@ -14,6 +14,7 @@
 
 #include "client_call_tracer.h"
 
+#include <grpc/slice.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -25,9 +26,6 @@
 #include "metadata_exchange.h"
 #include "observability_util.h"
 #include "python_observability_context.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h
index bb1b97813f5..34d7196ba74 100644
--- a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h
+++ b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_PYTHON_OPENCENSUS_CLIENT_CALL_TRACER_H
 #define GRPC_PYTHON_OPENCENSUS_CLIENT_CALL_TRACER_H
 
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -27,9 +28,6 @@
 #include "absl/time/time.h"
 #include "metadata_exchange.h"
 #include "python_observability_context.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/telemetry/call_tracer.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc b/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc
index b11ed1d9386..dae2f5e0edf 100644
--- a/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc
+++ b/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc
@@ -18,6 +18,7 @@
 
 #include "metadata_exchange.h"
 
+#include <grpc/slice.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,9 +28,6 @@
 
 #include "absl/strings/string_view.h"
 #include "constants.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/telemetry/call_tracer.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/metadata_exchange.h b/src/python/grpcio_observability/grpc_observability/metadata_exchange.h
index dd971b6b1e5..592a78179a4 100644
--- a/src/python/grpcio_observability/grpc_observability/metadata_exchange.h
+++ b/src/python/grpcio_observability/grpc_observability/metadata_exchange.h
@@ -30,7 +30,6 @@
 #include "absl/strings/string_view.h"
 #include "constants.h"
 #include "python_observability_context.h"
-
 #include "src/core/lib/transport/metadata_batch.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/observability_util.h b/src/python/grpcio_observability/grpc_observability/observability_util.h
index e86ade06afd..5978e26c49f 100644
--- a/src/python/grpcio_observability/grpc_observability/observability_util.h
+++ b/src/python/grpcio_observability/grpc_observability/observability_util.h
@@ -15,6 +15,7 @@
 #ifndef OBSERVABILITY_MAIN_H
 #define OBSERVABILITY_MAIN_H
 
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -29,8 +30,6 @@
 #include "constants.h"
 #include "python_observability_context.h"
 
-#include <grpc/status.h>
-
 namespace grpc_observability {
 
 struct CensusData {
diff --git a/src/python/grpcio_observability/grpc_observability/python_observability_context.cc b/src/python/grpcio_observability/grpc_observability/python_observability_context.cc
index 5cc7c41beee..bca2455c87e 100644
--- a/src/python/grpcio_observability/grpc_observability/python_observability_context.cc
+++ b/src/python/grpcio_observability/grpc_observability/python_observability_context.cc
@@ -24,7 +24,6 @@
 #include "absl/random/random.h"
 #include "absl/strings/escaping.h"
 #include "rpc_encoding.h"
-
 #include "src/core/lib/transport/transport.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/python_observability_context.h b/src/python/grpcio_observability/grpc_observability/python_observability_context.h
index 16b05d63128..9c347098933 100644
--- a/src/python/grpcio_observability/grpc_observability/python_observability_context.h
+++ b/src/python/grpcio_observability/grpc_observability/python_observability_context.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_PYTHON_OBSERVABILITY_H
 #define GRPC_PYTHON_OBSERVABILITY_H
 
+#include <grpc/slice.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -29,9 +30,6 @@
 #include "absl/time/time.h"
 #include "constants.h"
 #include "sampler.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/rpc_encoding.h b/src/python/grpcio_observability/grpc_observability/rpc_encoding.h
index 4fd5c94ea46..f73f4b84e18 100644
--- a/src/python/grpcio_observability/grpc_observability/rpc_encoding.h
+++ b/src/python/grpcio_observability/grpc_observability/rpc_encoding.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_PYTHON_OPENCENSUS_RPC_ENCODING_H
 #define GRPC_PYTHON_OPENCENSUS_RPC_ENCODING_H
 
+#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 <grpc/support/port_platform.h>
-
 namespace grpc_observability {
 
 // TODO(xuanwn): Reuse c++ rpc_encoding file.
diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
index bc19a8e672d..4695758b908 100644
--- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
+++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
@@ -14,6 +14,7 @@
 
 #include "server_call_tracer.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -32,9 +33,6 @@
 #include "constants.h"
 #include "observability_util.h"
 #include "python_observability_context.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
index f125b9cca62..ccb4a21bd3b 100644
--- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
+++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_PYTHON_OPENCENSUS_SERVER_CALL_TRACER_H
 #define GRPC_PYTHON_OPENCENSUS_SERVER_CALL_TRACER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 
 #include "absl/strings/string_view.h"
@@ -22,9 +24,6 @@
 #include "constants.h"
 #include "metadata_exchange.h"
 #include "python_observability_context.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/src/ruby/ext/grpc/rb_byte_buffer.c b/src/ruby/ext/grpc/rb_byte_buffer.c
index ffd95330d2a..f71516f0bf8 100644
--- a/src/ruby/ext/grpc/rb_byte_buffer.c
+++ b/src/ruby/ext/grpc/rb_byte_buffer.c
@@ -20,13 +20,13 @@
 
 #include "rb_byte_buffer.h"
 
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
+
 grpc_byte_buffer* grpc_rb_s_to_byte_buffer(char* string, size_t length) {
   grpc_slice slice = grpc_slice_from_copied_buffer(string, length);
   grpc_byte_buffer* buffer = grpc_raw_byte_buffer_create(&slice, 1);
diff --git a/src/ruby/ext/grpc/rb_call.c b/src/ruby/ext/grpc/rb_call.c
index 2ef9b6a54f7..0f3b33da801 100644
--- a/src/ruby/ext/grpc/rb_call.c
+++ b/src/ruby/ext/grpc/rb_call.c
@@ -20,17 +20,17 @@
 
 #include "rb_call.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/codegen/compression_types.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+
 #include "rb_byte_buffer.h"
 #include "rb_call_credentials.h"
 #include "rb_completion_queue.h"
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/grpc.h>
-#include <grpc/impl/codegen/compression_types.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-
 /* grpc_rb_cCall is the Call class whose instances proxy grpc_call. */
 static VALUE grpc_rb_cCall;
 
diff --git a/src/ruby/ext/grpc/rb_call_credentials.c b/src/ruby/ext/grpc/rb_call_credentials.c
index 8c69c82b1e3..9957f3937e7 100644
--- a/src/ruby/ext/grpc/rb_call_credentials.c
+++ b/src/ruby/ext/grpc/rb_call_credentials.c
@@ -20,6 +20,11 @@
 
 #include "rb_call_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
 #include <ruby/thread.h>
 
 #include "rb_call.h"
@@ -27,12 +32,6 @@
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-
 /* grpc_rb_cCallCredentials is the ruby class that proxies
  * grpc_call_credentials */
 static VALUE grpc_rb_cCallCredentials = Qnil;
diff --git a/src/ruby/ext/grpc/rb_channel.c b/src/ruby/ext/grpc/rb_channel.c
index 2c800d8b9ec..76d2f39f17d 100644
--- a/src/ruby/ext/grpc/rb_channel.c
+++ b/src/ruby/ext/grpc/rb_channel.c
@@ -20,6 +20,12 @@
 
 #include "rb_channel.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <ruby/thread.h>
 
 #include "rb_byte_buffer.h"
@@ -32,13 +38,6 @@
 #include "rb_server.h"
 #include "rb_xds_channel_credentials.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 /* id_channel is the name of the hidden ivar that preserves a reference to the
  * channel on a call, so that calls are not GCed before their channel.  */
 static ID id_channel;
diff --git a/src/ruby/ext/grpc/rb_channel_args.c b/src/ruby/ext/grpc/rb_channel_args.c
index 4c252397e2a..d7f67297be6 100644
--- a/src/ruby/ext/grpc/rb_channel_args.c
+++ b/src/ruby/ext/grpc/rb_channel_args.c
@@ -20,14 +20,14 @@
 
 #include "rb_channel_args.h"
 
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
+
 static rb_data_type_t grpc_rb_channel_args_data_type = {
     "grpc_channel_args",
     {GRPC_RB_GC_NOT_MARKED,
diff --git a/src/ruby/ext/grpc/rb_channel_credentials.c b/src/ruby/ext/grpc/rb_channel_credentials.c
index e570bfb707f..9b1931954be 100644
--- a/src/ruby/ext/grpc/rb_channel_credentials.c
+++ b/src/ruby/ext/grpc/rb_channel_credentials.c
@@ -20,17 +20,16 @@
 
 #include "rb_channel_credentials.h"
 
-#include <string.h>
-
-#include "rb_call_credentials.h"
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <string.h>
+
+#include "rb_call_credentials.h"
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
 
 /* grpc_rb_cChannelCredentials is the ruby class that proxies
    grpc_channel_credentials. */
diff --git a/src/ruby/ext/grpc/rb_channel_credentials.h b/src/ruby/ext/grpc/rb_channel_credentials.h
index 75bda4b25ad..ecc02e449ba 100644
--- a/src/ruby/ext/grpc/rb_channel_credentials.h
+++ b/src/ruby/ext/grpc/rb_channel_credentials.h
@@ -21,9 +21,8 @@
 
 #include <ruby/ruby.h>
 
-#include <stdbool.h>
-
 #include <grpc/grpc_security.h>
+#include <stdbool.h>
 
 /* Initializes the ruby ChannelCredentials class. */
 void Init_grpc_channel_credentials();
diff --git a/src/ruby/ext/grpc/rb_completion_queue.c b/src/ruby/ext/grpc/rb_completion_queue.c
index 6a4bb9c3072..91047ec14cc 100644
--- a/src/ruby/ext/grpc/rb_completion_queue.c
+++ b/src/ruby/ext/grpc/rb_completion_queue.c
@@ -20,15 +20,14 @@
 
 #include "rb_completion_queue.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <ruby/thread.h>
 
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 /* Used to allow grpc_completion_queue_next call to release the GIL */
 typedef struct next_call_stack {
   grpc_completion_queue* cq;
diff --git a/src/ruby/ext/grpc/rb_compression_options.c b/src/ruby/ext/grpc/rb_compression_options.c
index a38790faf79..062d5362c3e 100644
--- a/src/ruby/ext/grpc/rb_compression_options.c
+++ b/src/ruby/ext/grpc/rb_compression_options.c
@@ -20,12 +20,6 @@
 
 #include "rb_compression_options.h"
 
-#include <string.h>
-
-#include "rb_byte_buffer.h"
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/codegen/compression_types.h>
@@ -33,6 +27,11 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
+#include <string.h>
+
+#include "rb_byte_buffer.h"
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
 
 static VALUE grpc_rb_cCompressionOptions = Qnil;
 
diff --git a/src/ruby/ext/grpc/rb_event_thread.c b/src/ruby/ext/grpc/rb_event_thread.c
index 0d7ec2ea2f4..014dd2dcd88 100644
--- a/src/ruby/ext/grpc/rb_event_thread.c
+++ b/src/ruby/ext/grpc/rb_event_thread.c
@@ -20,17 +20,16 @@
 
 #include "rb_event_thread.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <ruby/thread.h>
 #include <stdbool.h>
 
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 typedef struct grpc_rb_event {
   // callback will be called with argument while holding the GVL
   void (*callback)(void*);
diff --git a/src/ruby/ext/grpc/rb_grpc.c b/src/ruby/ext/grpc/rb_grpc.c
index b26ddf357c0..ac66b590782 100644
--- a/src/ruby/ext/grpc/rb_grpc.c
+++ b/src/ruby/ext/grpc/rb_grpc.c
@@ -20,6 +20,9 @@
 
 #include "rb_grpc.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <math.h>
 #include <ruby/vm.h>
 #include <stdbool.h>
@@ -39,10 +42,6 @@
 #include "rb_xds_channel_credentials.h"
 #include "rb_xds_server_credentials.h"
 
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 #ifdef GPR_LINUX
 #include <sys/syscall.h>
 #include <unistd.h>
diff --git a/src/ruby/ext/grpc/rb_grpc.h b/src/ruby/ext/grpc/rb_grpc.h
index 7518b79e390..01b7e0d4c78 100644
--- a/src/ruby/ext/grpc/rb_grpc.h
+++ b/src/ruby/ext/grpc/rb_grpc.h
@@ -21,9 +21,8 @@
 
 #include <ruby/ruby.h>
 
-#include <stdlib.h>
-
 #include <grpc/support/time.h>
+#include <stdlib.h>
 
 /* grpc_rb_mGrpcCore is the module containing the ruby wrapper GRPC classes. */
 extern VALUE grpc_rb_mGrpcCore;
diff --git a/src/ruby/ext/grpc/rb_server.c b/src/ruby/ext/grpc/rb_server.c
index 09e8788b9ed..f80b40ae70e 100644
--- a/src/ruby/ext/grpc/rb_server.c
+++ b/src/ruby/ext/grpc/rb_server.c
@@ -20,6 +20,12 @@
 
 #include "rb_server.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/log.h>
+
 #include "rb_byte_buffer.h"
 #include "rb_call.h"
 #include "rb_channel_args.h"
@@ -29,12 +35,6 @@
 #include "rb_server_credentials.h"
 #include "rb_xds_server_credentials.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/log.h>
-
 /* grpc_rb_cServer is the ruby class that proxies grpc_server. */
 static VALUE grpc_rb_cServer = Qnil;
 
diff --git a/src/ruby/ext/grpc/rb_server_credentials.c b/src/ruby/ext/grpc/rb_server_credentials.c
index 73c754d5352..121f888f897 100644
--- a/src/ruby/ext/grpc/rb_server_credentials.c
+++ b/src/ruby/ext/grpc/rb_server_credentials.c
@@ -20,14 +20,14 @@
 
 #include "rb_server_credentials.h"
 
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/log.h>
 
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
+
 /* grpc_rb_cServerCredentials is the ruby class that proxies
    grpc_server_credentials. */
 static VALUE grpc_rb_cServerCredentials = Qnil;
diff --git a/src/ruby/ext/grpc/rb_server_credentials.h b/src/ruby/ext/grpc/rb_server_credentials.h
index 64b22715d99..35db1ed328f 100644
--- a/src/ruby/ext/grpc/rb_server_credentials.h
+++ b/src/ruby/ext/grpc/rb_server_credentials.h
@@ -21,10 +21,9 @@
 
 #include <ruby/ruby.h>
 
-#include <stdbool.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
+#include <stdbool.h>
 
 /* Initializes the ruby ServerCredentials class. */
 void Init_grpc_server_credentials();
diff --git a/src/ruby/ext/grpc/rb_xds_channel_credentials.c b/src/ruby/ext/grpc/rb_xds_channel_credentials.c
index 56b08d99287..124bc8b3378 100644
--- a/src/ruby/ext/grpc/rb_xds_channel_credentials.c
+++ b/src/ruby/ext/grpc/rb_xds_channel_credentials.c
@@ -20,6 +20,11 @@
 
 #include "rb_xds_channel_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
 #include <string.h>
 
 #include "rb_call_credentials.h"
@@ -27,12 +32,6 @@
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-
 /* grpc_rb_cXdsChannelCredentials is the ruby class that proxies
    grpc_channel_credentials. */
 static VALUE grpc_rb_cXdsChannelCredentials = Qnil;
diff --git a/src/ruby/ext/grpc/rb_xds_channel_credentials.h b/src/ruby/ext/grpc/rb_xds_channel_credentials.h
index 5eba040ba17..a66f974413b 100644
--- a/src/ruby/ext/grpc/rb_xds_channel_credentials.h
+++ b/src/ruby/ext/grpc/rb_xds_channel_credentials.h
@@ -21,9 +21,8 @@
 
 #include <ruby/ruby.h>
 
-#include <stdbool.h>
-
 #include <grpc/grpc_security.h>
+#include <stdbool.h>
 
 /* Initializes the ruby ChannelCredentials class. */
 void Init_grpc_xds_channel_credentials();
diff --git a/src/ruby/ext/grpc/rb_xds_server_credentials.c b/src/ruby/ext/grpc/rb_xds_server_credentials.c
index 8186d0eb49e..703e3e99b4b 100644
--- a/src/ruby/ext/grpc/rb_xds_server_credentials.c
+++ b/src/ruby/ext/grpc/rb_xds_server_credentials.c
@@ -20,15 +20,15 @@
 
 #include "rb_xds_server_credentials.h"
 
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-#include "rb_server_credentials.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/log.h>
 
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
+#include "rb_server_credentials.h"
+
 /* grpc_rb_cXdsServerCredentials is the ruby class that proxies
    grpc_server_credentials. */
 static VALUE grpc_rb_cXdsServerCredentials = Qnil;
diff --git a/src/ruby/ext/grpc/rb_xds_server_credentials.h b/src/ruby/ext/grpc/rb_xds_server_credentials.h
index 3ec1ced8e4b..59de9824a63 100644
--- a/src/ruby/ext/grpc/rb_xds_server_credentials.h
+++ b/src/ruby/ext/grpc/rb_xds_server_credentials.h
@@ -21,10 +21,9 @@
 
 #include <ruby/ruby.h>
 
-#include <stdbool.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
+#include <stdbool.h>
 
 /* Initializes the ruby XdsServerCredentials class. */
 void Init_grpc_xds_server_credentials();
diff --git a/test/core/address_utils/parse_address_test.cc b/test/core/address_utils/parse_address_test.cc
index 41b9df4bd5d..3bc09f0490a 100644
--- a/test/core/address_utils/parse_address_test.cc
+++ b/test/core/address_utils/parse_address_test.cc
@@ -32,15 +32,14 @@
 #include <linux/vm_sockets.h>
 #endif
 
+#include <grpc/grpc.h>
+
 #include <string>
 
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/match.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/core/address_utils/parse_address_with_named_scope_id_test.cc b/test/core/address_utils/parse_address_with_named_scope_id_test.cc
index c8e85ad1e26..0924eb2b33f 100644
--- a/test/core/address_utils/parse_address_with_named_scope_id_test.cc
+++ b/test/core/address_utils/parse_address_with_named_scope_id_test.cc
@@ -16,16 +16,17 @@
 //
 //
 
+#include <grpc/support/alloc.h>
 #include <inttypes.h>
 #include <net/if.h>
 #include <netdb.h>
 #include <string.h>
-
-#include <grpc/support/alloc.h>
 #ifdef GRPC_HAVE_UNIX_SOCKET
 #include <sys/un.h>
 #endif
 
+#include <grpc/grpc.h>
+
 #include <string>
 
 #include "absl/log/log.h"
@@ -33,9 +34,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc
index 8c63854a203..08b80672f16 100644
--- a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc
+++ b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc
@@ -21,7 +21,6 @@
 
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/test/core/address_utils/sockaddr_utils_test.cc b/test/core/address_utils/sockaddr_utils_test.cc
index 83de472f102..234e4fe9896 100644
--- a/test/core/address_utils/sockaddr_utils_test.cc
+++ b/test/core/address_utils/sockaddr_utils_test.cc
@@ -17,6 +17,7 @@
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 
 #include <errno.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -24,9 +25,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #ifdef GRPC_HAVE_UNIX_SOCKET
@@ -43,7 +41,6 @@
 #include <string>
 
 #include "absl/log/check.h"
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc
index f338e2dc0a4..83c05a2ad9b 100644
--- a/test/core/bad_client/bad_client.cc
+++ b/test/core/bad_client/bad_client.cc
@@ -18,18 +18,16 @@
 
 #include "test/core/bad_client/bad_client.h"
 
-#include <inttypes.h>
-#include <limits.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <limits.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/bad_client/bad_client.h b/test/core/bad_client/bad_client.h
index 57a8d92c6e6..fba8a07b354 100644
--- a/test/core/bad_client/bad_client.h
+++ b/test/core/bad_client/bad_client.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H
 #define GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define GRPC_BAD_CLIENT_REGISTERED_METHOD "/registered/bar"
 #define GRPC_BAD_CLIENT_REGISTERED_HOST "localhost"
diff --git a/test/core/bad_client/tests/bad_streaming_id.cc b/test/core/bad_client/tests/bad_streaming_id.cc
index 4cd7cbc5778..a8018ae6acd 100644
--- a/test/core/bad_client/tests/bad_streaming_id.cc
+++ b/test/core/bad_client/tests/bad_streaming_id.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <memory>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include "absl/log/check.h"
-
-#include <grpc/grpc.h>
+#include <memory>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/badreq.cc b/test/core/bad_client/tests/badreq.cc
index 27a01496d97..7cfa2ace385 100644
--- a/test/core/bad_client/tests/badreq.cc
+++ b/test/core/bad_client/tests/badreq.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/connection_prefix.cc b/test/core/bad_client/tests/connection_prefix.cc
index 1aa899ab707..c1c34a25d94 100644
--- a/test/core/bad_client/tests/connection_prefix.cc
+++ b/test/core/bad_client/tests/connection_prefix.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/duplicate_header.cc b/test/core/bad_client/tests/duplicate_header.cc
index b31c9663218..919ae4eeefb 100644
--- a/test/core/bad_client/tests/duplicate_header.cc
+++ b/test/core/bad_client/tests/duplicate_header.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/time.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
diff --git a/test/core/bad_client/tests/head_of_line_blocking.cc b/test/core/bad_client/tests/head_of_line_blocking.cc
index 2a46c836780..bce31bc893d 100644
--- a/test/core/bad_client/tests/head_of_line_blocking.cc
+++ b/test/core/bad_client/tests/head_of_line_blocking.cc
@@ -16,18 +16,16 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <algorithm>
 
 #include "absl/log/check.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/headers.cc b/test/core/bad_client/tests/headers.cc
index 0aa31a507c3..468f19a34d1 100644
--- a/test/core/bad_client/tests/headers.cc
+++ b/test/core/bad_client/tests/headers.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/initial_settings_frame.cc b/test/core/bad_client/tests/initial_settings_frame.cc
index deca4fdaebd..d4231c9c373 100644
--- a/test/core/bad_client/tests/initial_settings_frame.cc
+++ b/test/core/bad_client/tests/initial_settings_frame.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
diff --git a/test/core/bad_client/tests/out_of_bounds.cc b/test/core/bad_client/tests/out_of_bounds.cc
index 04cdf739c41..9abb44f777c 100644
--- a/test/core/bad_client/tests/out_of_bounds.cc
+++ b/test/core/bad_client/tests/out_of_bounds.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <string>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include "absl/log/check.h"
-
-#include <grpc/grpc.h>
+#include <string>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/server_registered_method.cc b/test/core/bad_client/tests/server_registered_method.cc
index 731eeb91acc..04adbc14a16 100644
--- a/test/core/bad_client/tests/server_registered_method.cc
+++ b/test/core/bad_client/tests/server_registered_method.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
diff --git a/test/core/bad_client/tests/simple_request.cc b/test/core/bad_client/tests/simple_request.cc
index 6732d76147d..52db06cccb3 100644
--- a/test/core/bad_client/tests/simple_request.cc
+++ b/test/core/bad_client/tests/simple_request.cc
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
diff --git a/test/core/bad_client/tests/unknown_frame.cc b/test/core/bad_client/tests/unknown_frame.cc
index a7c908ca483..1357b3208af 100644
--- a/test/core/bad_client/tests/unknown_frame.cc
+++ b/test/core/bad_client/tests/unknown_frame.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <string>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include "absl/log/check.h"
-
-#include <grpc/grpc.h>
+#include <string>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/window_overflow.cc b/test/core/bad_client/tests/window_overflow.cc
index 3137921591e..6cf962bb42a 100644
--- a/test/core/bad_client/tests/window_overflow.cc
+++ b/test/core/bad_client/tests/window_overflow.cc
@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <algorithm>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_connection/close_fd_test.cc b/test/core/bad_connection/close_fd_test.cc
index 41bd7021a0f..258a4cbe30e 100644
--- a/test/core/bad_connection/close_fd_test.cc
+++ b/test/core/bad_connection/close_fd_test.cc
@@ -21,19 +21,17 @@
 // an RPC call is in progress.
 //
 //
-#include <stdint.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/propagation_bits.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/time.h>
+#include <stdint.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_format.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/endpoint.h"
@@ -49,12 +47,11 @@
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_TCP
 
-#include <string.h>
-#include <unistd.h>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc
index 51fad155944..d7a367c5868 100644
--- a/test/core/bad_ssl/bad_ssl_test.cc
+++ b/test/core/bad_ssl/bad_ssl_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include <string>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -33,7 +26,12 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
+#include <stdio.h>
+#include <string.h>
 
+#include <string>
+
+#include "absl/log/check.h"
 #include "src/core/util/env.h"
 #include "src/core/util/host_port.h"
 #include "src/core/util/subprocess.h"
diff --git a/test/core/bad_ssl/server_common.cc b/test/core/bad_ssl/server_common.cc
index e76708b1969..a503b1dc835 100644
--- a/test/core/bad_ssl/server_common.cc
+++ b/test/core/bad_ssl/server_common.cc
@@ -18,13 +18,11 @@
 
 #include "test/core/bad_ssl/server_common.h"
 
+#include <grpc/support/time.h>
 #include <signal.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/time.h>
-
 #include "test/core/test_util/cmdline.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/bad_ssl/servers/alpn.cc b/test/core/bad_ssl/servers/alpn.cc
index 285488747c8..af6bebf6213 100644
--- a/test/core/bad_ssl/servers/alpn.cc
+++ b/test/core/bad_ssl/servers/alpn.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/alpn/alpn.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/useful.h"
 #include "test/core/bad_ssl/server_common.h"
diff --git a/test/core/bad_ssl/servers/cert.cc b/test/core/bad_ssl/servers/cert.cc
index 30d1b7fc8fd..e7f37f0a011 100644
--- a/test/core/bad_ssl/servers/cert.cc
+++ b/test/core/bad_ssl/servers/cert.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/error.h"
 #include "test/core/bad_ssl/server_common.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/core/call/batch_builder.h b/test/core/call/batch_builder.h
index 40202ea25dc..fec948b8b62 100644
--- a/test/core/call/batch_builder.h
+++ b/test/core/call/batch_builder.h
@@ -17,7 +17,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/slice/slice.h"
 #include "test/core/end2end/cq_verifier.h"
 
diff --git a/test/core/call/bm_client_call.cc b/test/core/call/bm_client_call.cc
index 78e4a2a4196..b79ae1f9caf 100644
--- a/test/core/call/bm_client_call.cc
+++ b/test/core/call/bm_client_call.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/call/call_utils_test.cc b/test/core/call/call_utils_test.cc
index f9a8fdae345..323b3069394 100644
--- a/test/core/call/call_utils_test.cc
+++ b/test/core/call/call_utils_test.cc
@@ -14,12 +14,12 @@
 
 #include "src/core/lib/surface/call_utils.h"
 
+#include <grpc/grpc.h>
+
 #include <initializer_list>
 
 #include "gtest/gtest.h"
 
-#include <grpc/grpc.h>
-
 namespace grpc_core {
 
 TEST(CallUtils, AreWriteFlagsValid) {
diff --git a/test/core/call/client_call_test.cc b/test/core/call/client_call_test.cc
index ef9ba6cd1a4..78225dbea07 100644
--- a/test/core/call/client_call_test.cc
+++ b/test/core/call/client_call_test.cc
@@ -14,11 +14,10 @@
 
 #include "src/core/lib/surface/client_call.h"
 
-#include "absl/status/status.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 
+#include "absl/status/status.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/metadata.h"
 #include "src/core/util/debug_location.h"
diff --git a/test/core/call/request_buffer_test.cc b/test/core/call/request_buffer_test.cc
index 98aba0ac495..9e9f9a3fc6a 100644
--- a/test/core/call/request_buffer_test.cc
+++ b/test/core/call/request_buffer_test.cc
@@ -15,7 +15,6 @@
 #include "src/core/call/request_buffer.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/promise/poll_matcher.h"
 
 using testing::Mock;
diff --git a/test/core/call/server_call_test.cc b/test/core/call/server_call_test.cc
index b42f0503203..6e1db3b4d92 100644
--- a/test/core/call/server_call_test.cc
+++ b/test/core/call/server_call_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/lib/surface/server_call.h"
 
-#include <atomic>
-
-#include "absl/status/status.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 
+#include <atomic>
+
+#include "absl/status/status.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/call/yodel/fuzzer_main.cc b/test/core/call/yodel/fuzzer_main.cc
index 0f14c28eb51..7e7f37224f0 100644
--- a/test/core/call/yodel/fuzzer_main.cc
+++ b/test/core/call/yodel/fuzzer_main.cc
@@ -12,14 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <stdio.h>
-
+#include <grpc/event_engine/event_engine.h>
 #include <gtest/gtest.h>
+#include <stdio.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/config.h"
diff --git a/test/core/call/yodel/test_main.cc b/test/core/call/yodel/test_main.cc
index 22b1ff3d561..5cdd9dead55 100644
--- a/test/core/call/yodel/test_main.cc
+++ b/test/core/call/yodel/test_main.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "absl/random/random.h"
-
 #include "src/core/lib/debug/trace.h"
 #include "test/core/call/yodel/yodel_test.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/call/yodel/yodel_test.cc b/test/core/call/yodel/yodel_test.cc
index ccd31f35fb9..f9969184867 100644
--- a/test/core/call/yodel/yodel_test.cc
+++ b/test/core/call/yodel/yodel_test.cc
@@ -17,7 +17,6 @@
 #include <memory>
 
 #include "absl/random/random.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/test/core/call/yodel/yodel_test.h b/test/core/call/yodel/yodel_test.h
index 7ccb97e7d6a..518e6f0e64f 100644
--- a/test/core/call/yodel/yodel_test.h
+++ b/test/core/call/yodel/yodel_test.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_TEST_CORE_CALL_YODEL_YODEL_TEST_H
 #define GRPC_TEST_CORE_CALL_YODEL_YODEL_TEST_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include "absl/functional/any_invocable.h"
 #include "absl/log/log.h"
 #include "absl/random/bit_gen_ref.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/promise/cancel_callback.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
diff --git a/test/core/channel/call_finalization_test.cc b/test/core/channel/call_finalization_test.cc
index 9e7ba84794d..fc07e704681 100644
--- a/test/core/channel/call_finalization_test.cc
+++ b/test/core/channel/call_finalization_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/lib/channel/call_finalization.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc
index bb19b352e21..d79acdbc2e3 100644
--- a/test/core/channel/channel_args_test.cc
+++ b/test/core/channel/channel_args_test.cc
@@ -18,18 +18,16 @@
 
 #include "src/core/lib/channel/channel_args.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "gtest/gtest.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/ref_counted.h"
diff --git a/test/core/channel/channel_stack_builder_test.cc b/test/core/channel/channel_stack_builder_test.cc
index 82bda202df4..1c6ed8995f0 100644
--- a/test/core/channel/channel_stack_builder_test.cc
+++ b/test/core/channel/channel_stack_builder_test.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/lib/channel/channel_stack_builder.h"
 
+#include <grpc/grpc.h>
+
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc
index 1c722beb282..31d5e5fd216 100644
--- a/test/core/channel/channel_stack_test.cc
+++ b/test/core/channel/channel_stack_test.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/channel/channel_stack.h"
 
+#include <grpc/support/alloc.h>
+
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc
index d06f98fba2e..c207c274f80 100644
--- a/test/core/channel/minimal_stack_is_minimal_test.cc
+++ b/test/core/channel/minimal_stack_is_minimal_test.cc
@@ -29,6 +29,9 @@
 // configurations and assess whether such a change is correct and desirable.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -38,10 +41,6 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.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_impl.h"
diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc
index 821087f9d93..c38b9dd737c 100644
--- a/test/core/channel/server_call_tracer_factory_test.cc
+++ b/test/core/channel/server_call_tracer_factory_test.cc
@@ -15,7 +15,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/test/core/channelz/channel_trace_test.cc b/test/core/channelz/channel_trace_test.cc
index e3fab992eb8..72834781eb5 100644
--- a/test/core/channelz/channel_trace_test.cc
+++ b/test/core/channelz/channel_trace_test.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/channelz/channel_trace.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
 #include <stdlib.h>
 
 #include <list>
@@ -27,12 +31,6 @@
 #include "absl/synchronization/notification.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/channelz/channelz_registry_test.cc b/test/core/channelz/channelz_registry_test.cc
index 29110f3f5c1..3dbd7a80b9e 100644
--- a/test/core/channelz/channelz_registry_test.cc
+++ b/test/core/channelz/channelz_registry_test.cc
@@ -24,7 +24,6 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-
 #include "src/core/channelz/channelz.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/channelz/channelz_test.cc b/test/core/channelz/channelz_test.cc
index a43950eefbb..ce58754cb74 100644
--- a/test/core/channelz/channelz_test.cc
+++ b/test/core/channelz/channelz_test.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/channelz/channelz.h"
 
+#include <grpc/credentials.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/time.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -29,16 +37,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz_registry.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/client_channel/bm_client_channel.cc b/test/core/client_channel/bm_client_channel.cc
index 1ee51257c9f..566da748da9 100644
--- a/test/core/client_channel/bm_client_channel.cc
+++ b/test/core/client_channel/bm_client_channel.cc
@@ -13,12 +13,10 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "test/core/transport/call_spine_benchmarks.h"
diff --git a/test/core/client_channel/bm_load_balanced_call_destination.cc b/test/core/client_channel/bm_load_balanced_call_destination.cc
index f3a52f40ae9..555e51bdcc5 100644
--- a/test/core/client_channel/bm_load_balanced_call_destination.cc
+++ b/test/core/client_channel/bm_load_balanced_call_destination.cc
@@ -13,12 +13,10 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/load_balanced_call_destination.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "test/core/transport/call_spine_benchmarks.h"
diff --git a/test/core/client_channel/client_channel_service_config_test.cc b/test/core/client_channel/client_channel_service_config_test.cc
index 28ffddf7f31..67b6af99e43 100644
--- a/test/core/client_channel/client_channel_service_config_test.cc
+++ b/test/core/client_channel/client_channel_service_config_test.cc
@@ -16,13 +16,12 @@
 
 #include "src/core/client_channel/client_channel_service_config.h"
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config.h"
diff --git a/test/core/client_channel/client_channel_test.cc b/test/core/client_channel/client_channel_test.cc
index 2c624c3b9c9..4dc980f5855 100644
--- a/test/core/client_channel/client_channel_test.cc
+++ b/test/core/client_channel/client_channel_test.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/client_channel/client_channel.h"
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/client_channel/connected_subchannel_test.cc b/test/core/client_channel/connected_subchannel_test.cc
index 98f5b26207f..619577d719e 100644
--- a/test/core/client_channel/connected_subchannel_test.cc
+++ b/test/core/client_channel/connected_subchannel_test.cc
@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/client_channel/local_subchannel_pool.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/test/core/client_channel/lb_metadata_test.cc b/test/core/client_channel/lb_metadata_test.cc
index 0ad10a62971..3d88972714c 100644
--- a/test/core/client_channel/lb_metadata_test.cc
+++ b/test/core/client_channel/lb_metadata_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/client_channel/load_balanced_call_destination_test.cc b/test/core/client_channel/load_balanced_call_destination_test.cc
index 399f7bddc5a..268ea7825d4 100644
--- a/test/core/client_channel/load_balanced_call_destination_test.cc
+++ b/test/core/client_channel/load_balanced_call_destination_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/client_channel/load_balanced_call_destination.h"
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 #include <queue>
@@ -21,9 +23,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "test/core/call/yodel/yodel_test.h"
 
 using testing::StrictMock;
diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc
index 5578e18ed11..b44bf119ec9 100644
--- a/test/core/client_channel/retry_service_config_test.cc
+++ b/test/core/client_channel/retry_service_config_test.cc
@@ -16,15 +16,14 @@
 
 #include "src/core/client_channel/retry_service_config.h"
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config.h"
diff --git a/test/core/client_channel/retry_throttle_test.cc b/test/core/client_channel/retry_throttle_test.cc
index 78cda1694ad..f8463ba83d4 100644
--- a/test/core/client_channel/retry_throttle_test.cc
+++ b/test/core/client_channel/retry_throttle_test.cc
@@ -19,7 +19,6 @@
 #include "src/core/client_channel/retry_throttle.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/client_channel/subchannel_args_test.cc b/test/core/client_channel/subchannel_args_test.cc
index 3750a8dc42b..b7f3aa3287b 100644
--- a/test/core/client_channel/subchannel_args_test.cc
+++ b/test/core/client_channel/subchannel_args_test.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc
index 49d723884ca..81aa23d06cf 100644
--- a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc
+++ b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
 
-#include <grpc/support/port_platform.h>
-
 // Make a template argument to test which bit pattern remains in A's destructor
 // to try and detect similar bugs in non-MSAN builds (none have been detected
 // yet thankfully)
diff --git a/test/core/compression/compression_test.cc b/test/core/compression/compression_test.cc
index 9ed5b61b042..09a84548dd6 100644
--- a/test/core/compression/compression_test.cc
+++ b/test/core/compression/compression_test.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/compression.h>
+#include <grpc/slice.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -23,10 +25,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-#include <grpc/slice.h>
-
 #include "src/core/util/useful.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/compression/message_compress_fuzzer.cc b/test/core/compression/message_compress_fuzzer.cc
index 64abbf21a4f..8b98844d910 100644
--- a/test/core/compression/message_compress_fuzzer.cc
+++ b/test/core/compression/message_compress_fuzzer.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/lib/compression/message_compress.h"
 
diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc
index e8aac4237a6..7bf558af1fa 100644
--- a/test/core/compression/message_compress_test.cc
+++ b/test/core/compression/message_compress_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/compression/message_compress.h"
 
+#include <grpc/compression.h>
+#include <grpc/slice_buffer.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,10 +28,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-#include <grpc/slice_buffer.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/useful.h"
 #include "test/core/test_util/slice_splitter.h"
diff --git a/test/core/compression/message_decompress_fuzzer.cc b/test/core/compression/message_decompress_fuzzer.cc
index 4996705182b..58b324de716 100644
--- a/test/core/compression/message_decompress_fuzzer.cc
+++ b/test/core/compression/message_decompress_fuzzer.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/lib/compression/message_compress.h"
 
diff --git a/test/core/config/core_configuration_test.cc b/test/core/config/core_configuration_test.cc
index bf2e10b1890..3a391a8f097 100644
--- a/test/core/config/core_configuration_test.cc
+++ b/test/core/config/core_configuration_test.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/lib/config/core_configuration.h"
 
+#include <gtest/gtest.h>
+
 #include <chrono>
 #include <functional>
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 namespace grpc_core {
 
 // Allow substitution of config builder - in real code this would iterate
diff --git a/test/core/config/load_config_test.cc b/test/core/config/load_config_test.cc
index 7d9ac207163..8c34bb0b651 100644
--- a/test/core/config/load_config_test.cc
+++ b/test/core/config/load_config_test.cc
@@ -16,7 +16,6 @@
 
 #include "absl/flags/flag.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/env.h"
 
 ABSL_FLAG(std::vector<std::string>, comma_separated_strings, {}, "");
diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc
index f76151aa9d3..1badbcb5391 100644
--- a/test/core/end2end/bad_server_response_test.cc
+++ b/test/core/end2end/bad_server_response_test.cc
@@ -16,17 +16,6 @@
 //
 //
 
-#include <inttypes.h>
-#include <limits.h>
-#include <string.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -38,7 +27,16 @@
 #include <grpc/support/atm.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <string.h>
+
+#include <memory>
+#include <string>
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc
index 436b2fb5730..e87fbcf3c64 100644
--- a/test/core/end2end/connection_refused_test.cc
+++ b/test/core/end2end/connection_refused_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <string.h>
-
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -31,7 +24,12 @@
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/time.h>
+#include <string.h>
+
+#include <string>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc
index d1a322bc989..2b606807b41 100644
--- a/test/core/end2end/cq_verifier.cc
+++ b/test/core/end2end/cq_verifier.cc
@@ -18,6 +18,12 @@
 
 #include "test/core/end2end/cq_verifier.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
@@ -36,14 +42,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/compression/message_compress.h"
 #include "src/core/lib/surface/event_string.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h
index d86d3248958..856822807fa 100644
--- a/test/core/end2end/cq_verifier.h
+++ b/test/core/end2end/cq_verifier.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_TEST_CORE_END2END_CQ_VERIFIER_H
 #define GRPC_TEST_CORE_END2END_CQ_VERIFIER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <functional>
@@ -28,12 +32,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/debug_location.h"
 #include "src/core/util/time.h"
 
diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc
index 44fc736e5ca..cbe48b86785 100644
--- a/test/core/end2end/dualstack_socket_test.cc
+++ b/test/core/end2end/dualstack_socket_test.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/time.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -23,18 +28,16 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_EV
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
 #include <string.h>
 
 #include <vector>
@@ -43,12 +46,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/resolve_address.h"
diff --git a/test/core/end2end/end2end_test_fuzzer.cc b/test/core/end2end/end2end_test_fuzzer.cc
index e74627117a2..331ad4b998b 100644
--- a/test/core/end2end/end2end_test_fuzzer.cc
+++ b/test/core/end2end/end2end_test_fuzzer.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/end2end/end2end_test_fuzzer.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <gtest/gtest.h>
 #include <stdio.h>
 
 #include <algorithm>
@@ -24,12 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/config.h"
diff --git a/test/core/end2end/end2end_test_main.cc b/test/core/end2end/end2end_test_main.cc
index 8d40eb90900..c9b0d0f0050 100644
--- a/test/core/end2end/end2end_test_main.cc
+++ b/test/core/end2end/end2end_test_main.cc
@@ -19,7 +19,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/config/config_vars.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/fixtures/h2_tls_common.h"
diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc
index 4b74ff032be..4b111ad1586 100644
--- a/test/core/end2end/end2end_test_suites.cc
+++ b/test/core/end2end/end2end_test_suites.cc
@@ -12,6 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/compression.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_posix.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -33,18 +43,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_posix.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h
index 9dc89e93a87..b358e9456e6 100644
--- a/test/core/end2end/end2end_tests.h
+++ b/test/core/end2end/end2end_tests.h
@@ -15,6 +15,16 @@
 #ifndef GRPC_TEST_CORE_END2END_END2END_TESTS_H
 #define GRPC_TEST_CORE_END2END_END2END_TESTS_H
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/credentials.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -36,18 +46,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "gtest/gtest.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/credentials.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/test/core/end2end/fixtures/h2_oauth2_common.h b/test/core/end2end/fixtures/h2_oauth2_common.h
index 92d873d313c..fe52b1c8656 100644
--- a/test/core/end2end/fixtures/h2_oauth2_common.h
+++ b/test/core/end2end/fixtures/h2_oauth2_common.h
@@ -15,10 +15,6 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_OAUTH2_COMMON_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_H2_OAUTH2_COMMON_H
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -26,7 +22,9 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h b/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
index cbe17d19a13..cf8a611f40b 100644
--- a/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
+++ b/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
@@ -15,10 +15,6 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_CRED_RELOAD_FIXTURE_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_CRED_RELOAD_FIXTURE_H
 
-#include <stddef.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -26,7 +22,9 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <stddef.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
diff --git a/test/core/end2end/fixtures/h2_ssl_tls_common.h b/test/core/end2end/fixtures/h2_ssl_tls_common.h
index ce346b3175e..d97ca4ad9f5 100644
--- a/test/core/end2end/fixtures/h2_ssl_tls_common.h
+++ b/test/core/end2end/fixtures/h2_ssl_tls_common.h
@@ -15,10 +15,6 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_TLS_COMMON_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_TLS_COMMON_H
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -26,7 +22,9 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
diff --git a/test/core/end2end/fixtures/h2_tls_common.h b/test/core/end2end/fixtures/h2_tls_common.h
index c7a5ffd1d73..1c325dc7e8c 100644
--- a/test/core/end2end/fixtures/h2_tls_common.h
+++ b/test/core/end2end/fixtures/h2_tls_common.h
@@ -19,14 +19,6 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_TLS_COMMON_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_H2_TLS_COMMON_H
 
-#include <stdint.h>
-#include <string.h>
-
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -34,7 +26,13 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc
index 88b65d3de94..c5f77bcf27f 100644
--- a/test/core/end2end/fixtures/http_proxy_fixture.cc
+++ b/test/core/end2end/fixtures/http_proxy_fixture.cc
@@ -18,6 +18,11 @@
 
 #include "test/core/end2end/fixtures/http_proxy_fixture.h"
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <limits.h>
 #include <string.h>
 
@@ -33,13 +38,6 @@
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/test/core/end2end/fixtures/inproc_fixture.h b/test/core/end2end/fixtures/inproc_fixture.h
index 4f08c3773fd..7a70aa138a7 100644
--- a/test/core/end2end/fixtures/inproc_fixture.h
+++ b/test/core/end2end/fixtures/inproc_fixture.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_INPROC_FIXTURE_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_INPROC_FIXTURE_H
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/functional/any_invocable.h"
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/fixtures/local_util.cc b/test/core/end2end/fixtures/local_util.cc
index 63bc96b9052..c9ae9c5f1ce 100644
--- a/test/core/end2end/fixtures/local_util.cc
+++ b/test/core/end2end/fixtures/local_util.cc
@@ -18,16 +18,15 @@
 
 #include "test/core/end2end/fixtures/local_util.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/status.h>
 #include <string.h>
 
 #include <utility>
 
 #include "absl/log/check.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/status.h>
-
 static void process_auth_failure(void* state, grpc_auth_context* /*ctx*/,
                                  const grpc_metadata* /*md*/,
                                  size_t /*md_count*/,
diff --git a/test/core/end2end/fixtures/local_util.h b/test/core/end2end/fixtures/local_util.h
index fc9f8d8af5c..e7f3ce3c2d2 100644
--- a/test/core/end2end/fixtures/local_util.h
+++ b/test/core/end2end/fixtures/local_util.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_LOCAL_UTIL_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_LOCAL_UTIL_H
 
-#include <string>
-
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 
+#include <string>
+
+#include "absl/functional/any_invocable.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc
index 1d78ebcd2b7..728eddfc70d 100644
--- a/test/core/end2end/fixtures/proxy.cc
+++ b/test/core/end2end/fixtures/proxy.cc
@@ -18,15 +18,6 @@
 
 #include "test/core/end2end/fixtures/proxy.h"
 
-#include <string.h>
-
-#include <cstddef>
-#include <string>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/propagation_bits.h>
@@ -35,7 +26,14 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <string.h>
+
+#include <cstddef>
+#include <string>
+#include <utility>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/end2end/fixtures/secure_fixture.h b/test/core/end2end/fixtures/secure_fixture.h
index 4586994981b..20e488f427b 100644
--- a/test/core/end2end/fixtures/secure_fixture.h
+++ b/test/core/end2end/fixtures/secure_fixture.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_SECURE_FIXTURE_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_SECURE_FIXTURE_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/host_port.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/fixtures/sockpair_fixture.h b/test/core/end2end/fixtures/sockpair_fixture.h
index cedc002695f..ce3616c22cf 100644
--- a/test/core/end2end/fixtures/sockpair_fixture.h
+++ b/test/core/end2end/fixtures/sockpair_fixture.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_SOCKPAIR_FIXTURE_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_SOCKPAIR_FIXTURE_H
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
@@ -22,11 +26,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc
index c4e960a7d9a..2cc58bdf76b 100644
--- a/test/core/end2end/fuzzers/api_fuzzer.cc
+++ b/test/core/end2end/fuzzers/api_fuzzer.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <algorithm>
@@ -36,14 +42,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc
index 9278eb8d0e5..b44a42e8fa6 100644
--- a/test/core/end2end/fuzzers/client_fuzzer.cc
+++ b/test/core/end2end/fuzzers/client_fuzzer.cc
@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+
 #include <string>
 
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/test/core/end2end/fuzzers/connector_fuzzer.h b/test/core/end2end/fuzzers/connector_fuzzer.h
index 64b78aeb0bf..458851fa7cd 100644
--- a/test/core/end2end/fuzzers/connector_fuzzer.h
+++ b/test/core/end2end/fuzzers/connector_fuzzer.h
@@ -16,7 +16,6 @@
 #define GRPC_TEST_CORE_END2END_FUZZERS_CONNECTOR_FUZZER_H
 
 #include "absl/functional/function_ref.h"
-
 #include "src/core/client_channel/connector.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "test/core/end2end/fuzzers/fuzzer_input.pb.h"
diff --git a/test/core/end2end/fuzzers/fuzzing_common.cc b/test/core/end2end/fuzzers/fuzzing_common.cc
index 820af4ab182..85d6ec51d26 100644
--- a/test/core/end2end/fuzzers/fuzzing_common.cc
+++ b/test/core/end2end/fuzzers/fuzzing_common.cc
@@ -18,6 +18,13 @@
 
 #include "test/core/end2end/fuzzers/fuzzing_common.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <memory>
@@ -27,15 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/end2end/fuzzers/fuzzing_common.h b/test/core/end2end/fuzzers/fuzzing_common.h
index b365c698e2d..5f287fae66b 100644
--- a/test/core/end2end/fuzzers/fuzzing_common.h
+++ b/test/core/end2end/fuzzers/fuzzing_common.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_TEST_CORE_END2END_FUZZERS_FUZZING_COMMON_H
 #define GRPC_TEST_CORE_END2END_FUZZERS_FUZZING_COMMON_H
 
+#include <grpc/grpc.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -30,9 +31,6 @@
 
 #include "absl/log/check.h"
 #include "absl/types/span.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/fuzzers/network_input.cc b/test/core/end2end/fuzzers/network_input.cc
index 0afd8d1b95d..6a91a74d9ca 100644
--- a/test/core/end2end/fuzzers/network_input.cc
+++ b/test/core/end2end/fuzzers/network_input.cc
@@ -14,6 +14,7 @@
 
 #include "test/core/end2end/fuzzers/network_input.h"
 
+#include <grpc/slice.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,9 +27,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/frame.h"
 #include "src/core/ext/transport/chttp2/transport/varint.h"
diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc
index ebf7034caec..1983ff9316e 100644
--- a/test/core/end2end/fuzzers/server_fuzzer.cc
+++ b/test/core/end2end/fuzzers/server_fuzzer.cc
@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/end2end/fuzzers/server_fuzzer.h b/test/core/end2end/fuzzers/server_fuzzer.h
index c8e42730348..621bb70ac4f 100644
--- a/test/core/end2end/fuzzers/server_fuzzer.h
+++ b/test/core/end2end/fuzzers/server_fuzzer.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_TEST_CORE_END2END_FUZZERS_SERVER_FUZZER_H
 #define GRPC_TEST_CORE_END2END_FUZZERS_SERVER_FUZZER_H
 
-#include "absl/functional/function_ref.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/functional/function_ref.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/end2end/fuzzers/fuzzer_input.pb.h"
 
diff --git a/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc b/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc
index 6d688e655a2..09070be455f 100644
--- a/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc
+++ b/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc_security.h>
 
+#include "absl/log/check.h"
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/libfuzzer/libfuzzer_macro.h"
diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc
index 2ebc094e210..ef2e6840c2d 100644
--- a/test/core/end2end/goaway_server_test.cc
+++ b/test/core/end2end/goaway_server_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -32,18 +42,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc
index d9509266d0f..716b1faa0ad 100644
--- a/test/core/end2end/h2_ssl_cert_test.cc
+++ b/test/core/end2end/h2_ssl_cert_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -28,18 +38,6 @@
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc
index 882f09995e8..7bb518425b4 100644
--- a/test/core/end2end/h2_ssl_session_reuse_test.cc
+++ b/test/core/end2end/h2_ssl_session_reuse_test.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <string.h>
-
-#include <string>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/types/optional.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -34,7 +25,13 @@
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/time.h>
+#include <gtest/gtest.h>
+#include <string.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc
index a9f74bed935..9d232edf911 100644
--- a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc
+++ b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc
@@ -15,16 +15,6 @@
 // limitations under the License.
 //
 //
-#include <stdint.h>
-#include <string.h>
-
-#include <string>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/types/optional.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -34,7 +24,14 @@
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/time.h>
+#include <gtest/gtest.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc
index ee7caff77ca..d587079a0e2 100644
--- a/test/core/end2end/invalid_call_argument_test.cc
+++ b/test/core/end2end/invalid_call_argument_test.cc
@@ -16,16 +16,6 @@
 //
 //
 
-#include <limits.h>
-#include <string.h>
-
-#include <initializer_list>
-#include <memory>
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
@@ -35,7 +25,15 @@
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <limits.h>
+#include <string.h>
 
+#include <initializer_list>
+#include <memory>
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/host_port.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc
index 5e8d9add4fd..f03b3225d70 100644
--- a/test/core/end2end/no_server_test.cc
+++ b/test/core/end2end/no_server_test.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <utility>
@@ -25,15 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/time/time.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/test/core/end2end/tests/bad_ping.cc b/test/core/end2end/tests/bad_ping.cc
index 1a556d5ee52..adc5d8529f5 100644
--- a/test/core/end2end/tests/bad_ping.cc
+++ b/test/core/end2end/tests/bad_ping.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/binary_metadata.cc b/test/core/end2end/tests/binary_metadata.cc
index a96ce818304..8b08e161521 100644
--- a/test/core/end2end/tests/binary_metadata.cc
+++ b/test/core/end2end/tests/binary_metadata.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc
index b19d555005b..115d368c473 100644
--- a/test/core/end2end/tests/call_creds.cc
+++ b/test/core/end2end/tests/call_creds.cc
@@ -16,17 +16,16 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/log.h"
-#include "absl/types/optional.h"
-#include "gtest/gtest.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "absl/log/log.h"
+#include "absl/types/optional.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/call_host_override.cc b/test/core/end2end/tests/call_host_override.cc
index ee847552969..7c90de9486a 100644
--- a/test/core/end2end/tests/call_host_override.cc
+++ b/test/core/end2end/tests/call_host_override.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc
index e22063354de..fde403d5b5a 100644
--- a/test/core/end2end/tests/cancel_after_accept.cc
+++ b/test/core/end2end/tests/cancel_after_accept.cc
@@ -16,15 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_cat.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/cancel_after_client_done.cc b/test/core/end2end/tests/cancel_after_client_done.cc
index 8ca9e005ba8..a25bde486b4 100644
--- a/test/core/end2end/tests/cancel_after_client_done.cc
+++ b/test/core/end2end/tests/cancel_after_client_done.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/tests/cancel_test_helpers.h"
diff --git a/test/core/end2end/tests/cancel_after_invoke.cc b/test/core/end2end/tests/cancel_after_invoke.cc
index aeaf45bd2f1..6c66eae9f4d 100644
--- a/test/core/end2end/tests/cancel_after_invoke.cc
+++ b/test/core/end2end/tests/cancel_after_invoke.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc
index 00f268683a4..f225f1ad80d 100644
--- a/test/core/end2end/tests/cancel_after_round_trip.cc
+++ b/test/core/end2end/tests/cancel_after_round_trip.cc
@@ -16,15 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_cat.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/cancel_before_invoke.cc b/test/core/end2end/tests/cancel_before_invoke.cc
index 6c5e07d6d63..942acef1941 100644
--- a/test/core/end2end/tests/cancel_before_invoke.cc
+++ b/test/core/end2end/tests/cancel_before_invoke.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "test/core/end2end/end2end_tests.h"
 
 namespace grpc_core {
diff --git a/test/core/end2end/tests/cancel_with_status.cc b/test/core/end2end/tests/cancel_with_status.cc
index 4673ade3698..f80779ad96f 100644
--- a/test/core/end2end/tests/cancel_with_status.cc
+++ b/test/core/end2end/tests/cancel_with_status.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc
index dcd363a1051..7332b428a22 100644
--- a/test/core/end2end/tests/channelz.cc
+++ b/test/core/end2end/tests/channelz.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/channelz/channelz.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/server/server.h"
diff --git a/test/core/end2end/tests/client_streaming.cc b/test/core/end2end/tests/client_streaming.cc
index 2cf6a617556..372e3d377b6 100644
--- a/test/core/end2end/tests/client_streaming.cc
+++ b/test/core/end2end/tests/client_streaming.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc
index cbae272da8e..0df335bca87 100644
--- a/test/core/end2end/tests/compressed_payload.cc
+++ b/test/core/end2end/tests/compressed_payload.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <initializer_list>
@@ -24,12 +28,6 @@
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/bitset.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc
index 00e83236e4d..364489fdb05 100644
--- a/test/core/end2end/tests/connectivity.cc
+++ b/test/core/end2end/tests/connectivity.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/default_host.cc b/test/core/end2end/tests/default_host.cc
index fe5100dd845..5a84e9acdcd 100644
--- a/test/core/end2end/tests/default_host.cc
+++ b/test/core/end2end/tests/default_host.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/disappearing_server.cc b/test/core/end2end/tests/disappearing_server.cc
index a42853b538b..31badc9f9b7 100644
--- a/test/core/end2end/tests/disappearing_server.cc
+++ b/test/core/end2end/tests/disappearing_server.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc
index feae6776991..e1836375f1c 100644
--- a/test/core/end2end/tests/filter_causes_close.cc
+++ b/test/core/end2end/tests/filter_causes_close.cc
@@ -16,6 +16,7 @@
 //
 //
 
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <memory>
@@ -23,9 +24,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc
index 5183489db1e..c258ee74221 100644
--- a/test/core/end2end/tests/filter_init_fails.cc
+++ b/test/core/end2end/tests/filter_init_fails.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 #include <utility>
 
@@ -23,9 +25,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/filtered_metadata.cc b/test/core/end2end/tests/filtered_metadata.cc
index 5f14a22a85b..ac3da1a9370 100644
--- a/test/core/end2end/tests/filtered_metadata.cc
+++ b/test/core/end2end/tests/filtered_metadata.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/graceful_server_shutdown.cc b/test/core/end2end/tests/graceful_server_shutdown.cc
index 34390d02f07..8e72b926272 100644
--- a/test/core/end2end/tests/graceful_server_shutdown.cc
+++ b/test/core/end2end/tests/graceful_server_shutdown.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/grpc_authz.cc b/test/core/end2end/tests/grpc_authz.cc
index 48553dd0357..7763d831da7 100644
--- a/test/core/end2end/tests/grpc_authz.cc
+++ b/test/core/end2end/tests/grpc_authz.cc
@@ -12,17 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/authorization/authorization_policy_provider.h"
 #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h"
diff --git a/test/core/end2end/tests/high_initial_seqno.cc b/test/core/end2end/tests/high_initial_seqno.cc
index e9dd5cd39a7..5708bda98db 100644
--- a/test/core/end2end/tests/high_initial_seqno.cc
+++ b/test/core/end2end/tests/high_initial_seqno.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/hpack_size.cc b/test/core/end2end/tests/hpack_size.cc
index 766a00cbe99..f42894e18b7 100644
--- a/test/core/end2end/tests/hpack_size.cc
+++ b/test/core/end2end/tests/hpack_size.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <stdio.h>
 
 #include <utility>
@@ -24,10 +26,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/no_destruct.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc
index 51561dbbe17..9e33da9ad5d 100644
--- a/test/core/end2end/tests/http2_stats.cc
+++ b/test/core/end2end/tests/http2_stats.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/status.h>
+#include <grpc/support/time.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -23,10 +26,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/invoke_large_request.cc b/test/core/end2end/tests/invoke_large_request.cc
index 3302ee48e89..2b3ba1ba511 100644
--- a/test/core/end2end/tests/invoke_large_request.cc
+++ b/test/core/end2end/tests/invoke_large_request.cc
@@ -16,15 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <string.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc
index 9c94b653c84..e60f8b29c97 100644
--- a/test/core/end2end/tests/keepalive_timeout.cc
+++ b/test/core/end2end/tests/keepalive_timeout.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/core/end2end/tests/large_metadata.cc b/test/core/end2end/tests/large_metadata.cc
index 9f053983980..b22b75d29d9 100644
--- a/test/core/end2end/tests/large_metadata.cc
+++ b/test/core/end2end/tests/large_metadata.cc
@@ -16,16 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <stdio.h>
 
 #include <string>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/max_concurrent_streams.cc b/test/core/end2end/tests/max_concurrent_streams.cc
index 1b0d301b724..9c644dbe69c 100644
--- a/test/core/end2end/tests/max_concurrent_streams.cc
+++ b/test/core/end2end/tests/max_concurrent_streams.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc
index 0938eb2393c..88a0b2b3915 100644
--- a/test/core/end2end/tests/max_connection_age.cc
+++ b/test/core/end2end/tests/max_connection_age.cc
@@ -16,16 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <limits.h>
 
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/max_connection_idle.cc b/test/core/end2end/tests/max_connection_idle.cc
index 1dfbd2f6ede..1d139e862ac 100644
--- a/test/core/end2end/tests/max_connection_idle.cc
+++ b/test/core/end2end/tests/max_connection_idle.cc
@@ -16,16 +16,15 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc
index 5a70f2cdfa9..a7154fcb2d2 100644
--- a/test/core/end2end/tests/max_message_length.cc
+++ b/test/core/end2end/tests/max_message_length.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/negative_deadline.cc b/test/core/end2end/tests/negative_deadline.cc
index c1c5392c1bf..1fdf6771325 100644
--- a/test/core/end2end/tests/negative_deadline.cc
+++ b/test/core/end2end/tests/negative_deadline.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc
index e144dda3d1d..0bae8cf6270 100644
--- a/test/core/end2end/tests/no_logging.cc
+++ b/test/core/end2end/tests/no_logging.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+
 #include <atomic>
 #include <map>
 #include <regex>
@@ -32,10 +35,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/payload.cc b/test/core/end2end/tests/payload.cc
index 31c5456dee4..edc97835ba8 100644
--- a/test/core/end2end/tests/payload.cc
+++ b/test/core/end2end/tests/payload.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/ping.cc b/test/core/end2end/tests/ping.cc
index 70b2fbb57c2..73094b8feb2 100644
--- a/test/core/end2end/tests/ping.cc
+++ b/test/core/end2end/tests/ping.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/ping_pong_streaming.cc b/test/core/end2end/tests/ping_pong_streaming.cc
index 9cfd8bb92a9..784db17c7ad 100644
--- a/test/core/end2end/tests/ping_pong_streaming.cc
+++ b/test/core/end2end/tests/ping_pong_streaming.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <memory>
-
 #include <grpc/status.h>
 
+#include <memory>
+
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/proxy_auth.cc b/test/core/end2end/tests/proxy_auth.cc
index 9b2b3897b83..23bcdbaff5e 100644
--- a/test/core/end2end/tests/proxy_auth.cc
+++ b/test/core/end2end/tests/proxy_auth.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/registered_call.cc b/test/core/end2end/tests/registered_call.cc
index 1dc13b5acd5..e5779d67103 100644
--- a/test/core/end2end/tests/registered_call.cc
+++ b/test/core/end2end/tests/registered_call.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "gtest/gtest.h"
-
 #include <grpc/status.h>
 
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/request_with_flags.cc b/test/core/end2end/tests/request_with_flags.cc
index 60db5aae583..12d25f13f05 100644
--- a/test/core/end2end/tests/request_with_flags.cc
+++ b/test/core/end2end/tests/request_with_flags.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -24,12 +28,6 @@
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/transport/transport.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/cq_verifier.h"
diff --git a/test/core/end2end/tests/request_with_payload.cc b/test/core/end2end/tests/request_with_payload.cc
index d2da70e6ec6..76cdf6c95e8 100644
--- a/test/core/end2end/tests/request_with_payload.cc
+++ b/test/core/end2end/tests/request_with_payload.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/resource_quota_server.cc b/test/core/end2end/tests/resource_quota_server.cc
index 4b25143b5ec..637eee793c7 100644
--- a/test/core/end2end/tests/resource_quota_server.cc
+++ b/test/core/end2end/tests/resource_quota_server.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -24,11 +27,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/test/core/end2end/tests/retry.cc b/test/core/end2end/tests/retry.cc
index 22e3434e553..e2a9361336a 100644
--- a/test/core/end2end/tests/retry.cc
+++ b/test/core/end2end/tests/retry.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc
index cf33d718760..abef13e894c 100644
--- a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc
+++ b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc
@@ -14,12 +14,11 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/retry_cancel_during_delay.cc b/test/core/end2end/tests/retry_cancel_during_delay.cc
index 255d31ffe87..f30324170f5 100644
--- a/test/core/end2end/tests/retry_cancel_during_delay.cc
+++ b/test/core/end2end/tests/retry_cancel_during_delay.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc
index 0fa65238d88..026bfc18278 100644
--- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc
+++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
@@ -23,10 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/test/core/end2end/tests/retry_cancellation.cc b/test/core/end2end/tests/retry_cancellation.cc
index fd26c53c513..be20108ba49 100644
--- a/test/core/end2end/tests/retry_cancellation.cc
+++ b/test/core/end2end/tests/retry_cancellation.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_disabled.cc b/test/core/end2end/tests/retry_disabled.cc
index be335e8cd6d..9d86e113f5b 100644
--- a/test/core/end2end/tests/retry_disabled.cc
+++ b/test/core/end2end/tests/retry_disabled.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc
index 0171d6a828d..c819437c2b4 100644
--- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc
+++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
index 90ac8edd5a0..7a6340c790e 100644
--- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
+++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc
index f962de41719..0edc8a9cfda 100644
--- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc
+++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc
index abe92f8f9ac..f09cb785251 100644
--- a/test/core/end2end/tests/retry_lb_drop.cc
+++ b/test/core/end2end/tests/retry_lb_drop.cc
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ -24,11 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/test/core/end2end/tests/retry_lb_fail.cc b/test/core/end2end/tests/retry_lb_fail.cc
index 77ef319f3e3..7eed6fe21b3 100644
--- a/test/core/end2end/tests/retry_lb_fail.cc
+++ b/test/core/end2end/tests/retry_lb_fail.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <atomic>
 #include <memory>
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/retry_non_retriable_status.cc b/test/core/end2end/tests/retry_non_retriable_status.cc
index 4051f38daa6..b0ce4bc5c10 100644
--- a/test/core/end2end/tests/retry_non_retriable_status.cc
+++ b/test/core/end2end/tests/retry_non_retriable_status.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc
index 07340b8d7f9..dfb33ba1ec3 100644
--- a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc
+++ b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc
index d21ce8ae7c3..f114ad330fd 100644
--- a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc
+++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc
index f0447521b8c..0bb835fbca8 100644
--- a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc
+++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_recv_initial_metadata.cc b/test/core/end2end/tests/retry_recv_initial_metadata.cc
index 2c4d44e6e1a..24021d4dbfa 100644
--- a/test/core/end2end/tests/retry_recv_initial_metadata.cc
+++ b/test/core/end2end/tests/retry_recv_initial_metadata.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_recv_message.cc b/test/core/end2end/tests/retry_recv_message.cc
index a2fcbc5ebd0..93d282684e9 100644
--- a/test/core/end2end/tests/retry_recv_message.cc
+++ b/test/core/end2end/tests/retry_recv_message.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_recv_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc
index 1260785976a..31f11c01567 100644
--- a/test/core/end2end/tests/retry_recv_message_replay.cc
+++ b/test/core/end2end/tests/retry_recv_message_replay.cc
@@ -16,16 +16,15 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
index ab8a0fe4e34..9f986707f50 100644
--- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
+++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
@@ -14,16 +14,15 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc
index 2f99da1ed2f..2f8bc7ea21a 100644
--- a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc
+++ b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc
@@ -16,15 +16,14 @@
 //
 //
 
-#include <string>
-
-#include "absl/types/optional.h"
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 
+#include <string>
+
+#include "absl/types/optional.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc
index 46ac40cff79..96cc4b0197a 100644
--- a/test/core/end2end/tests/retry_send_op_fails.cc
+++ b/test/core/end2end/tests/retry_send_op_fails.cc
@@ -16,16 +16,15 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/retry_send_recv_batch.cc b/test/core/end2end/tests/retry_send_recv_batch.cc
index 5f9ac9c7aa4..0708bd6665d 100644
--- a/test/core/end2end/tests/retry_send_recv_batch.cc
+++ b/test/core/end2end/tests/retry_send_recv_batch.cc
@@ -14,13 +14,12 @@
 // limitations under the License.
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_server_pushback_delay.cc b/test/core/end2end/tests/retry_server_pushback_delay.cc
index 58507c833c3..b1acf7c3802 100644
--- a/test/core/end2end/tests/retry_server_pushback_delay.cc
+++ b/test/core/end2end/tests/retry_server_pushback_delay.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_server_pushback_disabled.cc b/test/core/end2end/tests/retry_server_pushback_disabled.cc
index 33226294b89..e63f92a3b3c 100644
--- a/test/core/end2end/tests/retry_server_pushback_disabled.cc
+++ b/test/core/end2end/tests/retry_server_pushback_disabled.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_streaming.cc b/test/core/end2end/tests/retry_streaming.cc
index 57b081803ac..62efed732ee 100644
--- a/test/core/end2end/tests/retry_streaming.cc
+++ b/test/core/end2end/tests/retry_streaming.cc
@@ -16,15 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/surface/channel.h"
diff --git a/test/core/end2end/tests/retry_streaming_after_commit.cc b/test/core/end2end/tests/retry_streaming_after_commit.cc
index 2e642d4852f..c882b77d708 100644
--- a/test/core/end2end/tests/retry_streaming_after_commit.cc
+++ b/test/core/end2end/tests/retry_streaming_after_commit.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc
index 1d2e1f54d81..52cfc2b3659 100644
--- a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc
+++ b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_throttled.cc b/test/core/end2end/tests/retry_throttled.cc
index a0ca05f8757..0f973c59a66 100644
--- a/test/core/end2end/tests/retry_throttled.cc
+++ b/test/core/end2end/tests/retry_throttled.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_too_many_attempts.cc b/test/core/end2end/tests/retry_too_many_attempts.cc
index b68b5c14853..6cbbe9529ef 100644
--- a/test/core/end2end/tests/retry_too_many_attempts.cc
+++ b/test/core/end2end/tests/retry_too_many_attempts.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_transparent_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc
index 40352a5148f..e26882ca11e 100644
--- a/test/core/end2end/tests/retry_transparent_goaway.cc
+++ b/test/core/end2end/tests/retry_transparent_goaway.cc
@@ -14,16 +14,15 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
index 75e4c8a9264..fd8eadff762 100644
--- a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
+++ b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-#include <memory>
-
-#include "absl/types/optional.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "absl/types/optional.h"
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc
index 1a7ca65aae6..9b3366397f1 100644
--- a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc
+++ b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <string.h>
 
 #include <memory>
@@ -22,10 +24,6 @@
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/end2end/tests/retry_unref_before_finish.cc b/test/core/end2end/tests/retry_unref_before_finish.cc
index 5c6a460c23d..c38fcb99c12 100644
--- a/test/core/end2end/tests/retry_unref_before_finish.cc
+++ b/test/core/end2end/tests/retry_unref_before_finish.cc
@@ -14,13 +14,12 @@
 // limitations under the License.
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_unref_before_recv.cc b/test/core/end2end/tests/retry_unref_before_recv.cc
index 569e8114d6b..83766e89bfa 100644
--- a/test/core/end2end/tests/retry_unref_before_recv.cc
+++ b/test/core/end2end/tests/retry_unref_before_recv.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/server_finishes_request.cc b/test/core/end2end/tests/server_finishes_request.cc
index b1df0a39904..ff03a272f7d 100644
--- a/test/core/end2end/tests/server_finishes_request.cc
+++ b/test/core/end2end/tests/server_finishes_request.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/server_streaming.cc b/test/core/end2end/tests/server_streaming.cc
index fd4e34d9afc..0d64489aa44 100644
--- a/test/core/end2end/tests/server_streaming.cc
+++ b/test/core/end2end/tests/server_streaming.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/shutdown_finishes_calls.cc b/test/core/end2end/tests/shutdown_finishes_calls.cc
index 03e83c57c62..39dc5ceb0c0 100644
--- a/test/core/end2end/tests/shutdown_finishes_calls.cc
+++ b/test/core/end2end/tests/shutdown_finishes_calls.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/status.h>
 #include <grpc/support/time.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/end2end/tests/simple_delayed_request.cc b/test/core/end2end/tests/simple_delayed_request.cc
index e9c61145e2b..952f983f2e8 100644
--- a/test/core/end2end/tests/simple_delayed_request.cc
+++ b/test/core/end2end/tests/simple_delayed_request.cc
@@ -16,15 +16,14 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/log.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "absl/log/log.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/simple_metadata.cc b/test/core/end2end/tests/simple_metadata.cc
index 4d1df2c05ff..265a71a5b74 100644
--- a/test/core/end2end/tests/simple_metadata.cc
+++ b/test/core/end2end/tests/simple_metadata.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc
index 5236e9692da..15a62333d64 100644
--- a/test/core/end2end/tests/simple_request.cc
+++ b/test/core/end2end/tests/simple_request.cc
@@ -16,6 +16,7 @@
 //
 //
 
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -27,9 +28,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/streaming_error_response.cc b/test/core/end2end/tests/streaming_error_response.cc
index 3ac939ed861..5efecd10671 100644
--- a/test/core/end2end/tests/streaming_error_response.cc
+++ b/test/core/end2end/tests/streaming_error_response.cc
@@ -19,12 +19,11 @@
 /// \file Verify that status ordering rules are obeyed.
 /// \ref doc/status_ordering.md
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/timeout_before_request_call.cc b/test/core/end2end/tests/timeout_before_request_call.cc
index 3a7217ed49d..e6b1c59f295 100644
--- a/test/core/end2end/tests/timeout_before_request_call.cc
+++ b/test/core/end2end/tests/timeout_before_request_call.cc
@@ -12,17 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <string.h>
 
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/trailing_metadata.cc b/test/core/end2end/tests/trailing_metadata.cc
index 268b699b427..d1eb7781937 100644
--- a/test/core/end2end/tests/trailing_metadata.cc
+++ b/test/core/end2end/tests/trailing_metadata.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/write_buffering.cc b/test/core/end2end/tests/write_buffering.cc
index d3956f80031..c29bcca9d28 100644
--- a/test/core/end2end/tests/write_buffering.cc
+++ b/test/core/end2end/tests/write_buffering.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/write_buffering_at_end.cc b/test/core/end2end/tests/write_buffering_at_end.cc
index 064e979e8fb..517a8820a10 100644
--- a/test/core/end2end/tests/write_buffering_at_end.cc
+++ b/test/core/end2end/tests/write_buffering_at_end.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/event_engine/cf/cf_engine_test.cc b/test/core/event_engine/cf/cf_engine_test.cc
index 07ed18aa994..f6ac8c0ac6e 100644
--- a/test/core/event_engine/cf/cf_engine_test.cc
+++ b/test/core/event_engine/cf/cf_engine_test.cc
@@ -16,6 +16,9 @@
 
 #ifdef GPR_APPLE
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+
 #include <thread>
 
 #include "absl/log/check.h"
@@ -23,10 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/cf_engine/cf_engine.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
diff --git a/test/core/event_engine/common_closures_test.cc b/test/core/event_engine/common_closures_test.cc
index a09d2061d69..b3a8fa39bbf 100644
--- a/test/core/event_engine/common_closures_test.cc
+++ b/test/core/event_engine/common_closures_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/lib/event_engine/common_closures.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/notification.h"
 
 using ::grpc_event_engine::experimental::AnyInvocableClosure;
diff --git a/test/core/event_engine/default_engine_methods_test.cc b/test/core/event_engine/default_engine_methods_test.cc
index 030be18a504..04a415c1d9d 100644
--- a/test/core/event_engine/default_engine_methods_test.cc
+++ b/test/core/event_engine/default_engine_methods_test.cc
@@ -11,6 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <thread>
@@ -22,13 +28,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/event_engine/endpoint_config_test.cc b/test/core/event_engine/endpoint_config_test.cc
index 5a23b5e3263..f406481f9ec 100644
--- a/test/core/event_engine/endpoint_config_test.cc
+++ b/test/core/event_engine/endpoint_config_test.cc
@@ -11,13 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 
diff --git a/test/core/event_engine/event_engine_test_utils.cc b/test/core/event_engine/event_engine_test_utils.cc
index 65b609a63d4..c2a02d4dad5 100644
--- a/test/core/event_engine/event_engine_test_utils.cc
+++ b/test/core/event_engine/event_engine_test_utils.cc
@@ -14,6 +14,11 @@
 
 #include "test/core/event_engine/event_engine_test_utils.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/slice_buffer.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -30,13 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/slice_buffer.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/test/core/event_engine/event_engine_test_utils.h b/test/core/event_engine/event_engine_test_utils.h
index fa0f3622e1a..1cc09380fc5 100644
--- a/test/core/event_engine/event_engine_test_utils.h
+++ b/test/core/event_engine/event_engine_test_utils.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_EVENT_ENGINE_TEST_UTILS_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_EVENT_ENGINE_TEST_UTILS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice_buffer.h>
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -27,10 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice_buffer.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/event_engine/factory_test.cc b/test/core/event_engine/factory_test.cc
index 370a7577f72..b8239dce4fe 100644
--- a/test/core/event_engine/factory_test.cc
+++ b/test/core/event_engine/factory_test.cc
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "test/core/event_engine/util/aborting_event_engine.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/event_engine/forkable_test.cc b/test/core/event_engine/forkable_test.cc
index 86dbe636593..2b1da1d0b09 100644
--- a/test/core/event_engine/forkable_test.cc
+++ b/test/core/event_engine/forkable_test.cc
@@ -28,7 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/no_destruct.h"
 
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
index 1bc8a7a203e..7c24b1abfb8 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 
+#include <grpc/event_engine/slice.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -26,10 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/slice.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
index 6ff76e32a23..180943c882c 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_FUZZING_EVENT_ENGINE_FUZZING_EVENT_ENGINE_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_FUZZING_EVENT_ENGINE_FUZZING_EVENT_ENGINE_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -34,13 +39,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/time_util.h"
 #include "src/core/util/no_destruct.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc
index e5eb79fccc3..0d89448a2f7 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc
@@ -16,11 +16,10 @@
 
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 
-#include "absl/synchronization/notification.h"
-#include "gtest/gtest.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/synchronization/notification.h"
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 
 using ::grpc_event_engine::experimental::FuzzingEventEngine;
diff --git a/test/core/event_engine/handle_tests.cc b/test/core/event_engine/handle_tests.cc
index 9e082c23a0e..864d9547246 100644
--- a/test/core/event_engine/handle_tests.cc
+++ b/test/core/event_engine/handle_tests.cc
@@ -11,14 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 using ::grpc_event_engine::experimental::EventEngine;
 
 template <typename T>
diff --git a/test/core/event_engine/mock_event_engine.h b/test/core/event_engine/mock_event_engine.h
index 62266bdb12d..9036e7af6d1 100644
--- a/test/core/event_engine/mock_event_engine.h
+++ b/test/core/event_engine/mock_event_engine.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_MOCK_EVENT_ENGINE_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_MOCK_EVENT_ENGINE_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
@@ -22,10 +26,6 @@
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc
index 673c4f9c78a..87ab1fc8038 100644
--- a/test/core/event_engine/posix/event_poller_posix_test.cc
+++ b/test/core/event_engine/posix/event_poller_posix_test.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <sys/select.h>
 
@@ -28,9 +29,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
@@ -46,6 +44,8 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <stdlib.h>
@@ -54,10 +54,6 @@
 
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller_posix_default.h"
diff --git a/test/core/event_engine/posix/lock_free_event_test.cc b/test/core/event_engine/posix/lock_free_event_test.cc
index f53aea94ad5..1b0ffac0d37 100644
--- a/test/core/event_engine/posix/lock_free_event_test.cc
+++ b/test/core/event_engine/posix/lock_free_event_test.cc
@@ -12,22 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <benchmark/benchmark.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <memory>
 #include <thread>
 #include <utility>
 #include <vector>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/lockfree_event.h"
diff --git a/test/core/event_engine/posix/log_too_many_open_files_test.cc b/test/core/event_engine/posix/log_too_many_open_files_test.cc
index c87b879a286..8b2dc68679a 100644
--- a/test/core/event_engine/posix/log_too_many_open_files_test.cc
+++ b/test/core/event_engine/posix/log_too_many_open_files_test.cc
@@ -21,7 +21,6 @@
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/util/strerror.h"
diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc
index a8ec3af12c5..5ad8bb7d937 100644
--- a/test/core/event_engine/posix/posix_endpoint_test.cc
+++ b/test/core/event_engine/posix/posix_endpoint_test.cc
@@ -14,6 +14,10 @@
 
 #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+
 #include <algorithm>
 #include <chrono>
 #include <list>
@@ -30,11 +34,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc
index 319d8098b06..1e44d7633ad 100644
--- a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc
+++ b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -23,9 +24,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 // This test won't work except with posix sockets enabled
@@ -34,7 +32,6 @@
 #include <ifaddrs.h>
 
 #include "absl/log/log.h"
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
diff --git a/test/core/event_engine/posix/posix_engine_test_utils.cc b/test/core/event_engine/posix/posix_engine_test_utils.cc
index 30c7f408804..88da5686515 100644
--- a/test/core/event_engine/posix/posix_engine_test_utils.cc
+++ b/test/core/event_engine/posix/posix_engine_test_utils.cc
@@ -22,7 +22,6 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/event_engine/posix/posix_engine_test_utils.h b/test/core/event_engine/posix/posix_engine_test_utils.h
index 33deec80818..34e83c4a124 100644
--- a/test/core/event_engine/posix/posix_engine_test_utils.h
+++ b/test/core/event_engine/posix/posix_engine_test_utils.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_POSIX_POSIX_ENGINE_TEST_UTILS_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_POSIX_POSIX_ENGINE_TEST_UTILS_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/event_engine/posix/posix_event_engine_connect_test.cc b/test/core/event_engine/posix/posix_event_engine_connect_test.cc
index 989e6c9f341..19f2819c51e 100644
--- a/test/core/event_engine/posix/posix_event_engine_connect_test.cc
+++ b/test/core/event_engine/posix/posix_event_engine_connect_test.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
 #include <poll.h>
 #include <stdlib.h>
 #include <sys/socket.h>
@@ -34,11 +37,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
diff --git a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc
index 0e1099b57aa..99db037a195 100644
--- a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc
+++ b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
@@ -19,9 +20,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 // IWYU pragma: no_include <arpa/inet.h>
@@ -29,11 +27,10 @@
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
 
+#include <grpc/support/alloc.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/core/util/useful.h"
diff --git a/test/core/event_engine/posix/timer_heap_test.cc b/test/core/event_engine/posix/timer_heap_test.cc
index ee1a82e6e0b..5d71ee6f52e 100644
--- a/test/core/event_engine/posix/timer_heap_test.cc
+++ b/test/core/event_engine/posix/timer_heap_test.cc
@@ -27,7 +27,6 @@
 #include "absl/log/check.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/util/bitset.h"
 
diff --git a/test/core/event_engine/posix/timer_list_test.cc b/test/core/event_engine/posix/timer_list_test.cc
index 0fae801fb94..ca3aa663949 100644
--- a/test/core/event_engine/posix/timer_list_test.cc
+++ b/test/core/event_engine/posix/timer_list_test.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/time.h>
+
 #include <cstdint>
 #include <limits>
 #include <vector>
@@ -23,10 +26,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/util/time.h"
 
diff --git a/test/core/event_engine/posix/timer_manager_test.cc b/test/core/event_engine/posix/timer_manager_test.cc
index 1cfe58a2d80..40f53540b75 100644
--- a/test/core/event_engine/posix/timer_manager_test.cc
+++ b/test/core/event_engine/posix/timer_manager_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 #include <random>
@@ -23,9 +25,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
diff --git a/test/core/event_engine/posix/traced_buffer_list_test.cc b/test/core/event_engine/posix/traced_buffer_list_test.cc
index 9e267fe1d3f..1d460aac166 100644
--- a/test/core/event_engine/posix/traced_buffer_list_test.cc
+++ b/test/core/event_engine/posix/traced_buffer_list_test.cc
@@ -14,16 +14,14 @@
 
 #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h"
 
+#include <grpc/support/atm.h>
+#include <grpc/support/time.h>
 #include <time.h>
 
 #include <memory>
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/atm.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/time.h"
diff --git a/test/core/event_engine/posix/wakeup_fd_posix_test.cc b/test/core/event_engine/posix/wakeup_fd_posix_test.cc
index b9872eede12..e2d11bba602 100644
--- a/test/core/event_engine/posix/wakeup_fd_posix_test.cc
+++ b/test/core/event_engine/posix/wakeup_fd_posix_test.cc
@@ -18,7 +18,6 @@
 
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
 
diff --git a/test/core/event_engine/query_extensions_test.cc b/test/core/event_engine/query_extensions_test.cc
index d657f43b81f..0c10b76cc29 100644
--- a/test/core/event_engine/query_extensions_test.cc
+++ b/test/core/event_engine/query_extensions_test.cc
@@ -13,16 +13,15 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/query_extensions.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/event_engine/slice_buffer_test.cc b/test/core/event_engine/slice_buffer_test.cc
index 0a0c26f9520..a3221ac6743 100644
--- a/test/core/event_engine/slice_buffer_test.cc
+++ b/test/core/event_engine/slice_buffer_test.cc
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -20,12 +25,6 @@
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
 
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 using ::grpc_event_engine::experimental::Slice;
 using ::grpc_event_engine::experimental::SliceBuffer;
 
diff --git a/test/core/event_engine/smoke_test.cc b/test/core/event_engine/smoke_test.cc
index e557a8c4e45..0a53992b15e 100644
--- a/test/core/event_engine/smoke_test.cc
+++ b/test/core/event_engine/smoke_test.cc
@@ -11,15 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <memory>
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 namespace {
diff --git a/test/core/event_engine/tcp_socket_utils_test.cc b/test/core/event_engine/tcp_socket_utils_test.cc
index 53ce735e478..fc926592685 100644
--- a/test/core/event_engine/tcp_socket_utils_test.cc
+++ b/test/core/event_engine/tcp_socket_utils_test.cc
@@ -14,7 +14,6 @@
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 
 #include <errno.h>
-
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
@@ -45,13 +44,12 @@
 #endif  // GPR_WINDOWS
 #endif  // GRPC_HAVE_UNIX_SOCKET
 
+#include <grpc/event_engine/event_engine.h>
+
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/event_engine/test_init.cc b/test/core/event_engine/test_init.cc
index 2b7600ce0d2..1a342794345 100644
--- a/test/core/event_engine/test_init.cc
+++ b/test/core/event_engine/test_init.cc
@@ -13,12 +13,12 @@
 // limitations under the License.
 #include "test/core/event_engine/test_init.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/str_cat.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/test/core/event_engine/test_init.h b/test/core/event_engine/test_init.h
index 7ab584d07f3..2af682f523f 100644
--- a/test/core/event_engine/test_init.h
+++ b/test/core/event_engine/test_init.h
@@ -13,11 +13,11 @@
 // limitations under the License.
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/test/core/event_engine/test_suite/event_engine_test_framework.cc b/test/core/event_engine/test_suite/event_engine_test_framework.cc
index 962d9e4d074..2affed14094 100644
--- a/test/core/event_engine/test_suite/event_engine_test_framework.cc
+++ b/test/core/event_engine/test_suite/event_engine_test_framework.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/event_engine/event_engine.h>
+#include <gtest/gtest.h>
 
 absl::AnyInvocable<
     std::shared_ptr<grpc_event_engine::experimental::EventEngine>()>*
diff --git a/test/core/event_engine/test_suite/event_engine_test_framework.h b/test/core/event_engine/test_suite/event_engine_test_framework.h
index 0f2b768637a..afb57911e2b 100644
--- a/test/core/event_engine/test_suite/event_engine_test_framework.h
+++ b/test/core/event_engine/test_suite/event_engine_test_framework.h
@@ -14,16 +14,15 @@
 
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_FRAMEWORK_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_FRAMEWORK_H
+#include <grpc/event_engine/event_engine.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <utility>
 
-#include <gtest/gtest.h>
-
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 
-#include <grpc/event_engine/event_engine.h>
-
 extern absl::AnyInvocable<
     std::shared_ptr<grpc_event_engine::experimental::EventEngine>()>*
     g_ee_factory;
diff --git a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc
index afd288bcc0a..e2c718f9166 100644
--- a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc
+++ b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc
@@ -14,10 +14,10 @@
 
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 
-#include <chrono>
-
 #include <gtest/gtest.h>
 
+#include <chrono>
+
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
 #include "test/core/event_engine/test_suite/tests/timer_test.h"
 
diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc
index 3efef67009f..b5f0c70ceb9 100644
--- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc
+++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/alloc.h>
 #include <poll.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -30,10 +32,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h
index 94fbb928832..6db3489c030 100644
--- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h
+++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_POSIX_ORACLE_EVENT_ENGINE_POSIX_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_POSIX_ORACLE_EVENT_ENGINE_POSIX_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -24,12 +29,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc b/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc
index fc864f89078..682d4402d80 100644
--- a/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc
+++ b/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc
@@ -11,14 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/grpc.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <optional>
 #include <string>
 
-#include <gtest/gtest.h>
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
diff --git a/test/core/event_engine/test_suite/posix_event_engine_test.cc b/test/core/event_engine/test_suite/posix_event_engine_test.cc
index 26c34c9a9f8..605431a95dd 100644
--- a/test/core/event_engine/test_suite/posix_event_engine_test.cc
+++ b/test/core/event_engine/test_suite/posix_event_engine_test.cc
@@ -11,11 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <memory>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include <grpc/grpc.h>
+#include <memory>
 
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
diff --git a/test/core/event_engine/test_suite/tests/client_test.cc b/test/core/event_engine/test_suite/tests/client_test.cc
index c6bd435a3cb..fd6c22067d5 100644
--- a/test/core/event_engine/test_suite/tests/client_test.cc
+++ b/test/core/event_engine/test_suite/tests/client_test.cc
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/impl/channel_arg_names.h>
+
 #include <algorithm>
 #include <chrono>
 #include <memory>
@@ -29,11 +33,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
diff --git a/test/core/event_engine/test_suite/tests/dns_test.cc b/test/core/event_engine/test_suite/tests/dns_test.cc
index a50102970ed..1613085a42d 100644
--- a/test/core/event_engine/test_suite/tests/dns_test.cc
+++ b/test/core/event_engine/test_suite/tests/dns_test.cc
@@ -15,6 +15,9 @@
 // IWYU pragma: no_include <ratio>
 // IWYU pragma: no_include <arpa/inet.h>
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdlib>
 #include <cstring>
 #include <memory>
@@ -31,10 +34,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/core/event_engine/test_suite/tests/server_test.cc b/test/core/event_engine/test_suite/tests/server_test.cc
index 88e64ef04e0..630dc7c7dd5 100644
--- a/test/core/event_engine/test_suite/tests/server_test.cc
+++ b/test/core/event_engine/test_suite/tests/server_test.cc
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/impl/channel_arg_names.h>
+
 #include <algorithm>
 #include <chrono>
 #include <memory>
@@ -29,11 +33,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
diff --git a/test/core/event_engine/test_suite/tests/timer_test.cc b/test/core/event_engine/test_suite/tests/timer_test.cc
index c4a4e5cc35a..bc25e6e1bbc 100644
--- a/test/core/event_engine/test_suite/tests/timer_test.cc
+++ b/test/core/event_engine/test_suite/tests/timer_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -31,9 +33,6 @@
 #include "absl/time/time.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/time_util.h"
 #include "src/core/util/sync.h"
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
diff --git a/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc b/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc
index 43088eb5bb3..6ebd37ffb39 100644
--- a/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc
+++ b/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc
@@ -11,11 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <memory>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include <grpc/grpc.h>
+#include <memory>
 
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h"
diff --git a/test/core/event_engine/test_suite/tools/echo_client.cc b/test/core/event_engine/test_suite/tools/echo_client.cc
index 76749f58309..f44ddae72e6 100644
--- a/test/core/event_engine/test_suite/tools/echo_client.cc
+++ b/test/core/event_engine/test_suite/tools/echo_client.cc
@@ -11,13 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include "absl/log/check.h"
 
-#include <grpc/event_engine/slice.h>
-#include <grpc/support/port_platform.h>
-
 // The echo client wraps an EventEngine::Connect and EventEngine::Endpoint
 // implementations, allowing third-party TCP listeners to interact with your
 // EventEngine client. Example usage:
@@ -31,6 +30,10 @@
 //    bazel run
 //    //test/core/event_engine/test_suite/tools:my_event_engine_echo_client
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+
 #include <chrono>
 #include <memory>
 #include <string>
@@ -43,11 +46,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc b/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc
index 9b7d2ae8a5a..c107ef47f3b 100644
--- a/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc
+++ b/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
diff --git a/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc b/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc
index 98f591fe604..2fa66748d82 100644
--- a/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc
+++ b/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #ifdef GPR_WINDOWS
 
 #include "src/core/lib/event_engine/windows/windows_engine.h"
diff --git a/test/core/event_engine/thread_pool_test.cc b/test/core/event_engine/thread_pool_test.cc
index 29f32d16691..1c4d29c44e7 100644
--- a/test/core/event_engine/thread_pool_test.cc
+++ b/test/core/event_engine/thread_pool_test.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/thd_id.h>
+
 #include <atomic>
 #include <chrono>
 #include <cmath>
@@ -26,10 +29,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/thd_id.h>
-
 #include "src/core/lib/event_engine/thread_pool/thread_count.h"
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/event_engine/util/aborting_event_engine.h b/test/core/event_engine/util/aborting_event_engine.h
index ecc2db968dd..9c49a2b2b6a 100644
--- a/test/core/event_engine/util/aborting_event_engine.h
+++ b/test/core/event_engine/util/aborting_event_engine.h
@@ -14,6 +14,10 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_UTIL_ABORTING_EVENT_ENGINE_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_UTIL_ABORTING_EVENT_ENGINE_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -22,11 +26,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/test/core/event_engine/windows/create_sockpair.cc b/test/core/event_engine/windows/create_sockpair.cc
index 3817f98ac6f..7de56720da7 100644
--- a/test/core/event_engine/windows/create_sockpair.cc
+++ b/test/core/event_engine/windows/create_sockpair.cc
@@ -20,7 +20,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
 #include "src/core/lib/event_engine/windows/win_socket.h"
 #include "src/core/lib/iomgr/error.h"
 #include "test/core/event_engine/windows/create_sockpair.h"
diff --git a/test/core/event_engine/windows/iocp_test.cc b/test/core/event_engine/windows/iocp_test.cc
index b5ee504c643..9e798ff7e21 100644
--- a/test/core/event_engine/windows/iocp_test.cc
+++ b/test/core/event_engine/windows/iocp_test.cc
@@ -14,19 +14,17 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_WINDOWS
-#include <thread>
-
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log_windows.h>
 #include <gtest/gtest.h>
 
+#include <thread>
+
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/time/time.h"
 #include "absl/types/variant.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
diff --git a/test/core/event_engine/windows/win_socket_test.cc b/test/core/event_engine/windows/win_socket_test.cc
index daa3c5360f5..e0902a81bd3 100644
--- a/test/core/event_engine/windows/win_socket_test.cc
+++ b/test/core/event_engine/windows/win_socket_test.cc
@@ -15,14 +15,12 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_WINDOWS
+#include <grpc/grpc.h>
+#include <grpc/support/log_windows.h>
 #include <gtest/gtest.h>
 
 #include "absl/status/status.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/test/core/event_engine/windows/windows_endpoint_test.cc b/test/core/event_engine/windows/windows_endpoint_test.cc
index 9ada4bbf471..e06b3928350 100644
--- a/test/core/event_engine/windows/windows_endpoint_test.cc
+++ b/test/core/event_engine/windows/windows_endpoint_test.cc
@@ -16,13 +16,11 @@
 
 #ifdef GPR_WINDOWS
 
-#include <gtest/gtest.h>
-
-#include "absl/status/status.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
+#include <gtest/gtest.h>
 
+#include "absl/status/status.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc b/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc
index be59f7ecdb8..9481282ea5e 100644
--- a/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc
+++ b/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc
@@ -11,6 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <deque>
@@ -19,10 +21,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
 #include "src/libfuzzer/libfuzzer_macro.h"
diff --git a/test/core/event_engine/work_queue/basic_work_queue_test.cc b/test/core/event_engine/work_queue/basic_work_queue_test.cc
index e5658f85c0a..a8ecefb928b 100644
--- a/test/core/event_engine/work_queue/basic_work_queue_test.cc
+++ b/test/core/event_engine/work_queue/basic_work_queue_test.cc
@@ -13,15 +13,14 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <thread>
 #include <vector>
 
 #include "absl/functional/any_invocable.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/experiments/experiments_tag_test.cc b/test/core/experiments/experiments_tag_test.cc
index 51643148209..63d42a7bd3b 100644
--- a/test/core/experiments/experiments_tag_test.cc
+++ b/test/core/experiments/experiments_tag_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/status.h"
@@ -20,9 +22,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/experiments/config.h"
 #include "test/core/experiments/fixtures/experiments.h"
diff --git a/test/core/experiments/experiments_test.cc b/test/core/experiments/experiments_test.cc
index f604efa05ff..2964104c3dd 100644
--- a/test/core/experiments/experiments_test.cc
+++ b/test/core/experiments/experiments_test.cc
@@ -16,12 +16,11 @@
 
 #include "test/core/experiments/fixtures/experiments.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/experiments/config.h"
 
 #ifndef GRPC_EXPERIMENTS_ARE_FINAL
diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
index 56e8783629b..202ead109fb 100644
--- a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
+++ b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
@@ -11,6 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -25,10 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
diff --git a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc
index 369ebcc468d..43985c9d5c6 100644
--- a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc
+++ b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc
@@ -14,6 +14,10 @@
 
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/slice.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -23,11 +27,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/slice.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/filters/bm_http_client_filter.cc b/test/core/filters/bm_http_client_filter.cc
index 967af7ab6a4..0e295d86fec 100644
--- a/test/core/filters/bm_http_client_filter.cc
+++ b/test/core/filters/bm_http_client_filter.cc
@@ -13,11 +13,9 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/transport/connectivity_state.h"
diff --git a/test/core/filters/client_auth_filter_test.cc b/test/core/filters/client_auth_filter_test.cc
index f6a29e17d89..b4cdef1abe5 100644
--- a/test/core/filters/client_auth_filter_test.cc
+++ b/test/core/filters/client_auth_filter_test.cc
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+
 #include <string>
 #include <utility>
 
@@ -20,12 +25,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/promise/arena_promise.h"
diff --git a/test/core/filters/client_authority_filter_test.cc b/test/core/filters/client_authority_filter_test.cc
index cdb99d9999d..62e85416ac6 100644
--- a/test/core/filters/client_authority_filter_test.cc
+++ b/test/core/filters/client_authority_filter_test.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/ext/filters/http/client_authority_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "test/core/filters/filter_test.h"
 
 using ::testing::StrictMock;
diff --git a/test/core/filters/filter_test.cc b/test/core/filters/filter_test.cc
index 11ff4cfa087..e710abc43b9 100644
--- a/test/core/filters/filter_test.cc
+++ b/test/core/filters/filter_test.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/filters/filter_test.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <chrono>
 #include <memory>
@@ -24,9 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/test/core/filters/filter_test.h b/test/core/filters/filter_test.h
index 4c193efce31..13a9a80e8a1 100644
--- a/test/core/filters/filter_test.h
+++ b/test/core/filters/filter_test.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_TEST_CORE_FILTERS_FILTER_TEST_H
 #define GRPC_TEST_CORE_FILTERS_FILTER_TEST_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <gtest/gtest.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -25,17 +28,11 @@
 #include <string>
 #include <utility>
 
-#include <gtest/gtest.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/filters/filter_test_test.cc b/test/core/filters/filter_test_test.cc
index ec836316f86..6da52c84be4 100644
--- a/test/core/filters/filter_test_test.cc
+++ b/test/core/filters/filter_test_test.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/filters/filter_test.h"
 
+#include <grpc/compression.h>
+
 #include <functional>
 #include <memory>
 #include <type_traits>
@@ -22,9 +24,6 @@
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/test/core/filters/gcp_authentication_filter_test.cc b/test/core/filters/gcp_authentication_filter_test.cc
index 5f3880fa998..e75706b4ea0 100644
--- a/test/core/filters/gcp_authentication_filter_test.cc
+++ b/test/core/filters/gcp_authentication_filter_test.cc
@@ -22,7 +22,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/security/context/security_context.h"
diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc
index 3032abf8ced..1a8035cc104 100644
--- a/test/core/handshake/client_ssl.cc
+++ b/test/core/handshake/client_ssl.cc
@@ -16,21 +16,18 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
-#include <stdint.h>
-#include <stdio.h>
-
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
+#include <stdint.h>
+#include <stdio.h>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/port.h"
 #include "test/core/test_util/test_config.h"
@@ -40,6 +37,11 @@
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_TCP
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -47,16 +49,8 @@
 
 #include <string>
 
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/handshake/http_proxy_mapper_test.cc b/test/core/handshake/http_proxy_mapper_test.cc
index 1c7d40e022d..30741b71589 100644
--- a/test/core/handshake/http_proxy_mapper_test.cc
+++ b/test/core/handshake/http_proxy_mapper_test.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/handshaker/http_connect/http_proxy_mapper.h"
 
+#include <grpc/impl/channel_arg_names.h>
+
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc
index 9b4203ec6f2..e8401f084f6 100644
--- a/test/core/handshake/readahead_handshaker_server_ssl.cc
+++ b/test/core/handshake/readahead_handshaker_server_ssl.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
diff --git a/test/core/handshake/server_ssl.cc b/test/core/handshake/server_ssl.cc
index 9776d7330e4..7910251502e 100644
--- a/test/core/handshake/server_ssl.cc
+++ b/test/core/handshake/server_ssl.cc
@@ -19,7 +19,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "test/core/handshake/server_ssl_common.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc
index 7a8910fac34..a026e7c9fba 100644
--- a/test/core/handshake/server_ssl_common.cc
+++ b/test/core/handshake/server_ssl_common.cc
@@ -18,7 +18,18 @@
 
 #include "test/core/handshake/server_ssl_common.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/ssl.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,24 +39,10 @@
 
 #include <string>
 
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/ssl.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/handshake/verify_peer_options.cc b/test/core/handshake/verify_peer_options.cc
index 626dc964468..96e9d4cd79c 100644
--- a/test/core/handshake/verify_peer_options.cc
+++ b/test/core/handshake/verify_peer_options.cc
@@ -22,6 +22,12 @@
 #ifdef GRPC_POSIX_SOCKET_TCP
 
 #include <arpa/inet.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -29,18 +35,9 @@
 
 #include <string>
 
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/thd.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/http/format_request_test.cc b/test/core/http/format_request_test.cc
index 31c73d88100..2d2deb6d4bb 100644
--- a/test/core/http/format_request_test.cc
+++ b/test/core/http/format_request_test.cc
@@ -23,7 +23,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/http_client/httpcli.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc
index 0f9b26ab912..53b6236ba0d 100644
--- a/test/core/http/httpcli_test.cc
+++ b/test/core/http/httpcli_test.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/util/http_client/httpcli.h"
 
+#include <ares.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <string.h>
 #include <sys/socket.h>
 
@@ -26,23 +34,12 @@
 #include <thread>
 #include <utility>
 
-#include <ares.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/test/core/http/httpcli_test_util.cc b/test/core/http/httpcli_test_util.cc
index f47bb1d61a8..6ba8c6d1d7d 100644
--- a/test/core/http/httpcli_test_util.cc
+++ b/test/core/http/httpcli_test_util.cc
@@ -16,6 +16,10 @@
 
 #include "test/core/http/httpcli_test_util.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -26,12 +30,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/subprocess.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc
index 11596745a6d..0f051f6a860 100644
--- a/test/core/http/httpscli_test.cc
+++ b/test/core/http/httpscli_test.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <string.h>
 
 #include <algorithm>
@@ -26,21 +32,12 @@
 #include <utility>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/http/parser_test.cc b/test/core/http/parser_test.cc
index 4e3f508338a..a7ff86e5cc6 100644
--- a/test/core/http/parser_test.cc
+++ b/test/core/http/parser_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/util/http_client/parser.h"
 
+#include <grpc/support/alloc.h>
 #include <stdarg.h>
 #include <string.h>
 
@@ -26,9 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/useful.h"
 #include "test/core/test_util/slice_splitter.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/http/request_fuzzer.cc b/test/core/http/request_fuzzer.cc
index 7ca890c7e01..aef8b6424f5 100644
--- a/test/core/http/request_fuzzer.cc
+++ b/test/core/http/request_fuzzer.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/util/http_client/parser.h"
 
diff --git a/test/core/http/response_fuzzer.cc b/test/core/http/response_fuzzer.cc
index e2cadb79eb8..377098028e3 100644
--- a/test/core/http/response_fuzzer.cc
+++ b/test/core/http/response_fuzzer.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/util/http_client/parser.h"
 
diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc
index d6620314c29..f80a2a53ff9 100644
--- a/test/core/iomgr/buffer_list_test.cc
+++ b/test/core/iomgr/buffer_list_test.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/iomgr/buffer_list.h"
 
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/internal_errqueue.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc
index 1e3daba3978..7c7d66e918d 100644
--- a/test/core/iomgr/combiner_test.cc
+++ b/test/core/iomgr/combiner_test.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/iomgr/combiner.h"
 
-#include <thread>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+
+#include <thread>
 
 #include "src/core/util/crash.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc
index 76518fa5cd0..532d40203fa 100644
--- a/test/core/iomgr/endpoint_pair_test.cc
+++ b/test/core/iomgr/endpoint_pair_test.cc
@@ -18,18 +18,16 @@
 
 #include "src/core/lib/iomgr/endpoint_pair.h"
 
-#include <chrono>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
+#include <gtest/gtest.h>
+
+#include <chrono>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc
index 5f0044bb6f0..b20245aad53 100644
--- a/test/core/iomgr/endpoint_tests.cc
+++ b/test/core/iomgr/endpoint_tests.cc
@@ -18,17 +18,15 @@
 
 #include "test/core/iomgr/endpoint_tests.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <sys/types.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/iomgr/error_test.cc b/test/core/iomgr/error_test.cc
index 93ce01db702..2ff779733bb 100644
--- a/test/core/iomgr/error_test.cc
+++ b/test/core/iomgr/error_test.cc
@@ -18,16 +18,13 @@
 
 #include "src/core/lib/iomgr/error.h"
 
-#include <string.h>
-
 #include <gmock/gmock.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <string.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/strerror.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc
index 8a75b4f41e2..8d1f7844cbb 100644
--- a/test/core/iomgr/fd_conservation_posix_test.cc
+++ b/test/core/iomgr/fd_conservation_posix_test.cc
@@ -16,12 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <sys/resource.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc
index 4de02c79db3..875bbf5e0be 100644
--- a/test/core/iomgr/fd_posix_test.cc
+++ b/test/core/iomgr/fd_posix_test.cc
@@ -27,6 +27,10 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <stdio.h>
@@ -38,12 +42,6 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
diff --git a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc
index e1d615ea9ca..db1da269193 100644
--- a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc
+++ b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/iomgr/pollset_windows_starvation_test.cc b/test/core/iomgr/pollset_windows_starvation_test.cc
index dc75b1f61d6..b921e19f162 100644
--- a/test/core/iomgr/pollset_windows_starvation_test.cc
+++ b/test/core/iomgr/pollset_windows_starvation_test.cc
@@ -15,11 +15,11 @@
 // limitations under the License.
 //
 //
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 
+#include <vector>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc
index 1c0eecfa04c..0d3deea8ba4 100644
--- a/test/core/iomgr/resolve_address_posix_test.cc
+++ b/test/core/iomgr/resolve_address_posix_test.cc
@@ -16,24 +16,21 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <net/if.h>
 #include <string.h>
 #include <sys/un.h>
 
 #include <string>
 
-#include <gtest/gtest.h>
-
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc
index 97da4df464c..db0c041c470 100644
--- a/test/core/iomgr/resolve_address_test.cc
+++ b/test/core/iomgr/resolve_address_test.cc
@@ -18,22 +18,19 @@
 
 #include "src/core/lib/iomgr/resolve_address.h"
 
-#include <string.h>
-
 #include <address_sorting/address_sorting.h>
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <gtest/gtest.h>
+#include <string.h>
 
 #include "absl/functional/bind_front.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/test/core/iomgr/socket_utils_test.cc b/test/core/iomgr/socket_utils_test.cc
index 861ea5eae25..fa492c8c204 100644
--- a/test/core/iomgr/socket_utils_test.cc
+++ b/test/core/iomgr/socket_utils_test.cc
@@ -22,17 +22,14 @@
 #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <gtest/gtest.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc
index 6a567765b38..bdfb8a9ab9d 100644
--- a/test/core/iomgr/tcp_client_posix_test.cc
+++ b/test/core/iomgr/tcp_client_posix_test.cc
@@ -30,6 +30,9 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <string.h>
@@ -37,11 +40,6 @@
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/iomgr/pollset_set.h"
diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc
index 897df84cf3e..35a7018075b 100644
--- a/test/core/iomgr/tcp_posix_test.cc
+++ b/test/core/iomgr/tcp_posix_test.cc
@@ -17,7 +17,6 @@
 //
 
 #include "absl/time/time.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/notification.h"
@@ -28,21 +27,18 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <limits.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/posix.h"
diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc
index 09c4a5c0d83..86a7e30ab32 100644
--- a/test/core/iomgr/tcp_server_posix_test.cc
+++ b/test/core/iomgr/tcp_server_posix_test.cc
@@ -39,16 +39,15 @@
 #include <sys/un.h>
 #endif
 
-#include <memory>
-#include <string>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include <memory>
+#include <string>
+
+#include "absl/log/log.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc
index 3e2b907e7b5..4882fb2fda2 100644
--- a/test/core/iomgr/timer_heap_test.cc
+++ b/test/core/iomgr/timer_heap_test.cc
@@ -18,15 +18,12 @@
 
 #include "src/core/lib/iomgr/timer_heap.h"
 
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/useful.h"
diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc
index cd0a5221d60..ffe81cd0a5e 100644
--- a/test/core/iomgr/timer_list_test.cc
+++ b/test/core/iomgr/timer_list_test.cc
@@ -16,6 +16,7 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,9 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/test/core/json/fuzzer.cc b/test/core/json/fuzzer.cc
index bc17d74af3d..3191f0a00c4 100644
--- a/test/core/json/fuzzer.cc
+++ b/test/core/json/fuzzer.cc
@@ -16,15 +16,13 @@
 //
 //
 
+#include <grpc/support/json.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/json.h>
-
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
 
diff --git a/test/core/json/json_object_loader_test.cc b/test/core/json/json_object_loader_test.cc
index aad3567f86b..385c8ef93bb 100644
--- a/test/core/json/json_object_loader_test.cc
+++ b/test/core/json/json_object_loader_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/util/json/json_object_loader.h"
 
+#include <grpc/support/json.h>
+
 #include <cstdint>
 
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/json.h>
-
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/ref_counted.h"
diff --git a/test/core/json/json_test.cc b/test/core/json/json_test.cc
index cf9f68cf212..2e44c6636ad 100644
--- a/test/core/json/json_test.cc
+++ b/test/core/json/json_test.cc
@@ -29,7 +29,6 @@
 #include "absl/strings/str_cat.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/load_balancing/bm_picker.cc b/test/core/load_balancing/bm_picker.cc
index 51aee364d3f..b596ef553bc 100644
--- a/test/core/load_balancing/bm_picker.cc
+++ b/test/core/load_balancing/bm_picker.cc
@@ -12,14 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
 #include <benchmark/benchmark.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc.h>
 
+#include <memory>
+
+#include "absl/strings/string_view.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h
index 00c21dcd9a3..2280ae6833f 100644
--- a/test/core/load_balancing/lb_policy_test_lib.h
+++ b/test/core/load_balancing/lb_policy_test_lib.h
@@ -17,6 +17,10 @@
 #ifndef GRPC_TEST_CORE_LOAD_BALANCING_LB_POLICY_TEST_LIB_H
 #define GRPC_TEST_CORE_LOAD_BALANCING_LB_POLICY_TEST_LIB_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -48,12 +52,6 @@
 #include "absl/types/variant.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
diff --git a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc
index b5145f451ff..1793807fc55 100644
--- a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc
+++ b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/load_balancing/outlier_detection_test.cc b/test/core/load_balancing/outlier_detection_test.cc
index e92c3bc4e84..d73a4ed54bf 100644
--- a/test/core/load_balancing/outlier_detection_test.cc
+++ b/test/core/load_balancing/outlier_detection_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -31,10 +33,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/test/core/load_balancing/pick_first_test.cc b/test/core/load_balancing/pick_first_test.cc
index 0f07d6fd39d..75bf64c8328 100644
--- a/test/core/load_balancing/pick_first_test.cc
+++ b/test/core/load_balancing/pick_first_test.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/load_balancing/pick_first/pick_first.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -33,10 +35,6 @@
 #include "absl/types/span.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/test/core/load_balancing/ring_hash_test.cc b/test/core/load_balancing/ring_hash_test.cc
index 0861cdcb5db..522f5794921 100644
--- a/test/core/load_balancing/ring_hash_test.cc
+++ b/test/core/load_balancing/ring_hash_test.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/load_balancing/ring_hash/ring_hash.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -30,10 +32,6 @@
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/json/json.h"
diff --git a/test/core/load_balancing/rls_lb_config_parser_test.cc b/test/core/load_balancing/rls_lb_config_parser_test.cc
index edf3e8127bf..a710284f471 100644
--- a/test/core/load_balancing/rls_lb_config_parser_test.cc
+++ b/test/core/load_balancing/rls_lb_config_parser_test.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/load_balancing/round_robin_test.cc b/test/core/load_balancing/round_robin_test.cc
index 78da9b904f3..0eb2a3ef372 100644
--- a/test/core/load_balancing/round_robin_test.cc
+++ b/test/core/load_balancing/round_robin_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <array>
 #include <memory>
 
@@ -21,9 +23,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/load_balancing/static_stride_scheduler_benchmark.cc b/test/core/load_balancing/static_stride_scheduler_benchmark.cc
index aba086e7e40..06edb74f976 100644
--- a/test/core/load_balancing/static_stride_scheduler_benchmark.cc
+++ b/test/core/load_balancing/static_stride_scheduler_benchmark.cc
@@ -14,19 +14,18 @@
 // limitations under the License.
 //
 
+#include <benchmark/benchmark.h>
+
 #include <algorithm>
 #include <atomic>
 #include <cstdint>
 #include <vector>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/algorithm/container.h"
 #include "absl/log/check.h"
 #include "absl/random/random.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-
 #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h"
 #include "src/core/util/no_destruct.h"
 
diff --git a/test/core/load_balancing/weighted_round_robin_config_test.cc b/test/core/load_balancing/weighted_round_robin_config_test.cc
index 5da2fb5a006..eac134bd823 100644
--- a/test/core/load_balancing/weighted_round_robin_config_test.cc
+++ b/test/core/load_balancing/weighted_round_robin_config_test.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/load_balancing/weighted_round_robin_test.cc b/test/core/load_balancing/weighted_round_robin_test.cc
index 8faa6c693e1..274d6543bf8 100644
--- a/test/core/load_balancing/weighted_round_robin_test.cc
+++ b/test/core/load_balancing/weighted_round_robin_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -36,10 +38,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/weighted_target/weighted_target.h"
diff --git a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc
index 3407ababe59..fb14dd90c34 100644
--- a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc
+++ b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/client_channel_service_config.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/load_balancing/xds/xds_override_host.h"
diff --git a/test/core/load_balancing/xds_override_host_test.cc b/test/core/load_balancing/xds_override_host_test.cc
index 4352b6db370..e487b6ab323 100644
--- a/test/core/load_balancing/xds_override_host_test.cc
+++ b/test/core/load_balancing/xds_override_host_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -33,10 +35,6 @@
 #include "absl/types/span.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/test/core/memory_usage/callback_client.cc b/test/core/memory_usage/callback_client.cc
index 449fcbd34fe..0f0630517ac 100644
--- a/test/core/memory_usage/callback_client.cc
+++ b/test/core/memory_usage/callback_client.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/status.h>
 #include <limits.h>
 #include <stdio.h>
 
@@ -31,13 +36,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/util/notification.h"
 #include "src/cpp/ext/chaotic_good.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
diff --git a/test/core/memory_usage/callback_server.cc b/test/core/memory_usage/callback_server.cc
index c630b4dc816..81a08b38725 100644
--- a/test/core/memory_usage/callback_server.cc
+++ b/test/core/memory_usage/callback_server.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/support/status.h>
+#include <grpcpp/xds_server_builder.h>
 #include <signal.h>
 #include <unistd.h>
 
@@ -26,13 +31,6 @@
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/cpp/ext/chaotic_good.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/core/memory_usage/client.cc b/test/core/memory_usage/client.cc
index 003b108e6dd..6591f48e294 100644
--- a/test/core/memory_usage/client.cc
+++ b/test/core/memory_usage/client.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/byte_buffer_reader.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -30,18 +40,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/byte_buffer_reader.h>
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc
index 798b90093da..04349e9bb10 100644
--- a/test/core/memory_usage/memory_usage_test.cc
+++ b/test/core/memory_usage/memory_usage_test.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -38,13 +43,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/wrappers.pb.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/env.h"
 #include "src/core/util/subprocess.h"
diff --git a/test/core/memory_usage/server.cc b/test/core/memory_usage/server.cc
index 4f41754d06c..294a10c95b4 100644
--- a/test/core/memory_usage/server.cc
+++ b/test/core/memory_usage/server.cc
@@ -26,17 +26,6 @@
 #include <unistd.h>
 #endif
 
-#include <algorithm>
-#include <string>
-#include <vector>
-
-#include "absl/base/attributes.h"
-#include "absl/flags/flag.h"
-#include "absl/flags/parse.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
@@ -47,6 +36,16 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
 
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "absl/base/attributes.h"
+#include "absl/flags/flag.h"
+#include "absl/flags/parse.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/message_size/message_size_service_config_test.cc b/test/core/message_size/message_size_service_config_test.cc
index 65fd3a11118..ed15404a886 100644
--- a/test/core/message_size/message_size_service_config_test.cc
+++ b/test/core/message_size/message_size_service_config_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
 #include <stddef.h>
 
 #include <memory>
@@ -21,10 +23,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/nanopb/fuzzer_response.cc b/test/core/nanopb/fuzzer_response.cc
index a952cf558dc..75b7c196536 100644
--- a/test/core/nanopb/fuzzer_response.cc
+++ b/test/core/nanopb/fuzzer_response.cc
@@ -16,11 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <grpc/grpc.h>
-
 #include "test/core/test_util/test_config.h"
 
 bool squelch = true;
diff --git a/test/core/nanopb/fuzzer_serverlist.cc b/test/core/nanopb/fuzzer_serverlist.cc
index 278f4c4cbfa..e58e855ebe1 100644
--- a/test/core/nanopb/fuzzer_serverlist.cc
+++ b/test/core/nanopb/fuzzer_serverlist.cc
@@ -16,11 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <grpc/grpc.h>
-
 #include "test/core/test_util/test_config.h"
 
 bool squelch = true;
diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc
index 9211b83e7ea..44b990eb5ee 100644
--- a/test/core/network_benchmarks/low_level_ping_pong.cc
+++ b/test/core/network_benchmarks/low_level_ping_pong.cc
@@ -33,14 +33,12 @@
 #ifdef __linux__
 #include <sys/epoll.h>
 #endif
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <sys/socket.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/util/strerror.h"
diff --git a/test/core/promise/activity_test.cc b/test/core/promise/activity_test.cc
index eccd2c8c9bc..45edfc35eec 100644
--- a/test/core/promise/activity_test.cc
+++ b/test/core/promise/activity_test.cc
@@ -22,7 +22,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/test/core/promise/arena_promise_test.cc b/test/core/promise/arena_promise_test.cc
index 2f4da3b2c5d..f51d26f114d 100644
--- a/test/core/promise/arena_promise_test.cc
+++ b/test/core/promise/arena_promise_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/lib/promise/arena_promise.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <array>
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/promise/bm_party.cc b/test/core/promise/bm_party.cc
index c271a4d240a..c6976e62a19 100644
--- a/test/core/promise/bm_party.cc
+++ b/test/core/promise/bm_party.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/promise/cancel_callback_test.cc b/test/core/promise/cancel_callback_test.cc
index 64ca6d0a8ce..3a674a009f6 100644
--- a/test/core/promise/cancel_callback_test.cc
+++ b/test/core/promise/cancel_callback_test.cc
@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/event_engine_wakeup_scheduler_test.cc b/test/core/promise/event_engine_wakeup_scheduler_test.cc
index 739c1a25f4e..4972de90245 100644
--- a/test/core/promise/event_engine_wakeup_scheduler_test.cc
+++ b/test/core/promise/event_engine_wakeup_scheduler_test.cc
@@ -14,16 +14,14 @@
 
 #include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
 #include <stdlib.h>
 
 #include <memory>
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/promise/exec_ctx_wakeup_scheduler_test.cc b/test/core/promise/exec_ctx_wakeup_scheduler_test.cc
index 27d1c49bdb6..d7fb2449bc1 100644
--- a/test/core/promise/exec_ctx_wakeup_scheduler_test.cc
+++ b/test/core/promise/exec_ctx_wakeup_scheduler_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/test/core/promise/for_each_test.cc b/test/core/promise/for_each_test.cc
index ea0f63732c1..c1863b6e4ea 100644
--- a/test/core/promise/for_each_test.cc
+++ b/test/core/promise/for_each_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/lib/promise/for_each.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/inter_activity_pipe.h"
 #include "src/core/lib/promise/join.h"
diff --git a/test/core/promise/inter_activity_latch_test.cc b/test/core/promise/inter_activity_latch_test.cc
index 925062c561b..d71ce40cae5 100644
--- a/test/core/promise/inter_activity_latch_test.cc
+++ b/test/core/promise/inter_activity_latch_test.cc
@@ -14,11 +14,10 @@
 
 #include "src/core/lib/promise/inter_activity_latch.h"
 
-#include "absl/status/status.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
 #include "src/core/lib/promise/seq.h"
diff --git a/test/core/promise/inter_activity_pipe_test.cc b/test/core/promise/inter_activity_pipe_test.cc
index a81ac5c1822..6493ff35b2d 100644
--- a/test/core/promise/inter_activity_pipe_test.cc
+++ b/test/core/promise/inter_activity_pipe_test.cc
@@ -18,7 +18,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/seq.h"
 #include "test/core/promise/test_wakeup_schedulers.h"
 
diff --git a/test/core/promise/interceptor_list_test.cc b/test/core/promise/interceptor_list_test.cc
index d52ba611006..6797c4dfe5a 100644
--- a/test/core/promise/interceptor_list_test.cc
+++ b/test/core/promise/interceptor_list_test.cc
@@ -14,12 +14,11 @@
 
 #include "src/core/lib/promise/interceptor_list.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/promise/join_test.cc b/test/core/promise/join_test.cc
index 7e60d65732f..2fd6b21dc96 100644
--- a/test/core/promise/join_test.cc
+++ b/test/core/promise/join_test.cc
@@ -19,7 +19,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 #include "test/core/promise/poll_matcher.h"
 
diff --git a/test/core/promise/latch_test.cc b/test/core/promise/latch_test.cc
index b1af24bd4bf..8fef26a0d40 100644
--- a/test/core/promise/latch_test.cc
+++ b/test/core/promise/latch_test.cc
@@ -20,7 +20,6 @@
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/seq.h"
diff --git a/test/core/promise/loop_test.cc b/test/core/promise/loop_test.cc
index 42362327915..7ec3a1060ef 100644
--- a/test/core/promise/loop_test.cc
+++ b/test/core/promise/loop_test.cc
@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/seq.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/map_pipe_test.cc b/test/core/promise/map_pipe_test.cc
index 5b702f2f8d0..5f891a36191 100644
--- a/test/core/promise/map_pipe_test.cc
+++ b/test/core/promise/map_pipe_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/lib/promise/map_pipe.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 #include <utility>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/for_each.h"
 #include "src/core/lib/promise/join.h"
diff --git a/test/core/promise/map_test.cc b/test/core/promise/map_test.cc
index 85697084084..cd6f373f3fe 100644
--- a/test/core/promise/map_test.cc
+++ b/test/core/promise/map_test.cc
@@ -18,7 +18,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/promise.h"
 #include "test/core/promise/poll_matcher.h"
 
diff --git a/test/core/promise/mpsc_test.cc b/test/core/promise/mpsc_test.cc
index 0a486edff72..fd852b088de 100644
--- a/test/core/promise/mpsc_test.cc
+++ b/test/core/promise/mpsc_test.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/lib/promise/mpsc.h"
 
+#include <grpc/support/log.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/log.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/promise.h"
 #include "test/core/promise/poll_matcher.h"
diff --git a/test/core/promise/observable_test.cc b/test/core/promise/observable_test.cc
index 45fb438ebd1..8de6dd56812 100644
--- a/test/core/promise/observable_test.cc
+++ b/test/core/promise/observable_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/promise/observable.h"
 
+#include <grpc/support/log.h>
+
 #include <cstdint>
 #include <limits>
 #include <thread>
@@ -22,9 +24,6 @@
 #include "absl/strings/str_join.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/log.h>
-
 #include "src/core/lib/promise/loop.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc
index 09075395bf4..540163333fa 100644
--- a/test/core/promise/party_test.cc
+++ b/test/core/promise/party_test.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/promise/party.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
 #include <stdio.h>
 
 #include <algorithm>
@@ -25,11 +28,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc
index b74f29df2e8..d1cffb08d97 100644
--- a/test/core/promise/pipe_test.cc
+++ b/test/core/promise/pipe_test.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/promise/pipe.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+
 #include <memory>
 #include <tuple>
 #include <utility>
@@ -22,10 +25,6 @@
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/map.h"
diff --git a/test/core/promise/prioritized_race_test.cc b/test/core/promise/prioritized_race_test.cc
index c663fe041d0..53bc0830719 100644
--- a/test/core/promise/prioritized_race_test.cc
+++ b/test/core/promise/prioritized_race_test.cc
@@ -17,7 +17,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/promise_factory_test.cc b/test/core/promise/promise_factory_test.cc
index 3690d78e5cc..f6418c3ed47 100644
--- a/test/core/promise/promise_factory_test.cc
+++ b/test/core/promise/promise_factory_test.cc
@@ -16,7 +16,6 @@
 
 #include "absl/functional/bind_front.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/promise_fuzzer.cc b/test/core/promise/promise_fuzzer.cc
index 0b70153d023..28214f96f4b 100644
--- a/test/core/promise/promise_fuzzer.cc
+++ b/test/core/promise/promise_fuzzer.cc
@@ -23,7 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/map.h"
diff --git a/test/core/promise/promise_mutex_test.cc b/test/core/promise/promise_mutex_test.cc
index 9ef2c778d65..8bbadd03925 100644
--- a/test/core/promise/promise_mutex_test.cc
+++ b/test/core/promise/promise_mutex_test.cc
@@ -19,7 +19,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/test/core/promise/race_test.cc b/test/core/promise/race_test.cc
index 16fbdb13d0a..4369fa81472 100644
--- a/test/core/promise/race_test.cc
+++ b/test/core/promise/race_test.cc
@@ -17,7 +17,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/sleep_test.cc b/test/core/promise/sleep_test.cc
index eaa816294da..842320d4eff 100644
--- a/test/core/promise/sleep_test.cc
+++ b/test/core/promise/sleep_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/promise/sleep.h"
 
+#include <grpc/grpc.h>
+
 #include <chrono>
 #include <cstddef>
 #include <memory>
@@ -23,9 +25,6 @@
 #include "absl/log/log.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/promise/try_seq_metadata_test.cc b/test/core/promise/try_seq_metadata_test.cc
index 34c74a83211..1f8c583a810 100644
--- a/test/core/promise/try_seq_metadata_test.cc
+++ b/test/core/promise/try_seq_metadata_test.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/memory_allocator.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/test/core/promise/wait_for_callback_test.cc b/test/core/promise/wait_for_callback_test.cc
index 25f5771379c..f710717ba78 100644
--- a/test/core/promise/wait_for_callback_test.cc
+++ b/test/core/promise/wait_for_callback_test.cc
@@ -16,7 +16,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/map.h"
 #include "src/core/util/notification.h"
 #include "test/core/promise/test_wakeup_schedulers.h"
diff --git a/test/core/resolver/binder_resolver_test.cc b/test/core/resolver/binder_resolver_test.cc
index 7f6d3b9f14c..fa8430fb11f 100644
--- a/test/core/resolver/binder_resolver_test.cc
+++ b/test/core/resolver/binder_resolver_test.cc
@@ -20,7 +20,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolved_address.h"
@@ -43,10 +42,9 @@
 #include <sys/un.h>
 #endif  // GPR_WINDOWS
 
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/resolver/resolver_registry.h"
 
diff --git a/test/core/resolver/dns_resolver_cooldown_test.cc b/test/core/resolver/dns_resolver_cooldown_test.cc
index ad7b6a3a8c3..8682a1b2553 100644
--- a/test/core/resolver/dns_resolver_cooldown_test.cc
+++ b/test/core/resolver/dns_resolver_cooldown_test.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -29,15 +36,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/resolver/dns_resolver_test.cc b/test/core/resolver/dns_resolver_test.cc
index 4bf8a069c8b..9a80fbc2787 100644
--- a/test/core/resolver/dns_resolver_test.cc
+++ b/test/core/resolver/dns_resolver_test.cc
@@ -25,7 +25,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/resolver/endpoint_addresses_test.cc b/test/core/resolver/endpoint_addresses_test.cc
index dafb5a54aac..1d2c848aea2 100644
--- a/test/core/resolver/endpoint_addresses_test.cc
+++ b/test/core/resolver/endpoint_addresses_test.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/resolver/endpoint_addresses.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <set>
 
 #include "absl/log/check.h"
@@ -23,9 +25,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/test/core/resolver/fake_resolver_test.cc b/test/core/resolver/fake_resolver_test.cc
index 9b14b43d431..2f4b7621b39 100644
--- a/test/core/resolver/fake_resolver_test.cc
+++ b/test/core/resolver/fake_resolver_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/resolver/fake/fake_resolver.h"
 
+#include <grpc/grpc.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -34,9 +35,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/notification.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/resolver/google_c2p_resolver_test.cc b/test/core/resolver/google_c2p_resolver_test.cc
index 96ddc587c4e..52e9d57b5ae 100644
--- a/test/core/resolver/google_c2p_resolver_test.cc
+++ b/test/core/resolver/google_c2p_resolver_test.cc
@@ -14,6 +14,11 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -25,13 +30,6 @@
 
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/util/env.h"
 #include "test/core/test_util/fake_udp_and_tcp_server.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/resolver/sockaddr_resolver_test.cc b/test/core/resolver/sockaddr_resolver_test.cc
index faf90400364..94559aca191 100644
--- a/test/core/resolver/sockaddr_resolver_test.cc
+++ b/test/core/resolver/sockaddr_resolver_test.cc
@@ -24,7 +24,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/resource_quota/arena_test.cc b/test/core/resource_quota/arena_test.cc
index 997b7760d22..bac5cf13e6e 100644
--- a/test/core/resource_quota/arena_test.cc
+++ b/test/core/resource_quota/arena_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/resource_quota/arena.h"
 
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -31,10 +33,6 @@
 #include "absl/strings/str_join.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/resource_quota/memory_quota_fuzzer.cc b/test/core/resource_quota/memory_quota_fuzzer.cc
index 654f20e291a..a3296fb43fb 100644
--- a/test/core/resource_quota/memory_quota_fuzzer.cc
+++ b/test/core/resource_quota/memory_quota_fuzzer.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/support/log.h>
 #include <stdint.h>
 #include <sys/types.h>
 
@@ -24,11 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/support/log.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/test/core/resource_quota/memory_quota_stress_test.cc b/test/core/resource_quota/memory_quota_stress_test.cc
index a8086810cc7..eb8c66127d3 100644
--- a/test/core/resource_quota/memory_quota_stress_test.cc
+++ b/test/core/resource_quota/memory_quota_stress_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/memory_request.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -29,10 +31,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/resource_quota/memory_quota_test.cc b/test/core/resource_quota/memory_quota_test.cc
index 245fe892c97..31993f03377 100644
--- a/test/core/resource_quota/memory_quota_test.cc
+++ b/test/core/resource_quota/memory_quota_test.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/resource_quota/memory_quota.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/log.h>
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -23,10 +26,6 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/log.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/resource_quota/call_checker.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/resource_quota/periodic_update_test.cc b/test/core/resource_quota/periodic_update_test.cc
index 90d98913693..4ae6709e18d 100644
--- a/test/core/resource_quota/periodic_update_test.cc
+++ b/test/core/resource_quota/periodic_update_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/resource_quota/periodic_update.h"
 
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <memory>
@@ -21,10 +23,6 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 
 namespace grpc_core {
diff --git a/test/core/resource_quota/resource_quota_test.cc b/test/core/resource_quota/resource_quota_test.cc
index 3ea0046f773..c0dfd8da44e 100644
--- a/test/core/resource_quota/resource_quota_test.cc
+++ b/test/core/resource_quota/resource_quota_test.cc
@@ -15,7 +15,6 @@
 #include "src/core/lib/resource_quota/resource_quota.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc
index 9f76b2bf738..80d2a065a86 100644
--- a/test/core/security/alts_credentials_fuzzer.cc
+++ b/test/core/security/alts_credentials_fuzzer.cc
@@ -16,16 +16,14 @@
 //
 //
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/security/credentials/alts/alts_credentials.h"
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
diff --git a/test/core/security/alts_security_connector_test.cc b/test/core/security/alts_security_connector_test.cc
index 02a7cf5e1a4..f215eee5a78 100644
--- a/test/core/security/alts_security_connector_test.cc
+++ b/test/core/security/alts_security_connector_test.cc
@@ -18,17 +18,14 @@
 
 #include "src/core/lib/security/security_connector/alts/alts_security_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
diff --git a/test/core/security/auth_context_test.cc b/test/core/security/auth_context_test.cc
index 9443712cc91..64efbb79590 100644
--- a/test/core/security/auth_context_test.cc
+++ b/test/core/security/auth_context_test.cc
@@ -16,12 +16,10 @@
 //
 //
 
-#include <string.h>
-
 #include <gtest/gtest.h>
+#include <string.h>
 
 #include "absl/log/log.h"
-
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/security/authorization_matchers_test.cc b/test/core/security/authorization_matchers_test.cc
index 3ce899e2a36..9cc15c665be 100644
--- a/test/core/security/authorization_matchers_test.cc
+++ b/test/core/security/authorization_matchers_test.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <list>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
+#include <list>
 
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/security/authorization/matchers.h"
diff --git a/test/core/security/aws_request_signer_test.cc b/test/core/security/aws_request_signer_test.cc
index 89c2d962ee7..11d93f5580d 100644
--- a/test/core/security/aws_request_signer_test.cc
+++ b/test/core/security/aws_request_signer_test.cc
@@ -17,11 +17,9 @@
 #include "src/core/lib/security/credentials/external/aws_request_signer.h"
 
 #include <gmock/gmock.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc_security.h>
 
+#include "absl/log/check.h"
 #include "test/core/test_util/test_config.h"
 
 namespace testing {
diff --git a/test/core/security/certificate_provider_registry_test.cc b/test/core/security/certificate_provider_registry_test.cc
index cca80deeb35..f4f1b48aa08 100644
--- a/test/core/security/certificate_provider_registry_test.cc
+++ b/test/core/security/certificate_provider_registry_test.cc
@@ -19,7 +19,6 @@
 #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 
 #include <gmock/gmock.h>
-
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
diff --git a/test/core/security/channel_creds_registry_test.cc b/test/core/security/channel_creds_registry_test.cc
index 399e26a58ea..f2a207ce439 100644
--- a/test/core/security/channel_creds_registry_test.cc
+++ b/test/core/security/channel_creds_registry_test.cc
@@ -19,12 +19,10 @@
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
 
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/credentials/composite/composite_credentials.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
diff --git a/test/core/security/check_gcp_environment_linux_test.cc b/test/core/security/check_gcp_environment_linux_test.cc
index b4122a8051e..2730ca757fe 100644
--- a/test/core/security/check_gcp_environment_linux_test.cc
+++ b/test/core/security/check_gcp_environment_linux_test.cc
@@ -16,13 +16,11 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/check_gcp_environment_windows_test.cc b/test/core/security/check_gcp_environment_windows_test.cc
index 7d1db40d69f..7659144350a 100644
--- a/test/core/security/check_gcp_environment_windows_test.cc
+++ b/test/core/security/check_gcp_environment_windows_test.cc
@@ -16,13 +16,11 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/create_jwt.cc b/test/core/security/create_jwt.cc
index f4f84a4ff4b..7d6c1188557 100644
--- a/test/core/security/create_jwt.cc
+++ b/test/core/security/create_jwt.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
 #include <grpc/credentials.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "src/core/lib/security/credentials/jwt/jwt_credentials.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc
index da207a6474b..f075bb32f91 100644
--- a/test/core/security/credentials_test.cc
+++ b/test/core/security/credentials_test.cc
@@ -18,29 +18,26 @@
 
 #include "src/core/lib/security/credentials/credentials.h"
 
+#include <gmock/gmock.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
+#include <openssl/rsa.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <string>
 
-#include <gmock/gmock.h>
-#include <openssl/rsa.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_replace.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/test/core/security/evaluate_args_test.cc b/test/core/security/evaluate_args_test.cc
index 0599416a898..91c954b0406 100644
--- a/test/core/security/evaluate_args_test.cc
+++ b/test/core/security/evaluate_args_test.cc
@@ -15,9 +15,8 @@
 #include "src/core/lib/security/authorization/evaluate_args.h"
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "test/core/test_util/evaluate_args_test_util.h"
diff --git a/test/core/security/fetch_oauth2.cc b/test/core/security/fetch_oauth2.cc
index b99d41f9dce..35c34eb3ef8 100644
--- a/test/core/security/fetch_oauth2.cc
+++ b/test/core/security/fetch_oauth2.cc
@@ -16,12 +16,6 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -29,7 +23,11 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpcpp/security/credentials.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/util/json_util.h"
diff --git a/test/core/security/grpc_alts_credentials_options_test.cc b/test/core/security/grpc_alts_credentials_options_test.cc
index 77f41ef7a8d..7884aa87885 100644
--- a/test/core/security/grpc_alts_credentials_options_test.cc
+++ b/test/core/security/grpc_alts_credentials_options_test.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
 
+#include <grpc/grpc.h>
+#include <gtest/gtest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/crash.h"
 
 #define ALTS_CLIENT_OPTIONS_TEST_TARGET_SERVICE_ACCOUNT_1 "abc@google.com"
diff --git a/test/core/security/grpc_audit_logging_test.cc b/test/core/security/grpc_audit_logging_test.cc
index 415a6089fa9..d6113a68e91 100644
--- a/test/core/security/grpc_audit_logging_test.cc
+++ b/test/core/security/grpc_audit_logging_test.cc
@@ -16,21 +16,19 @@
 //
 //
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 
-#include <gtest/gtest.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/test/core/security/grpc_authorization_engine_test.cc b/test/core/security/grpc_authorization_engine_test.cc
index 03f6b7d6a0d..4535c9c1287 100644
--- a/test/core/security/grpc_authorization_engine_test.cc
+++ b/test/core/security/grpc_authorization_engine_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_audit_logging.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/json/json.h"
diff --git a/test/core/security/grpc_authorization_policy_provider_test.cc b/test/core/security/grpc_authorization_policy_provider_test.cc
index bf1c6d81a28..0af5f2db8c3 100644
--- a/test/core/security/grpc_authorization_policy_provider_test.cc
+++ b/test/core/security/grpc_authorization_policy_provider_test.cc
@@ -15,10 +15,9 @@
 #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h"
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/security/grpc_tls_certificate_distributor_test.cc b/test/core/security/grpc_tls_certificate_distributor_test.cc
index c3459b22370..374969aeca1 100644
--- a/test/core/security/grpc_tls_certificate_distributor_test.cc
+++ b/test/core/security/grpc_tls_certificate_distributor_test.cc
@@ -16,19 +16,17 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 
+#include <gmock/gmock.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+
 #include <deque>
 #include <list>
 #include <string>
 #include <thread>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc
index d0ce58ecafb..32f47d44d0c 100644
--- a/test/core/security/grpc_tls_certificate_provider_test.cc
+++ b/test/core/security/grpc_tls_certificate_provider_test.cc
@@ -16,18 +16,16 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
-#include <deque>
-#include <list>
-
 #include <gmock/gmock.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <gtest/gtest.h>
 
+#include <deque>
+#include <list>
+
 #include "absl/log/check.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/tmpfile.h"
diff --git a/test/core/security/grpc_tls_certificate_verifier_test.cc b/test/core/security/grpc_tls_certificate_verifier_test.cc
index 162c2e3c367..deafd044262 100644
--- a/test/core/security/grpc_tls_certificate_verifier_test.cc
+++ b/test/core/security/grpc_tls_certificate_verifier_test.cc
@@ -16,17 +16,15 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
 
-#include <deque>
-#include <list>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+
+#include <deque>
+#include <list>
 
+#include "absl/log/log.h"
 #include "src/core/lib/security/security_connector/tls/tls_security_connector.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc
index 8e2784c77d6..9064a430e0a 100644
--- a/test/core/security/grpc_tls_credentials_options_test.cc
+++ b/test/core/security/grpc_tls_credentials_options_test.cc
@@ -19,12 +19,11 @@
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/security/credentials/tls/tls_credentials.h"
diff --git a/test/core/security/grpc_tls_crl_provider_test.cc b/test/core/security/grpc_tls_crl_provider_test.cc
index d8bb630005d..6331283effb 100644
--- a/test/core/security/grpc_tls_crl_provider_test.cc
+++ b/test/core/security/grpc_tls_crl_provider_test.cc
@@ -18,23 +18,21 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/grpc_crl_provider.h>
+#include <gtest/gtest.h>
+
 #include <chrono>
 #include <cstdlib>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/grpc_crl_provider.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "test/core/event_engine/event_engine_test_utils.h"
diff --git a/test/core/security/insecure_security_connector_test.cc b/test/core/security/insecure_security_connector_test.cc
index 31b175889e0..598ed8c5a83 100644
--- a/test/core/security/insecure_security_connector_test.cc
+++ b/test/core/security/insecure_security_connector_test.cc
@@ -19,9 +19,8 @@
 #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h"
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc
index 03569c4d1b5..f66bd7cb9e7 100644
--- a/test/core/security/json_token_test.cc
+++ b/test/core/security/json_token_test.cc
@@ -18,19 +18,16 @@
 
 #include "src/core/lib/security/credentials/jwt/json_token.h"
 
-#include <string.h>
-
-#include <gtest/gtest.h>
-#include <openssl/evp.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/escaping.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+#include <openssl/evp.h>
+#include <string.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/escaping.h"
 #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc
index 448dd57e7fc..7510ab738b7 100644
--- a/test/core/security/jwt_verifier_test.cc
+++ b/test/core/security/jwt_verifier_test.cc
@@ -18,17 +18,14 @@
 
 #include "src/core/lib/security/credentials/jwt/jwt_verifier.h"
 
-#include <string.h>
-
-#include <gtest/gtest.h>
-
-#include "absl/strings/escaping.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+#include <string.h>
 
+#include "absl/strings/escaping.h"
 #include "src/core/lib/security/credentials/jwt/json_token.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/http_client/httpcli.h"
diff --git a/test/core/security/local_security_connector_test.cc b/test/core/security/local_security_connector_test.cc
index 0470cd3bc1d..3975e148a6c 100644
--- a/test/core/security/local_security_connector_test.cc
+++ b/test/core/security/local_security_connector_test.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/impl/grpc_types.h>
+#include <gtest/gtest.h>
 
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/security/context/security_context.h"
diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc
index 6111bb25e61..66bd0968811 100644
--- a/test/core/security/oauth2_utils.cc
+++ b/test/core/security/oauth2_utils.cc
@@ -18,10 +18,6 @@
 
 #include "test/core/security/oauth2_utils.h"
 
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -29,7 +25,9 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h"
 #include "src/core/lib/promise/map.h"
diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc
index 1d715fe18cd..dc6e10aa4d8 100644
--- a/test/core/security/print_google_default_creds_token.cc
+++ b/test/core/security/print_google_default_creds_token.cc
@@ -16,18 +16,16 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/security/credentials/composite/composite_credentials.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
diff --git a/test/core/security/rbac_translator_test.cc b/test/core/security/rbac_translator_test.cc
index 0d7a798da34..156696637af 100644
--- a/test/core/security/rbac_translator_test.cc
+++ b/test/core/security/rbac_translator_test.cc
@@ -14,16 +14,14 @@
 
 #include "src/core/lib/security/authorization/rbac_translator.h"
 
-#include <memory>
-
 #include <gmock/gmock.h>
+#include <grpc/grpc_audit_logging.h>
 #include <gtest/gtest.h>
 
+#include <memory>
+
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_audit_logging.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/json/json.h"
diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc
index 6f4cd318820..c220ede196d 100644
--- a/test/core/security/secure_endpoint_test.cc
+++ b/test/core/security/secure_endpoint_test.cc
@@ -19,15 +19,12 @@
 #include "src/core/handshaker/security/secure_endpoint.h"
 
 #include <fcntl.h>
-#include <sys/types.h>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+#include <sys/types.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc
index dfccc4b7abe..2716441b900 100644
--- a/test/core/security/security_connector_test.cc
+++ b/test/core/security/security_connector_test.cc
@@ -18,18 +18,15 @@
 
 #include "src/core/lib/security/security_connector/security_connector.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/test/core/security/ssl_credentials_test.cc b/test/core/security/ssl_credentials_test.cc
index 8e63303c8b8..49171f6c4c5 100644
--- a/test/core/security/ssl_credentials_test.cc
+++ b/test/core/security/ssl_credentials_test.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/tsi/ssl_transport_security.h"
diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc
index 7ca9762c124..09c170fc44a 100644
--- a/test/core/security/ssl_server_fuzzer.cc
+++ b/test/core/security/ssl_server_fuzzer.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include "absl/log/check.h"
-#include "absl/synchronization/notification.h"
-
 #include <grpc/credentials.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 
+#include "absl/log/check.h"
+#include "absl/synchronization/notification.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
diff --git a/test/core/security/system_roots_test.cc b/test/core/security/system_roots_test.cc
index 9d94185edfb..c5c840085da 100644
--- a/test/core/security/system_roots_test.cc
+++ b/test/core/security/system_roots_test.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <stdio.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdio.h>
 
 #if defined(GPR_LINUX) || defined(GPR_FREEBSD) || defined(GPR_APPLE) || \
     defined(GPR_WINDOWS)
@@ -27,12 +26,11 @@
 #include <sys/param.h>
 #endif  // GPR_LINUX || GPR_FREEBSD || GPR_APPLE
 
-#include "gtest/gtest.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 
+#include "gtest/gtest.h"
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/security/security_connector/load_system_roots.h"
 #include "src/core/lib/security/security_connector/load_system_roots_supported.h"
diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc
index b2e933d6d16..16a498f6097 100644
--- a/test/core/security/tls_security_connector_test.cc
+++ b/test/core/security/tls_security_connector_test.cc
@@ -18,18 +18,15 @@
 
 #include "src/core/lib/security/security_connector/tls/tls_security_connector.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/security/context/security_context.h"
diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc
index b330c0dbf33..e977f2a8e06 100644
--- a/test/core/security/verify_jwt.cc
+++ b/test/core/security/verify_jwt.cc
@@ -16,17 +16,15 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/security/credentials/jwt/jwt_verifier.h"
diff --git a/test/core/security/xds_credentials_test.cc b/test/core/security/xds_credentials_test.cc
index 2d485f8f733..5434720e55d 100644
--- a/test/core/security/xds_credentials_test.cc
+++ b/test/core/security/xds_credentials_test.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/lib/security/credentials/xds/xds_credentials.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/server/server_config_selector_test.cc b/test/core/server/server_config_selector_test.cc
index 3bdf5a7dca0..3a023239285 100644
--- a/test/core/server/server_config_selector_test.cc
+++ b/test/core/server/server_config_selector_test.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/server/server_config_selector.h"
 
-#include "absl/status/status.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/server/xds_channel_stack_modifier_test.cc b/test/core/server/xds_channel_stack_modifier_test.cc
index 16f0e6e4e81..07569b8b93c 100644
--- a/test/core/server/xds_channel_stack_modifier_test.cc
+++ b/test/core/server/xds_channel_stack_modifier_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/server/xds_channel_stack_modifier.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <string>
 
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.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_impl.h"
diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc
index 24112d7732f..26a381084f9 100644
--- a/test/core/service_config/service_config_test.cc
+++ b/test/core/service_config/service_config_test.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/service_config/service_config.h"
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 
 #include <memory>
@@ -27,9 +28,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/slice/c_slice_buffer_test.cc b/test/core/slice/c_slice_buffer_test.cc
index 2f2edb50dcf..105d96afd70 100644
--- a/test/core/slice/c_slice_buffer_test.cc
+++ b/test/core/slice/c_slice_buffer_test.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <stddef.h>
-
-#include "gtest/gtest.h"
-
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
+#include <stddef.h>
 
+#include "gtest/gtest.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/slice/percent_decode_fuzzer.cc b/test/core/slice/percent_decode_fuzzer.cc
index 9124c042434..e7f3f4e15de 100644
--- a/test/core/slice/percent_decode_fuzzer.cc
+++ b/test/core/slice/percent_decode_fuzzer.cc
@@ -16,11 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <grpc/grpc.h>
-
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/test/core/slice/percent_encode_fuzzer.cc b/test/core/slice/percent_encode_fuzzer.cc
index 6deef7b8786..e6d10da820c 100644
--- a/test/core/slice/percent_encode_fuzzer.cc
+++ b/test/core/slice/percent_encode_fuzzer.cc
@@ -16,15 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/test/core/slice/percent_encoding_test.cc b/test/core/slice/percent_encoding_test.cc
index 6d3534e539e..8ed0eac045c 100644
--- a/test/core/slice/percent_encoding_test.cc
+++ b/test/core/slice/percent_encoding_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/slice/percent_encoding.h"
 
+#include <grpc/support/alloc.h>
 #include <stddef.h>
 
 #include <memory>
@@ -25,9 +26,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/slice/slice_buffer_test.cc b/test/core/slice/slice_buffer_test.cc
index 08bcf0429b7..f2f3dc42293 100644
--- a/test/core/slice/slice_buffer_test.cc
+++ b/test/core/slice/slice_buffer_test.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/slice/slice_buffer.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -21,11 +24,6 @@
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 
 using ::grpc_core::Slice;
diff --git a/test/core/slice/slice_string_helpers_test.cc b/test/core/slice/slice_string_helpers_test.cc
index a158a382221..ed4dfa62b99 100644
--- a/test/core/slice/slice_string_helpers_test.cc
+++ b/test/core/slice/slice_string_helpers_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/lib/slice/slice_string_helpers.h"
 
+#include <grpc/support/alloc.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/string.h"
 
 static void expect_slice_dump(grpc_slice slice, uint32_t flags,
diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc
index 1503e11abc7..734ece4db83 100644
--- a/test/core/slice/slice_test.cc
+++ b/test/core/slice/slice_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/slice/slice.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -31,10 +33,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 #include "src/core/util/memory.h"
diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc
index 0f0ba7cec07..7dd5da279b4 100644
--- a/test/core/surface/byte_buffer_reader_test.cc
+++ b/test/core/surface/byte_buffer_reader_test.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <string.h>
-
-#include <memory>
-
-#include "absl/log/log.h"
-#include "gtest/gtest.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
+#include <string.h>
+
+#include <memory>
 
+#include "absl/log/log.h"
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 TEST(GrpcByteBufferReaderTest, TestReadOneSlice) {
diff --git a/test/core/surface/channel_init_test.cc b/test/core/surface/channel_init_test.cc
index 29eadfed9a4..334a87e83d0 100644
--- a/test/core/surface/channel_init_test.cc
+++ b/test/core/surface/channel_init_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc
index 9175196fa1a..2ded6ce64bf 100644
--- a/test/core/surface/completion_queue_test.cc
+++ b/test/core/surface/completion_queue_test.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/surface/completion_queue.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <memory>
@@ -25,11 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/useful.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc
index 3d6dbd1fc97..f9a95f1d56b 100644
--- a/test/core/surface/completion_queue_threading_test.cc
+++ b/test/core/surface/completion_queue_threading_test.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -24,12 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc
index 329dd0ef286..ff6edf5d877 100644
--- a/test/core/surface/concurrent_connectivity_test.cc
+++ b/test/core/surface/concurrent_connectivity_test.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -26,14 +32,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/surface/init_test.cc b/test/core/surface/init_test.cc
index 58d0347a2bb..bff6d0564f6 100644
--- a/test/core/surface/init_test.cc
+++ b/test/core/surface/init_test.cc
@@ -18,16 +18,15 @@
 
 #include "src/core/lib/surface/init.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+
 #include <chrono>
 #include <memory>
 
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/thd.h"
diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc
index c81f2492c2b..f2fb59585a7 100644
--- a/test/core/surface/lame_client_test.cc
+++ b/test/core/surface/lame_client_test.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <string.h>
-
-#include <memory>
-
-#include "absl/status/status.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/propagation_bits.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
+#include <string.h>
+
+#include <memory>
 
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc
index 8eeb546e35b..f718ccef780 100644
--- a/test/core/surface/num_external_connectivity_watchers_test.cc
+++ b/test/core/surface/num_external_connectivity_watchers_test.cc
@@ -16,20 +16,18 @@
 //
 //
 
-#include <stddef.h>
-
-#include <string>
-
-#include "absl/log/log.h"
-#include "gtest/gtest.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
+
+#include <string>
 
+#include "absl/log/log.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc
index baa1e8d05d1..54f2ece9629 100644
--- a/test/core/surface/secure_channel_create_test.cc
+++ b/test/core/surface/secure_channel_create_test.cc
@@ -15,12 +15,11 @@
 //
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc
index ab6dfe4b1a6..e6467316c96 100644
--- a/test/core/surface/sequential_connectivity_test.cc
+++ b/test/core/surface/sequential_connectivity_test.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -24,14 +30,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc
index 359af60ff28..214175f7a0c 100644
--- a/test/core/surface/server_chttp2_test.cc
+++ b/test/core/surface/server_chttp2_test.cc
@@ -16,16 +16,15 @@
 //
 //
 
-#include <string>
-
-#include "gtest/gtest.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/time.h>
 
+#include <string>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/surface/server_test.cc b/test/core/surface/server_test.cc
index ec58b556a7f..67600a4ddf5 100644
--- a/test/core/surface/server_test.cc
+++ b/test/core/surface/server_test.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <memory>
@@ -26,13 +31,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/test/core/telemetry/call_tracer_test.cc b/test/core/telemetry/call_tracer_test.cc
index 688a5114156..fbc8892485b 100644
--- a/test/core/telemetry/call_tracer_test.cc
+++ b/test/core/telemetry/call_tracer_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/telemetry/call_tracer.h"
 
-#include <vector>
-
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/memory_allocator.h>
 #include <grpc/grpc.h>
 
+#include <vector>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/telemetry/metrics_test.cc b/test/core/telemetry/metrics_test.cc
index 8c492cb698f..ad139096e14 100644
--- a/test/core/telemetry/metrics_test.cc
+++ b/test/core/telemetry/metrics_test.cc
@@ -19,7 +19,6 @@
 #include "absl/log/log.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "test/core/test_util/fake_stats_plugin.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/telemetry/stats_test.cc b/test/core/telemetry/stats_test.cc
index 8f6a2f10960..9655d50eec1 100644
--- a/test/core/telemetry/stats_test.cc
+++ b/test/core/telemetry/stats_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/telemetry/stats.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/telemetry/stats_data.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/telemetry/trace_flags_test.cc b/test/core/telemetry/trace_flags_test.cc
index 06472794ba7..b23ccf3d7fb 100644
--- a/test/core/telemetry/trace_flags_test.cc
+++ b/test/core/telemetry/trace_flags_test.cc
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/strings/match.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/strings/match.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/debug/trace.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/test_util/audit_logging_utils.cc b/test/core/test_util/audit_logging_utils.cc
index 492cbb3312d..a4ff7768345 100644
--- a/test/core/test_util/audit_logging_utils.cc
+++ b/test/core/test_util/audit_logging_utils.cc
@@ -16,6 +16,10 @@
 
 #include "test/core/test_util/audit_logging_utils.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -23,11 +27,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json_writer.h"
 
 namespace grpc_core {
diff --git a/test/core/test_util/audit_logging_utils.h b/test/core/test_util/audit_logging_utils.h
index 6e46119bc36..4c119e11412 100644
--- a/test/core/test_util/audit_logging_utils.h
+++ b/test/core/test_util/audit_logging_utils.h
@@ -17,6 +17,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_AUDIT_LOGGING_UTILS_H
 #define GRPC_TEST_CORE_TEST_UTIL_AUDIT_LOGGING_UTILS_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -24,10 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/cmdline.cc b/test/core/test_util/cmdline.cc
index b22d0767c09..c4bcb299144 100644
--- a/test/core/test_util/cmdline.cc
+++ b/test/core/test_util/cmdline.cc
@@ -18,6 +18,7 @@
 
 #include "test/core/test_util/cmdline.h"
 
+#include <grpc/support/alloc.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,9 +31,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/memory.h"
 
 typedef enum { ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype;
diff --git a/test/core/test_util/cmdline.h b/test/core/test_util/cmdline.h
index d118d6a9412..91915d7551c 100644
--- a/test/core/test_util/cmdline.h
+++ b/test/core/test_util/cmdline.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_CMDLINE_H
 #define GRPC_TEST_CORE_TEST_UTIL_CMDLINE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 /// Simple command line parser.
 
 /// Supports flags that can be specified as -foo, --foo, --no-foo, -no-foo, etc
diff --git a/test/core/test_util/cmdline_test.cc b/test/core/test_util/cmdline_test.cc
index c292c768fbc..b94ade30dfa 100644
--- a/test/core/test_util/cmdline_test.cc
+++ b/test/core/test_util/cmdline_test.cc
@@ -22,7 +22,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/useful.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/test_util/evaluate_args_test_util.h b/test/core/test_util/evaluate_args_test_util.h
index 2d681d3b50f..f53aee93022 100644
--- a/test/core/test_util/evaluate_args_test_util.h
+++ b/test/core/test_util/evaluate_args_test_util.h
@@ -15,16 +15,14 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_EVALUATE_ARGS_TEST_UTIL_H
 #define GRPC_TEST_CORE_TEST_UTIL_EVALUATE_ARGS_TEST_UTIL_H
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/test_util/fake_stats_plugin.cc b/test/core/test_util/fake_stats_plugin.cc
index 3ce9431cd66..74d7dcecc1f 100644
--- a/test/core/test_util/fake_stats_plugin.cc
+++ b/test/core/test_util/fake_stats_plugin.cc
@@ -15,7 +15,6 @@
 #include "test/core/test_util/fake_stats_plugin.h"
 
 #include "absl/log/check.h"
-
 #include "src/core/lib/config/core_configuration.h"
 
 namespace grpc_core {
diff --git a/test/core/test_util/fake_stats_plugin.h b/test/core/test_util/fake_stats_plugin.h
index 4c60f0735fb..983213e71de 100644
--- a/test/core/test_util/fake_stats_plugin.h
+++ b/test/core/test_util/fake_stats_plugin.h
@@ -28,7 +28,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "gmock/gmock.h"
-
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/core/telemetry/metrics.h"
diff --git a/test/core/test_util/fake_udp_and_tcp_server.cc b/test/core/test_util/fake_udp_and_tcp_server.cc
index 68cc354b7a4..92118fa248e 100644
--- a/test/core/test_util/fake_udp_and_tcp_server.cc
+++ b/test/core/test_util/fake_udp_and_tcp_server.cc
@@ -17,6 +17,8 @@
 #include "test/core/test_util/fake_udp_and_tcp_server.h"
 
 #include <errno.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <set>
@@ -27,10 +29,6 @@
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/core/test_util/fake_udp_and_tcp_server.h b/test/core/test_util/fake_udp_and_tcp_server.h
index 3032f254f26..35a54471723 100644
--- a/test/core/test_util/fake_udp_and_tcp_server.h
+++ b/test/core/test_util/fake_udp_and_tcp_server.h
@@ -17,14 +17,14 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_FAKE_UDP_AND_TCP_SERVER_H
 #define GRPC_TEST_CORE_TEST_UTIL_FAKE_UDP_AND_TCP_SERVER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+
 #include <functional>
 #include <memory>
 #include <string>
 #include <thread>
 
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/fuzz_config_vars_helpers.cc b/test/core/test_util/fuzz_config_vars_helpers.cc
index 9029fdfd665..60075e0dee1 100644
--- a/test/core/test_util/fuzz_config_vars_helpers.cc
+++ b/test/core/test_util/fuzz_config_vars_helpers.cc
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include "absl/strings/str_join.h"
-
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/experiments/experiments.h"
 
diff --git a/test/core/test_util/fuzz_config_vars_helpers.h b/test/core/test_util/fuzz_config_vars_helpers.h
index 05edc5dc4b9..1601f49775f 100644
--- a/test/core/test_util/fuzz_config_vars_helpers.h
+++ b/test/core/test_util/fuzz_config_vars_helpers.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_HELPERS_H
 #define GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_HELPERS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 std::string ValidateExperimentsStringForFuzzing(uint64_t experiments);
diff --git a/test/core/test_util/fuzzer_corpus_test.cc b/test/core/test_util/fuzzer_corpus_test.cc
index 3eaef693f10..a80eff40bf4 100644
--- a/test/core/test_util/fuzzer_corpus_test.cc
+++ b/test/core/test_util/fuzzer_corpus_test.cc
@@ -17,6 +17,8 @@
 //
 
 #include <dirent.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,10 +33,6 @@
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/env.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/test_util/fuzzer_util.cc b/test/core/test_util/fuzzer_util.cc
index 5e55638af7e..05301487575 100644
--- a/test/core/test_util/fuzzer_util.cc
+++ b/test/core/test_util/fuzzer_util.cc
@@ -18,12 +18,11 @@
 
 #include "test/core/test_util/fuzzer_util.h"
 
+#include <grpc/support/alloc.h>
 #include <stddef.h>
 
 #include <algorithm>
 
-#include <grpc/support/alloc.h>
-
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/fuzzing_channel_args.h b/test/core/test_util/fuzzing_channel_args.h
index 83cb5497bd3..cae31e99eb7 100644
--- a/test/core/test_util/fuzzing_channel_args.h
+++ b/test/core/test_util/fuzzing_channel_args.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZING_CHANNEL_ARGS_H
 #define GRPC_TEST_CORE_TEST_UTIL_FUZZING_CHANNEL_ARGS_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/test_util/histogram.cc b/test/core/test_util/histogram.cc
index c1b88b99268..d94e78dc990 100644
--- a/test/core/test_util/histogram.cc
+++ b/test/core/test_util/histogram.cc
@@ -18,14 +18,12 @@
 
 #include "test/core/test_util/histogram.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <math.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/useful.h"
 
 // Histograms are stored with exponentially increasing bucket sizes.
diff --git a/test/core/test_util/histogram.h b/test/core/test_util/histogram.h
index d3e6ba52b40..98523fb61d8 100644
--- a/test/core/test_util/histogram.h
+++ b/test/core/test_util/histogram.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_HISTOGRAM_H
 #define GRPC_TEST_CORE_TEST_UTIL_HISTOGRAM_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include <grpc/support/port_platform.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/test/core/test_util/mock_endpoint.cc b/test/core/test_util/mock_endpoint.cc
index 8d16b2293ee..5706d8cedc3 100644
--- a/test/core/test_util/mock_endpoint.cc
+++ b/test/core/test_util/mock_endpoint.cc
@@ -18,16 +18,15 @@
 
 #include "test/core/test_util/mock_endpoint.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/event_engine_shims/endpoint.h"
 #include "src/core/util/down_cast.h"
diff --git a/test/core/test_util/mock_endpoint.h b/test/core/test_util/mock_endpoint.h
index 901b21eedd6..ccc8d74af28 100644
--- a/test/core/test_util/mock_endpoint.h
+++ b/test/core/test_util/mock_endpoint.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_MOCK_ENDPOINT_H
 #define GRPC_TEST_CORE_TEST_UTIL_MOCK_ENDPOINT_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/slice.h>
 
+#include <memory>
+
 #include "src/core/lib/iomgr/endpoint.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/test_util/one_corpus_entry_fuzzer.cc b/test/core/test_util/one_corpus_entry_fuzzer.cc
index d6cbe2b6827..71325b589fc 100644
--- a/test/core/test_util/one_corpus_entry_fuzzer.cc
+++ b/test/core/test_util/one_corpus_entry_fuzzer.cc
@@ -16,12 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdbool.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/crash.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/core/test_util/parse_hexstring.cc b/test/core/test_util/parse_hexstring.cc
index 0ede85e2c09..4468f9d97ce 100644
--- a/test/core/test_util/parse_hexstring.cc
+++ b/test/core/test_util/parse_hexstring.cc
@@ -18,13 +18,12 @@
 
 #include "test/core/test_util/parse_hexstring.h"
 
+#include <grpc/slice.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "absl/log/check.h"
 
-#include <grpc/slice.h>
-
 namespace grpc_core {
 Slice ParseHexstring(absl::string_view hexstring) {
   size_t nibbles = 0;
diff --git a/test/core/test_util/parse_hexstring.h b/test/core/test_util/parse_hexstring.h
index fe50f9bf959..d43f0148031 100644
--- a/test/core/test_util/parse_hexstring.h
+++ b/test/core/test_util/parse_hexstring.h
@@ -20,7 +20,6 @@
 #define GRPC_TEST_CORE_TEST_UTIL_PARSE_HEXSTRING_H
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/slice/slice.h"
 
 namespace grpc_core {
diff --git a/test/core/test_util/passthrough_endpoint.h b/test/core/test_util/passthrough_endpoint.h
index cf8abe834d1..b8fe820f6e4 100644
--- a/test/core/test_util/passthrough_endpoint.h
+++ b/test/core/test_util/passthrough_endpoint.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_PASSTHROUGH_ENDPOINT_H
 #define GRPC_TEST_CORE_TEST_UTIL_PASSTHROUGH_ENDPOINT_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 
+#include <memory>
+
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/util/ref_counted.h"
diff --git a/test/core/test_util/port.cc b/test/core/test_util/port.cc
index 3a5a04bf117..bac509ee232 100644
--- a/test/core/test_util/port.cc
+++ b/test/core/test_util/port.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/lib/iomgr/port.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/util/sync.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/port_server_client.h"
diff --git a/test/core/test_util/port_isolated_runtime_environment.cc b/test/core/test_util/port_isolated_runtime_environment.cc
index 57fa3865112..8c429df1e66 100644
--- a/test/core/test_util/port_isolated_runtime_environment.cc
+++ b/test/core/test_util/port_isolated_runtime_environment.cc
@@ -22,13 +22,11 @@
 // runs in a separate container) the framework takes a round-robin pick of a
 // port within certain range. There is no need to recycle ports.
 //
-#include <stdlib.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/support/atm.h>
 #include <grpc/support/time.h>
+#include <stdlib.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/test_util/port_server_client.cc b/test/core/test_util/port_server_client.cc
index 5a8b4d4d2ed..65287efbe48 100644
--- a/test/core/test_util/port_server_client.cc
+++ b/test/core/test_util/port_server_client.cc
@@ -18,6 +18,13 @@
 
 #include "test/core/test_util/port_server_client.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,15 +38,6 @@
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/test_util/proto_bit_gen.h b/test/core/test_util/proto_bit_gen.h
index 3732acca2a2..5f307ab7363 100644
--- a/test/core/test_util/proto_bit_gen.h
+++ b/test/core/test_util/proto_bit_gen.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_PROTO_BIT_GEN_H
 #define GRPC_TEST_CORE_TEST_UTIL_PROTO_BIT_GEN_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
@@ -22,8 +23,6 @@
 #include <random>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Set of random numbers from a proto file (or other container) forming a bit
diff --git a/test/core/test_util/reconnect_server.cc b/test/core/test_util/reconnect_server.cc
index 871c1298f8b..478e078cecd 100644
--- a/test/core/test_util/reconnect_server.cc
+++ b/test/core/test_util/reconnect_server.cc
@@ -18,14 +18,12 @@
 
 #include "test/core/test_util/reconnect_server.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/test/core/test_util/reconnect_server.h b/test/core/test_util/reconnect_server.h
index d04661c9c6e..018362985d7 100644
--- a/test/core/test_util/reconnect_server.h
+++ b/test/core/test_util/reconnect_server.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_RECONNECT_SERVER_H
 #define GRPC_TEST_CORE_TEST_UTIL_RECONNECT_SERVER_H
 
-#include <string>
-
 #include <grpc/support/time.h>
 
+#include <string>
+
 #include "test/core/test_util/test_tcp_server.h"
 
 typedef struct timestamp_list {
diff --git a/test/core/test_util/resolve_localhost_ip46.cc b/test/core/test_util/resolve_localhost_ip46.cc
index ba58738b8e4..c2cb8077407 100644
--- a/test/core/test_util/resolve_localhost_ip46.cc
+++ b/test/core/test_util/resolve_localhost_ip46.cc
@@ -18,15 +18,14 @@
 
 #include "test/core/test_util/resolve_localhost_ip46.h"
 
+#include <grpc/support/sync.h>
+
 #include <memory>
 #include <vector>
 
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/core/test_util/slice_splitter.cc b/test/core/test_util/slice_splitter.cc
index 0190255bc44..e2211e152ff 100644
--- a/test/core/test_util/slice_splitter.cc
+++ b/test/core/test_util/slice_splitter.cc
@@ -18,14 +18,13 @@
 
 #include "test/core/test_util/slice_splitter.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <algorithm>
 
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-
 const char* grpc_slice_split_mode_name(grpc_slice_split_mode mode) {
   switch (mode) {
     case GRPC_SLICE_SPLIT_IDENTITY:
diff --git a/test/core/test_util/slice_splitter.h b/test/core/test_util/slice_splitter.h
index 8af3dc7ac8e..90e8107db53 100644
--- a/test/core/test_util/slice_splitter.h
+++ b/test/core/test_util/slice_splitter.h
@@ -22,9 +22,8 @@
 // utility function to split/merge slices together to help create test
 // cases
 
-#include <stddef.h>
-
 #include <grpc/slice.h>
+#include <stddef.h>
 
 typedef enum {
   // merge all input slices into a single slice
diff --git a/test/core/test_util/socket_use_after_close_detector.cc b/test/core/test_util/socket_use_after_close_detector.cc
index 8d2c77b2555..546936d4122 100644
--- a/test/core/test_util/socket_use_after_close_detector.cc
+++ b/test/core/test_util/socket_use_after_close_detector.cc
@@ -20,13 +20,14 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
-
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 // IWYU pragma: no_include <arpa/inet.h>
 // IWYU pragma: no_include <unistd.h>
 
+#include <grpc/support/sync.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -35,9 +36,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "test/core/test_util/port.h"
 
diff --git a/test/core/test_util/socket_use_after_close_detector.h b/test/core/test_util/socket_use_after_close_detector.h
index 67e7b2e73bd..36b333b82ee 100644
--- a/test/core/test_util/socket_use_after_close_detector.h
+++ b/test/core/test_util/socket_use_after_close_detector.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_SOCKET_USE_AFTER_CLOSE_DETECTOR_H
 #define GRPC_TEST_CORE_TEST_UTIL_SOCKET_USE_AFTER_CLOSE_DETECTOR_H
 
-#include <memory>
-#include <thread>
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync_generic.h>
 
+#include <memory>
+#include <thread>
+
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/stack_tracer.cc b/test/core/test_util/stack_tracer.cc
index 305a43c8fc4..979e5dad534 100644
--- a/test/core/test_util/stack_tracer.cc
+++ b/test/core/test_util/stack_tracer.cc
@@ -18,14 +18,13 @@
 
 #include "test/core/test_util/stack_tracer.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdio>
 #include <string>
 
 #include "absl/debugging/stacktrace.h"
 #include "absl/debugging/symbolize.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/examine_stack.h"
 
 namespace {
diff --git a/test/core/test_util/stack_tracer.h b/test/core/test_util/stack_tracer.h
index 82870cbe770..e1b231862d8 100644
--- a/test/core/test_util/stack_tracer.h
+++ b/test/core/test_util/stack_tracer.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_STACK_TRACER_H
 #define GRPC_TEST_CORE_TEST_UTIL_STACK_TRACER_H
 
-#include <string>
-
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/stack_tracer_test.cc b/test/core/test_util/stack_tracer_test.cc
index 701ffaddbfe..36039e2ac27 100644
--- a/test/core/test_util/stack_tracer_test.cc
+++ b/test/core/test_util/stack_tracer_test.cc
@@ -23,7 +23,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 TEST(StackTracerTest, Basic) {
diff --git a/test/core/test_util/test_config.cc b/test/core/test_util/test_config.cc
index 0395887fe7a..b8682828119 100644
--- a/test/core/test_util/test_config.cc
+++ b/test/core/test_util/test_config.cc
@@ -18,6 +18,9 @@
 
 #include "test/core/test_util/test_config.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -31,11 +34,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/surface/init.h"
 #include "src/core/util/crash.h"
 #include "test/core/event_engine/test_init.h"
diff --git a/test/core/test_util/test_config.h b/test/core/test_util/test_config.h
index 5fb385ce31c..8a2020af2ce 100644
--- a/test/core/test_util/test_config.h
+++ b/test/core/test_util/test_config.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_TEST_CONFIG_H
 #define GRPC_TEST_CORE_TEST_UTIL_TEST_CONFIG_H
 
-#include <stdint.h>
-
 #include <grpc/support/time.h>
+#include <stdint.h>
 
 extern int64_t g_fixture_slowdown_factor;
 extern int64_t g_poller_slowdown_factor;
diff --git a/test/core/test_util/test_lb_policies.cc b/test/core/test_util/test_lb_policies.cc
index afd701417cb..d02b224793a 100644
--- a/test/core/test_util/test_lb_policies.cc
+++ b/test/core/test_util/test_lb_policies.cc
@@ -16,6 +16,8 @@
 
 #include "test/core/test_util/test_lb_policies.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stdint.h>
 
 #include <memory>
@@ -26,10 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/client_channel/lb_metadata.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/test_util/test_lb_policies.h b/test/core/test_util/test_lb_policies.h
index 235a6990734..18c016fb80f 100644
--- a/test/core/test_util/test_lb_policies.h
+++ b/test/core/test_util/test_lb_policies.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_TEST_LB_POLICIES_H
 #define GRPC_TEST_CORE_TEST_UTIL_TEST_LB_POLICIES_H
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <functional>
 #include <string>
@@ -25,9 +27,6 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/test/core/test_util/test_tcp_server.cc b/test/core/test_util/test_tcp_server.cc
index cc3d2957648..25193394c40 100644
--- a/test/core/test_util/test_tcp_server.cc
+++ b/test/core/test_util/test_tcp_server.cc
@@ -18,6 +18,10 @@
 
 #include "test/core/test_util/test_tcp_server.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -25,12 +29,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/test_util/test_tcp_server.h b/test/core/test_util/test_tcp_server.h
index 66818e1b774..634fc728633 100644
--- a/test/core/test_util/test_tcp_server.h
+++ b/test/core/test_util/test_tcp_server.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_TEST_TCP_SERVER_H
 #define GRPC_TEST_CORE_TEST_UTIL_TEST_TCP_SERVER_H
 
-#include <vector>
-
 #include <grpc/support/sync.h>
 
+#include <vector>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/tcp_server.h"
diff --git a/test/core/test_util/tls_utils.cc b/test/core/test_util/tls_utils.cc
index c2dfd13eea9..a891e43c33c 100644
--- a/test/core/test_util/tls_utils.cc
+++ b/test/core/test_util/tls_utils.cc
@@ -15,16 +15,14 @@
 //
 #include "test/core/test_util/tls_utils.h"
 
-#include <stdio.h>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
+#include <stdio.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/load_file.h"
diff --git a/test/core/test_util/tls_utils.h b/test/core/test_util/tls_utils.h
index 5cd12ac6a10..4c9ccf720da 100644
--- a/test/core/test_util/tls_utils.h
+++ b/test/core/test_util/tls_utils.h
@@ -17,17 +17,16 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_TLS_UTILS_H
 #define GRPC_TEST_CORE_TEST_UTIL_TLS_UTILS_H
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/status.h>
+
 #include <deque>
 #include <string>
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/thd.h"
diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc
index b8e0ded91a0..b7174df8e93 100644
--- a/test/core/transport/bdp_estimator_test.cc
+++ b/test/core/transport/bdp_estimator_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/transport/bdp_estimator.h"
 
+#include <grpc/grpc.h>
 #include <stdlib.h>
 
 #include <algorithm>
 #include <atomic>
 
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/transport/benchmarks/bm_chaotic_good.cc b/test/core/transport/benchmarks/bm_chaotic_good.cc
index 362693429d6..6610e66e1aa 100644
--- a/test/core/transport/benchmarks/bm_chaotic_good.cc
+++ b/test/core/transport/benchmarks/bm_chaotic_good.cc
@@ -13,12 +13,10 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/test/core/transport/benchmarks/bm_inproc.cc b/test/core/transport/benchmarks/bm_inproc.cc
index f7725628f45..cb8d1fe31c3 100644
--- a/test/core/transport/benchmarks/bm_inproc.cc
+++ b/test/core/transport/benchmarks/bm_inproc.cc
@@ -12,15 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
 #include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
+
+#include <memory>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "test/core/transport/call_spine_benchmarks.h"
diff --git a/test/core/transport/binder/binder_transport_test.cc b/test/core/transport/binder/binder_transport_test.cc
index 5ad7150e8e2..959a6fd33a0 100644
--- a/test/core/transport/binder/binder_transport_test.cc
+++ b/test/core/transport/binder/binder_transport_test.cc
@@ -18,19 +18,17 @@
 // transform into the correct sequence of binder transactions.
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/binder_security_policy.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/transport/binder_stream.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/transport/binder/end2end/binder_server_test.cc b/test/core/transport/binder/end2end/binder_server_test.cc
index a1d26094e42..da17a099e4b 100644
--- a/test/core/transport/binder/end2end/binder_server_test.cc
+++ b/test/core/transport/binder/end2end/binder_server_test.cc
@@ -14,18 +14,16 @@
 
 #include "src/core/ext/transport/binder/server/binder_server.h"
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/binder_credentials.h>
+#include <grpcpp/security/binder_security_policy.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/binder_credentials.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/client/channel_create_impl.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/transport/binder/end2end/fake_binder.h"
diff --git a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc
index 7c24090894e..bc8f7be9078 100644
--- a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc
+++ b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc
@@ -12,18 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <grpcpp/grpcpp.h>
+#include <gtest/gtest.h>
+
 #include <string>
 #include <thread>
 #include <utility>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
 #include "absl/time/time.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/transport/binder/end2end/fake_binder.cc b/test/core/transport/binder/end2end/fake_binder.cc
index 6a5cc9698ac..d3e93f50ada 100644
--- a/test/core/transport/binder/end2end/fake_binder.cc
+++ b/test/core/transport/binder/end2end/fake_binder.cc
@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc_binder {
diff --git a/test/core/transport/binder/end2end/fake_binder.h b/test/core/transport/binder/end2end/fake_binder.h
index 6dbb532a230..46877bfb9de 100644
--- a/test/core/transport/binder/end2end/fake_binder.h
+++ b/test/core/transport/binder/end2end/fake_binder.h
@@ -63,7 +63,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/variant.h"
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/transport/binder/end2end/fake_binder_test.cc b/test/core/transport/binder/end2end/fake_binder_test.cc
index 47bcc3704bc..68875bcd864 100644
--- a/test/core/transport/binder/end2end/fake_binder_test.cc
+++ b/test/core/transport/binder/end2end/fake_binder_test.cc
@@ -14,17 +14,16 @@
 
 #include "test/core/transport/binder/end2end/fake_binder.h"
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <random>
 #include <string>
 #include <utility>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/strings/str_format.h"
 #include "absl/time/time.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_binder {
diff --git a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc
index e62c056c8b7..e852b032fcb 100644
--- a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc
+++ b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc
@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <thread>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/executor.h"
diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
index 8b4affab2cc..ee47780b227 100644
--- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
+++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
@@ -23,7 +23,6 @@
 
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
index bc8f0400b00..d0fdaab3400 100644
--- a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
+++ b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/check.h"
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/executor.h"
diff --git a/test/core/transport/binder/end2end/testing_channel_create.cc b/test/core/transport/binder/end2end/testing_channel_create.cc
index 50d9470960e..58a9a03006d 100644
--- a/test/core/transport/binder/end2end/testing_channel_create.cc
+++ b/test/core/transport/binder/end2end/testing_channel_create.cc
@@ -14,12 +14,11 @@
 
 #include "test/core/transport/binder/end2end/testing_channel_create.h"
 
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/transport/binder/end2end/testing_channel_create.h b/test/core/transport/binder/end2end/testing_channel_create.h
index 8838f7265e7..2efe71365fe 100644
--- a/test/core/transport/binder/end2end/testing_channel_create.h
+++ b/test/core/transport/binder/end2end/testing_channel_create.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H
 #define GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H
 
-#include <utility>
-
 #include <grpcpp/grpcpp.h>
 
+#include <utility>
+
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/server/server.h"
 #include "test/core/transport/binder/end2end/fake_binder.h"
diff --git a/test/core/transport/binder/endpoint_binder_pool_test.cc b/test/core/transport/binder/endpoint_binder_pool_test.cc
index bba32557f4c..5086a2ea18c 100644
--- a/test/core/transport/binder/endpoint_binder_pool_test.cc
+++ b/test/core/transport/binder/endpoint_binder_pool_test.cc
@@ -14,16 +14,15 @@
 
 #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <cassert>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
 #include "test/core/test_util/test_config.h"
 #include "test/core/transport/binder/mock_objects.h"
 
diff --git a/test/core/transport/binder/transport_stream_receiver_test.cc b/test/core/transport/binder/transport_stream_receiver_test.cc
index 76d2689b8c4..86ead7f5c17 100644
--- a/test/core/transport/binder/transport_stream_receiver_test.cc
+++ b/test/core/transport/binder/transport_stream_receiver_test.cc
@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <cassert>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/transport/binder/wire_reader_test.cc b/test/core/transport/binder/wire_reader_test.cc
index 75a7432628d..bdfeaa98e8b 100644
--- a/test/core/transport/binder/wire_reader_test.cc
+++ b/test/core/transport/binder/wire_reader_test.cc
@@ -19,18 +19,16 @@
 // WireReaderImpl and both the output (readable) parcel and the transport stream
 // receiver are correct in all possible situations.
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/binder_security_policy.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <thread>
 #include <utility>
 
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/transport/binder/mock_objects.h"
diff --git a/test/core/transport/binder/wire_writer_test.cc b/test/core/transport/binder/wire_writer_test.cc
index 851430bdeff..7dffe26d5ab 100644
--- a/test/core/transport/binder/wire_writer_test.cc
+++ b/test/core/transport/binder/wire_writer_test.cc
@@ -14,15 +14,13 @@
 
 #include "src/core/ext/transport/binder/wire_format/wire_writer.h"
 
+#include <grpcpp/impl/grpc_library.h>
+#include <gtest/gtest.h>
+
 #include <string>
 #include <utility>
 
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
-#include <grpcpp/impl/grpc_library.h>
-
 #include "test/core/test_util/test_config.h"
 #include "test/core/transport/binder/mock_objects.h"
 
diff --git a/test/core/transport/bm_call_spine.cc b/test/core/transport/bm_call_spine.cc
index 7a757a5d733..749c2c9f5ae 100644
--- a/test/core/transport/bm_call_spine.cc
+++ b/test/core/transport/bm_call_spine.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/transport/call_arena_allocator_test.cc b/test/core/transport/call_arena_allocator_test.cc
index 1c5c222cf86..32235066106 100644
--- a/test/core/transport/call_arena_allocator_test.cc
+++ b/test/core/transport/call_arena_allocator_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/transport/call_arena_allocator.h"
 
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -31,10 +33,6 @@
 #include "absl/strings/str_join.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/transport/call_filters_test.cc b/test/core/transport/call_filters_test.cc
index 77973df2c48..7e8a5e3c3ca 100644
--- a/test/core/transport/call_filters_test.cc
+++ b/test/core/transport/call_filters_test.cc
@@ -18,7 +18,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "test/core/promise/poll_matcher.h"
 
 using testing::Mock;
diff --git a/test/core/transport/call_spine_benchmarks.h b/test/core/transport/call_spine_benchmarks.h
index d89f3678bdb..c62f1e21733 100644
--- a/test/core/transport/call_spine_benchmarks.h
+++ b/test/core/transport/call_spine_benchmarks.h
@@ -18,7 +18,6 @@
 #include <memory>
 
 #include "benchmark/benchmark.h"
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/transport/call_spine_test.cc b/test/core/transport/call_spine_test.cc
index b5807e28ec7..cd1c8020d5f 100644
--- a/test/core/transport/call_spine_test.cc
+++ b/test/core/transport/call_spine_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/transport/call_spine.h"
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 #include <queue>
@@ -21,9 +23,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/metadata.h"
 #include "test/core/call/yodel/yodel_test.h"
diff --git a/test/core/transport/call_state_test.cc b/test/core/transport/call_state_test.cc
index fcdf91b2818..4ad4a0ebe80 100644
--- a/test/core/transport/call_state_test.cc
+++ b/test/core/transport/call_state_test.cc
@@ -18,7 +18,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "test/core/promise/poll_matcher.h"
 
 using testing::Mock;
diff --git a/test/core/transport/chaotic_good/chaotic_good_server_test.cc b/test/core/transport/chaotic_good/chaotic_good_server_test.cc
index 1f1335f5f6c..b76b97b4bfc 100644
--- a/test/core/transport/chaotic_good/chaotic_good_server_test.cc
+++ b/test/core/transport/chaotic_good/chaotic_good_server_test.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+#include <grpcpp/server.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -24,12 +29,6 @@
 #include "absl/time/time.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-#include <grpcpp/server.h>
-
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc
index 8de27018183..99caac0602e 100644
--- a/test/core/transport/chaotic_good/client_transport_error_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_error_test.cc
@@ -12,6 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -28,14 +34,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc
index aad18ee1601..1739d1bbcec 100644
--- a/test/core/transport/chaotic_good/client_transport_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_test.cc
@@ -14,6 +14,13 @@
 
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+
 #include <algorithm>
 #include <cstddef>
 #include <cstdlib>
@@ -29,14 +36,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/loop.h"
diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc
index 3082b3645f0..11d2e3f64c5 100644
--- a/test/core/transport/chaotic_good/frame_fuzzer.cc
+++ b/test/core/transport/chaotic_good/frame_fuzzer.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_allocator.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -22,9 +23,6 @@
 #include "absl/log/log.h"
 #include "absl/random/bit_gen_ref.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
diff --git a/test/core/transport/chaotic_good/frame_header_fuzzer.cc b/test/core/transport/chaotic_good/frame_header_fuzzer.cc
index eaed3bfc379..765f7c35f0e 100644
--- a/test/core/transport/chaotic_good/frame_header_fuzzer.cc
+++ b/test/core/transport/chaotic_good/frame_header_fuzzer.cc
@@ -17,7 +17,6 @@
 #include <string.h>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 
 bool squelch = false;
diff --git a/test/core/transport/chaotic_good/frame_test.cc b/test/core/transport/chaotic_good/frame_test.cc
index 8fc0f2b41eb..2ca7a446e74 100644
--- a/test/core/transport/chaotic_good/frame_test.cc
+++ b/test/core/transport/chaotic_good/frame_test.cc
@@ -21,7 +21,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 
diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.cc b/test/core/transport/chaotic_good/mock_promise_endpoint.cc
index 9ba96e75804..33ab43b817c 100644
--- a/test/core/transport/chaotic_good/mock_promise_endpoint.cc
+++ b/test/core/transport/chaotic_good/mock_promise_endpoint.cc
@@ -14,11 +14,11 @@
 
 #include "test/core/transport/chaotic_good/mock_promise_endpoint.h"
 
+#include <grpc/event_engine/event_engine.h>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include <grpc/event_engine/event_engine.h>
-
 using EventEngineSlice = grpc_event_engine::experimental::Slice;
 using grpc_event_engine::experimental::EventEngine;
 
diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.h b/test/core/transport/chaotic_good/mock_promise_endpoint.h
index bf073e4644f..314883a257b 100644
--- a/test/core/transport/chaotic_good/mock_promise_endpoint.h
+++ b/test/core/transport/chaotic_good/mock_promise_endpoint.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_MOCK_PROMISE_ENDPOINT_H
 #define GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_MOCK_PROMISE_ENDPOINT_H
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/event_engine.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/transport/promise_endpoint.h"
 
diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc
index f3ab7f3a350..72e62a89682 100644
--- a/test/core/transport/chaotic_good/server_transport_test.cc
+++ b/test/core/transport/chaotic_good/server_transport_test.cc
@@ -14,6 +14,13 @@
 
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -26,14 +33,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/lib/promise/seq.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/transport/chaotic_good/transport_test.h b/test/core/transport/chaotic_good/transport_test.h
index 5f9dd8845d3..d6269c6e984 100644
--- a/test/core/transport/chaotic_good/transport_test.h
+++ b/test/core/transport/chaotic_good/transport_test.h
@@ -17,7 +17,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/test/core/transport/chttp2/alpn_test.cc b/test/core/transport/chttp2/alpn_test.cc
index 43fbe2e583d..52286d81752 100644
--- a/test/core/transport/chttp2/alpn_test.cc
+++ b/test/core/transport/chttp2/alpn_test.cc
@@ -21,7 +21,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 TEST(AlpnTest, TestAlpnSuccess) {
diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc
index 40f67db8583..5eca263f44c 100644
--- a/test/core/transport/chttp2/bin_decoder_test.cc
+++ b/test/core/transport/chttp2/bin_decoder_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/bin_decoder.h"
 
+#include <grpc/support/alloc.h>
 #include <string.h>
 
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
diff --git a/test/core/transport/chttp2/bin_encoder_test.cc b/test/core/transport/chttp2/bin_encoder_test.cc
index bb52b4bd766..f54407d809a 100644
--- a/test/core/transport/chttp2/bin_encoder_test.cc
+++ b/test/core/transport/chttp2/bin_encoder_test.cc
@@ -18,17 +18,14 @@
 
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <string.h>
 
 #include <memory>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/transport/chttp2/decode_huff_fuzzer.cc b/test/core/transport/chttp2/decode_huff_fuzzer.cc
index 6a9d34d2371..851f023f203 100644
--- a/test/core/transport/chttp2/decode_huff_fuzzer.cc
+++ b/test/core/transport/chttp2/decode_huff_fuzzer.cc
@@ -23,7 +23,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
 #include "src/core/ext/transport/chttp2/transport/decode_huff.h"
 #include "src/core/ext/transport/chttp2/transport/huffsyms.h"
 
diff --git a/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc b/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc
index 5d1f9c46718..dfc2c489d04 100644
--- a/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc
+++ b/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/slice.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,9 +25,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/decode_huff.h"
 
diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc
index b72541d4d38..8d0a8406f11 100644
--- a/test/core/transport/chttp2/flow_control_fuzzer.cc
+++ b/test/core/transport/chttp2/flow_control_fuzzer.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,10 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/transport/chttp2/flow_control_test.cc b/test/core/transport/chttp2/flow_control_test.cc
index 618cdfb0643..8ed9ea03ed9 100644
--- a/test/core/transport/chttp2/flow_control_test.cc
+++ b/test/core/transport/chttp2/flow_control_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 
+#include <grpc/support/time.h>
+
 #include <memory>
 #include <tuple>
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/transport/chttp2/frame_test.cc b/test/core/transport/chttp2/frame_test.cc
index a353d0fa1ef..456d8a01af4 100644
--- a/test/core/transport/chttp2/frame_test.cc
+++ b/test/core/transport/chttp2/frame_test.cc
@@ -21,7 +21,6 @@
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/transport/http2_errors.h"
 
 namespace grpc_core {
diff --git a/test/core/transport/chttp2/graceful_shutdown_test.cc b/test/core/transport/chttp2/graceful_shutdown_test.cc
index 7402c2ba28c..47e8524cf81 100644
--- a/test/core/transport/chttp2/graceful_shutdown_test.cc
+++ b/test/core/transport/chttp2/graceful_shutdown_test.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -35,14 +41,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc
index 141d38f71c4..947161ecf75 100644
--- a/test/core/transport/chttp2/hpack_encoder_test.cc
+++ b/test/core/transport/chttp2/hpack_encoder_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/slice_buffer.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -27,10 +29,6 @@
 #include "absl/log/log.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/slice_buffer.h>
-
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc
index 7954ccbaeca..a76df38bf00 100644
--- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -25,10 +27,6 @@
 #include "absl/cleanup/cleanup.h"
 #include "absl/log/check.h"
 #include "absl/random/bit_gen_ref.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc
index c01dff488a8..7aeda797263 100644
--- a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc
+++ b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc
@@ -15,6 +15,10 @@
 // For all inputs, ensure parsing one byte at a time produces the same result as
 // parsing the entire input at once.
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,12 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/transport/chttp2/hpack_parser_table_test.cc b/test/core/transport/chttp2/hpack_parser_table_test.cc
index 8743b079006..48632fe86cd 100644
--- a/test/core/transport/chttp2/hpack_parser_table_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_table_test.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h"
 
+#include <grpc/grpc.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/telemetry/stats.h"
diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc
index 0439490d7c2..1408cf21404 100644
--- a/test/core/transport/chttp2/hpack_parser_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_test.cc
@@ -18,6 +18,12 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+
 #include <memory>
 #include <string>
 
@@ -29,13 +35,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/test/core/transport/chttp2/hpack_sync_fuzzer.cc b/test/core/transport/chttp2/hpack_sync_fuzzer.cc
index dff3b687999..efd041392be 100644
--- a/test/core/transport/chttp2/hpack_sync_fuzzer.cc
+++ b/test/core/transport/chttp2/hpack_sync_fuzzer.cc
@@ -26,7 +26,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
-
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
diff --git a/test/core/transport/chttp2/hpack_utils_test.cc b/test/core/transport/chttp2/hpack_utils_test.cc
index cf40ca2b564..e44987bf535 100644
--- a/test/core/transport/chttp2/hpack_utils_test.cc
+++ b/test/core/transport/chttp2/hpack_utils_test.cc
@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
 #include <random>
 #include <unordered_map>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_index.h"
 
 namespace grpc_core {
diff --git a/test/core/transport/chttp2/ping_abuse_policy_test.cc b/test/core/transport/chttp2/ping_abuse_policy_test.cc
index f11e1f268e5..7b0b3c150c6 100644
--- a/test/core/transport/chttp2/ping_abuse_policy_test.cc
+++ b/test/core/transport/chttp2/ping_abuse_policy_test.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h"
 
+#include <grpc/impl/channel_arg_names.h>
+
 #include <chrono>
 #include <thread>
 
 #include "gtest/gtest.h"
 
-#include <grpc/impl/channel_arg_names.h>
-
 namespace grpc_core {
 namespace {
 
diff --git a/test/core/transport/chttp2/ping_callbacks_test.cc b/test/core/transport/chttp2/ping_callbacks_test.cc
index 18731f4f761..26962c90ada 100644
--- a/test/core/transport/chttp2/ping_callbacks_test.cc
+++ b/test/core/transport/chttp2/ping_callbacks_test.cc
@@ -19,7 +19,6 @@
 #include "absl/random/random.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/crash.h"
 #include "test/core/event_engine/mock_event_engine.h"
 
diff --git a/test/core/transport/chttp2/ping_configuration_test.cc b/test/core/transport/chttp2/ping_configuration_test.cc
index 30873180124..7b85775466b 100644
--- a/test/core/transport/chttp2/ping_configuration_test.cc
+++ b/test/core/transport/chttp2/ping_configuration_test.cc
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
diff --git a/test/core/transport/chttp2/ping_rate_policy_test.cc b/test/core/transport/chttp2/ping_rate_policy_test.cc
index 46ddd0501fd..0139212de45 100644
--- a/test/core/transport/chttp2/ping_rate_policy_test.cc
+++ b/test/core/transport/chttp2/ping_rate_policy_test.cc
@@ -18,7 +18,6 @@
 #include <thread>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/experiments/experiments.h"
 
 namespace grpc_core {
diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc
index 291add0aaef..42167462efa 100644
--- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc
+++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc
@@ -16,6 +16,17 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <string.h>
 
 #include <algorithm>
@@ -25,23 +36,9 @@
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc
index 7e5c5204530..0d6d4037760 100644
--- a/test/core/transport/chttp2/settings_timeout_test.cc
+++ b/test/core/transport/chttp2/settings_timeout_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -30,18 +40,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc
index 178e29de625..a38be490af5 100644
--- a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc
+++ b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc
@@ -12,17 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <inttypes.h>
-#include <string.h>
-
-#include <string>
-
-#include "absl/base/thread_annotations.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-#include "gtest/gtest.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
@@ -33,7 +22,16 @@
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <string.h>
+
+#include <string>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc
index 49a6075cd42..2c435727a54 100644
--- a/test/core/transport/chttp2/streams_not_seen_test.cc
+++ b/test/core/transport/chttp2/streams_not_seen_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -37,18 +47,6 @@
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc
index 942268fc967..d027d5ea76d 100644
--- a/test/core/transport/chttp2/too_many_pings_test.cc
+++ b/test/core/transport/chttp2/too_many_pings_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -31,18 +41,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/transport/chttp2/varint_test.cc b/test/core/transport/chttp2/varint_test.cc
index f4848b3167b..d4253270afa 100644
--- a/test/core/transport/chttp2/varint_test.cc
+++ b/test/core/transport/chttp2/varint_test.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/varint.h"
 
+#include <grpc/slice.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-
 #include "test/core/test_util/test_config.h"
 
 template <uint8_t kPrefixBits>
diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc
index 40a2a653800..288c446f370 100644
--- a/test/core/transport/connectivity_state_test.cc
+++ b/test/core/transport/connectivity_state_test.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/lib/transport/connectivity_state.h"
 
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tracer_util.h"
 
diff --git a/test/core/transport/error_utils_test.cc b/test/core/transport/error_utils_test.cc
index c60b4bf5d79..31e7cd108dc 100644
--- a/test/core/transport/error_utils_test.cc
+++ b/test/core/transport/error_utils_test.cc
@@ -22,7 +22,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/status_helper.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/transport/interception_chain_test.cc b/test/core/transport/interception_chain_test.cc
index c2accf5e85b..8b5442a132b 100644
--- a/test/core/transport/interception_chain_test.cc
+++ b/test/core/transport/interception_chain_test.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/lib/transport/interception_chain.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "test/core/promise/poll_matcher.h"
diff --git a/test/core/transport/metadata_map_test.cc b/test/core/transport/metadata_map_test.cc
index 1e985459a74..817c9f5e986 100644
--- a/test/core/transport/metadata_map_test.cc
+++ b/test/core/transport/metadata_map_test.cc
@@ -14,6 +14,7 @@
 // limitations under the License.
 //
 
+#include <grpc/event_engine/memory_allocator.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -25,9 +26,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/transport/parsed_metadata_test.cc b/test/core/transport/parsed_metadata_test.cc
index df6bc391f84..391135067cf 100644
--- a/test/core/transport/parsed_metadata_test.cc
+++ b/test/core/transport/parsed_metadata_test.cc
@@ -22,7 +22,6 @@
 #include "absl/strings/numbers.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/transport/metadata_batch.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/transport/promise_endpoint_test.cc b/test/core/transport/promise_endpoint_test.cc
index e6ad3dd2713..a2b7085e5d1 100644
--- a/test/core/transport/promise_endpoint_test.cc
+++ b/test/core/transport/promise_endpoint_test.cc
@@ -16,6 +16,10 @@
 
 // IWYU pragma: no_include <sys/socket.h>
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/port.h>  // IWYU pragma: keep
+#include <grpc/event_engine/slice_buffer.h>
+
 #include <cstring>
 #include <memory>
 #include <string>
@@ -24,11 +28,6 @@
 #include "absl/functional/any_invocable.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/port.h>  // IWYU pragma: keep
-#include <grpc/event_engine/slice_buffer.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/seq.h"
diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc
index 8af76d6a4b2..85055941884 100644
--- a/test/core/transport/status_conversion_test.cc
+++ b/test/core/transport/status_conversion_test.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/transport/status_conversion.h"
 
+#include <grpc/support/time.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/transport/test_suite/call_content.cc b/test/core/transport/test_suite/call_content.cc
index 7c9f26da0f0..84a5f9f1a13 100644
--- a/test/core/transport/test_suite/call_content.cc
+++ b/test/core/transport/test_suite/call_content.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "gmock/gmock.h"
-
 #include "test/core/transport/test_suite/transport_test.h"
 
 using testing::UnorderedElementsAreArray;
diff --git a/test/core/transport/test_suite/chaotic_good_fixture.cc b/test/core/transport/test_suite/chaotic_good_fixture.cc
index 0e87280c086..d36e4b1a054 100644
--- a/test/core/transport/test_suite/chaotic_good_fixture.cc
+++ b/test/core/transport/test_suite/chaotic_good_fixture.cc
@@ -16,7 +16,6 @@
 
 #include "absl/log/check.h"
 #include "gmock/gmock.h"
-
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
 #include "src/core/lib/event_engine/memory_allocator_factory.h"
diff --git a/test/core/transport/test_suite/stress.cc b/test/core/transport/test_suite/stress.cc
index 11f0093ab85..98a2997c1b5 100644
--- a/test/core/transport/test_suite/stress.cc
+++ b/test/core/transport/test_suite/stress.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "absl/random/random.h"
-
 #include "test/core/transport/test_suite/transport_test.h"
 
 namespace grpc_core {
diff --git a/test/core/transport/test_suite/transport_test.h b/test/core/transport/test_suite/transport_test.h
index 97e099f348a..68691c21403 100644
--- a/test/core/transport/test_suite/transport_test.h
+++ b/test/core/transport/test_suite/transport_test.h
@@ -21,7 +21,6 @@
 #include "absl/random/bit_gen_ref.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/transport/transport.h"
 #include "test/core/call/yodel/yodel_test.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
diff --git a/test/core/transport/timeout_encoding_test.cc b/test/core/transport/timeout_encoding_test.cc
index 6de2dcd0398..c1e00b6f680 100644
--- a/test/core/transport/timeout_encoding_test.cc
+++ b/test/core/transport/timeout_encoding_test.cc
@@ -23,7 +23,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/time.h"
 #include "src/core/util/useful.h"
 
diff --git a/test/core/tsi/alts/crypt/aes_gcm_test.cc b/test/core/tsi/alts/crypt/aes_gcm_test.cc
index 93ac19732c4..2d55d756d93 100644
--- a/test/core/tsi/alts/crypt/aes_gcm_test.cc
+++ b/test/core/tsi/alts/crypt/aes_gcm_test.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <memory>
-
+#include <grpc/support/alloc.h>
 #include <gtest/gtest.h>
 
-#include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
+#include <memory>
 
+#include "absl/types/span.h"
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
diff --git a/test/core/tsi/alts/crypt/gsec_test_util.cc b/test/core/tsi/alts/crypt/gsec_test_util.cc
index 9b6898c3ae7..a6f7209d1a1 100644
--- a/test/core/tsi/alts/crypt/gsec_test_util.cc
+++ b/test/core/tsi/alts/crypt/gsec_test_util.cc
@@ -18,9 +18,8 @@
 
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
 
-#include <time.h>
-
 #include <grpc/support/alloc.h>
+#include <time.h>
 
 void gsec_test_random_bytes(uint8_t* bytes, size_t length) {
   srand(time(nullptr));
diff --git a/test/core/tsi/alts/crypt/gsec_test_util.h b/test/core/tsi/alts/crypt/gsec_test_util.h
index db49b564f4c..4ce88300a18 100644
--- a/test/core/tsi/alts/crypt/gsec_test_util.h
+++ b/test/core/tsi/alts/crypt/gsec_test_util.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_TEST_CORE_TSI_ALTS_CRYPT_GSEC_TEST_UTIL_H
 #define GRPC_TEST_CORE_TSI_ALTS_CRYPT_GSEC_TEST_UTIL_H
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <grpc/grpc.h>
-
 ///
 /// This method returns random bytes of certain length.
 ///
diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc
index 1c2c8892e4c..42f6f67ec54 100644
--- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc
+++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc
@@ -17,14 +17,6 @@
 //
 #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h"
 
-#include <memory>
-#include <sstream>
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/impl/sync.h>
 #include <grpcpp/security/server_credentials.h>
@@ -33,6 +25,13 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/async_stream.h>
 
+#include <memory>
+#include <sstream>
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 #include "test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.h"
 #include "test/core/tsi/alts/fake_handshaker/handshaker.pb.h"
diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h
index 2793793d068..6b83b3cbf09 100644
--- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h
+++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CORE_TSI_ALTS_FAKE_HANDSHAKER_FAKE_HANDSHAKER_SERVER_H
 #define GRPC_TEST_CORE_TSI_ALTS_FAKE_HANDSHAKER_FAKE_HANDSHAKER_SERVER_H
 
+#include <grpcpp/grpcpp.h>
+
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 namespace grpc {
 namespace gcp {
 
diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc
index 4e8df4b23f0..a70f55fdbcc 100644
--- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc
+++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc
@@ -15,15 +15,14 @@
 // limitations under the License.
 //
 //
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/server_builder.h>
+
 #include <sstream>
 
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h"
diff --git a/test/core/tsi/alts/frame_protector/alts_counter_test.cc b/test/core/tsi/alts/frame_protector/alts_counter_test.cc
index 989530d5e27..2b2961427f3 100644
--- a/test/core/tsi/alts/frame_protector/alts_counter_test.cc
+++ b/test/core/tsi/alts/frame_protector/alts_counter_test.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_counter.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 
 #include "src/core/util/crash.h"
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
diff --git a/test/core/tsi/alts/frame_protector/alts_crypter_test.cc b/test/core/tsi/alts/frame_protector/alts_crypter_test.cc
index 2f834e411b7..cede0ec775d 100644
--- a/test/core/tsi/alts/frame_protector/alts_crypter_test.cc
+++ b/test/core/tsi/alts/frame_protector/alts_crypter_test.cc
@@ -18,18 +18,15 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_crypter.h"
 
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <memory>
 
-#include <gtest/gtest.h>
-
 #include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
-
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
 
 static void alts_crypter_test_random_seal_unseal(alts_crypter* server_seal,
diff --git a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc
index 06b18b7f7ae..f1f4186b37a 100644
--- a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc
+++ b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc
@@ -18,11 +18,9 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_frame_protector.h"
 
-#include <stdbool.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/test/core/tsi/alts/frame_protector/frame_handler_test.cc b/test/core/tsi/alts/frame_protector/frame_handler_test.cc
index 2784bc0f74b..d9b66e45b1e 100644
--- a/test/core/tsi/alts/frame_protector/frame_handler_test.cc
+++ b/test/core/tsi/alts/frame_protector/frame_handler_test.cc
@@ -18,16 +18,14 @@
 
 #include "src/core/tsi/alts/frame_protector/frame_handler.h"
 
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <algorithm>
 
-#include <gtest/gtest.h>
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/useful.h"
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc
index 0b079ebc88e..baf3ce478b6 100644
--- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc
+++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc
@@ -17,6 +17,17 @@
 //
 
 #include <fcntl.h>
+#include <gmock/gmock.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/server_builder.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,24 +40,10 @@
 #include <set>
 #include <thread>
 
-#include <gmock/gmock.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/alts/alts_credentials.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc
index 22c42030cb5..8b8a8866a93 100644
--- a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc
+++ b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc
@@ -18,13 +18,10 @@
 
 #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
 
-#include <gtest/gtest.h>
-
-#include "upb/mem/arena.hpp"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/tsi/alts/handshaker/alts_shared_resource.h"
@@ -35,6 +32,7 @@
 #include "src/core/util/env.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
+#include "upb/mem/arena.hpp"
 
 #define ALTS_HANDSHAKER_CLIENT_TEST_OUT_FRAME "Hello Google"
 #define ALTS_HANDSHAKER_CLIENT_TEST_TARGET_NAME "bigtable.google.api.com"
diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
index 3fb9cc715ec..24d949a8b48 100644
--- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
+++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
@@ -18,15 +18,11 @@
 
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtest/gtest.h>
-
-#include "upb/mem/arena.hpp"
-
 #include <grpc/grpc.h>
 #include <grpc/support/sync.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
@@ -37,6 +33,7 @@
 #include "src/proto/grpc/gcp/altscontext.upb.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
+#include "upb/mem/arena.hpp"
 
 #define ALTS_TSI_HANDSHAKER_TEST_RECV_BYTES "Hello World"
 #define ALTS_TSI_HANDSHAKER_TEST_OUT_FRAME "Hello Google"
diff --git a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc
index c3286ebcb40..5887d4c856e 100644
--- a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc
+++ b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc
@@ -20,10 +20,9 @@
 
 #include <gtest/gtest.h>
 
-#include "upb/mem/arena.hpp"
-
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
+#include "upb/mem/arena.hpp"
 
 #define ALTS_TSI_UTILS_TEST_OUT_FRAME "Hello Google"
 
diff --git a/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc b/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc
index 463d90044ba..1294637f95b 100644
--- a/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc
+++ b/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
 
+#include <gtest/gtest.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <gtest/gtest.h>
-
 const size_t kMaxRpcVersionMajor = 3;
 const size_t kMaxRpcVersionMinor = 2;
 const size_t kMinRpcVersionMajor = 2;
diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc
index 51c08b6cce8..ab27058c606 100644
--- a/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc
+++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h"
 
-#include <memory>
-
+#include <grpc/support/alloc.h>
 #include <gtest/gtest.h>
 
-#include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
+#include <memory>
 
+#include "absl/types/span.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc
index 248a496bd27..67d47e0a5cd 100644
--- a/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc
+++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
 
-#include <memory>
-
+#include <grpc/support/alloc.h>
 #include <gtest/gtest.h>
 
-#include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
+#include <memory>
 
+#include "absl/types/span.h"
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
 
 constexpr size_t kMaxDataSize = 1024;
diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc
index aaab8c892cf..2bdcabcb1ee 100644
--- a/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc
+++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h"
 
-#include <gtest/gtest.h>
-
-#include "absl/types/span.h"
-
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 
+#include "absl/types/span.h"
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
 #include "src/core/tsi/transport_security_grpc.h"
diff --git a/test/core/tsi/crl_ssl_transport_security_test.cc b/test/core/tsi/crl_ssl_transport_security_test.cc
index 0b8d4cf0811..261ea784bab 100644
--- a/test/core/tsi/crl_ssl_transport_security_test.cc
+++ b/test/core/tsi/crl_ssl_transport_security_test.cc
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -19,18 +24,10 @@
 #include <memory>
 #include <utility>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/ssl_transport_security.h"
 #include "src/core/tsi/transport_security.h"
diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc
index c61b9a487a7..9a90d7248e4 100644
--- a/test/core/tsi/fake_transport_security_test.cc
+++ b/test/core/tsi/fake_transport_security_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/tsi/fake_transport_security.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/transport_security.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/tsi/ssl_session_cache_test.cc b/test/core/tsi/ssl_session_cache_test.cc
index 61a5f707e93..63630cbb1ae 100644
--- a/test/core/tsi/ssl_session_cache_test.cc
+++ b/test/core/tsi/ssl_session_cache_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h"
 
+#include <grpc/grpc.h>
+#include <gtest/gtest.h>
+
 #include <string>
 #include <unordered_set>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc
index 228372d86b6..6e2f36c5acf 100644
--- a/test/core/tsi/ssl_transport_security_test.cc
+++ b/test/core/tsi/ssl_transport_security_test.cc
@@ -18,22 +18,19 @@
 
 #include "src/core/tsi/ssl_transport_security.h"
 
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <gtest/gtest.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/tsi/transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/memory.h"
diff --git a/test/core/tsi/ssl_transport_security_utils_test.cc b/test/core/tsi/ssl_transport_security_utils_test.cc
index ac105c42fa5..a8a11d36f5e 100644
--- a/test/core/tsi/ssl_transport_security_utils_test.cc
+++ b/test/core/tsi/ssl_transport_security_utils_test.cc
@@ -16,10 +16,6 @@
 
 #include "src/core/tsi/ssl_transport_security_utils.h"
 
-#include <array>
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <openssl/bio.h>
@@ -28,12 +24,15 @@
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 
+#include <array>
+#include <string>
+#include <vector>
+
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/tsi/transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/test/core/tsi/transport_security_test.cc b/test/core/tsi/transport_security_test.cc
index a0ff0488b93..268d430bee1 100644
--- a/test/core/tsi/transport_security_test.cc
+++ b/test/core/tsi/transport_security_test.cc
@@ -18,19 +18,16 @@
 
 #include "src/core/tsi/transport_security.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+#include <openssl/crypto.h>
 #include <string.h>
 
 #include <string>
 
-#include <gtest/gtest.h>
-#include <openssl/crypto.h>
-
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/tsi/fake_transport_security.h"
 #include "src/core/tsi/ssl_transport_security.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc
index 1239270a0e6..e4508701110 100644
--- a/test/core/tsi/transport_security_test_lib.cc
+++ b/test/core/tsi/transport_security_test_lib.cc
@@ -18,10 +18,8 @@
 
 #include "test/core/tsi/transport_security_test_lib.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
 #include <openssl/bn.h>
@@ -30,13 +28,12 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/memory.h"
diff --git a/test/core/tsi/transport_security_test_lib.h b/test/core/tsi/transport_security_test_lib.h
index 6e3efec2bff..adce54bda13 100644
--- a/test/core/tsi/transport_security_test_lib.h
+++ b/test/core/tsi/transport_security_test_lib.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_TEST_CORE_TSI_TRANSPORT_SECURITY_TEST_LIB_H
 #define GRPC_TEST_CORE_TSI_TRANSPORT_SECURITY_TEST_LIB_H
 
-#include <openssl/x509v3.h>
-
 #include <grpc/support/sync.h>
+#include <openssl/x509v3.h>
 
 #include "src/core/tsi/transport_security_interface.h"
 
diff --git a/test/core/util/alloc_test.cc b/test/core/util/alloc_test.cc
index d8dafc9c727..55bf93fca5c 100644
--- a/test/core/util/alloc_test.cc
+++ b/test/core/util/alloc_test.cc
@@ -16,15 +16,13 @@
 //
 //
 
+#include <grpc/support/alloc.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "test/core/test_util/test_config.h"
 
 TEST(AllocTest, MallocAligned) {
diff --git a/test/core/util/backoff_test.cc b/test/core/util/backoff_test.cc
index 3ee1cf7fe21..4cd5e6490e5 100644
--- a/test/core/util/backoff_test.cc
+++ b/test/core/util/backoff_test.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/util/backoff.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/time.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/chunked_vector_fuzzer.cc b/test/core/util/chunked_vector_fuzzer.cc
index 37bcc3df4e1..6c2d642886d 100644
--- a/test/core/util/chunked_vector_fuzzer.cc
+++ b/test/core/util/chunked_vector_fuzzer.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_allocator.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -21,9 +22,6 @@
 #include <vector>
 
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/util/chunked_vector_test.cc b/test/core/util/chunked_vector_test.cc
index 82f10436edc..8dbb680c1dc 100644
--- a/test/core/util/chunked_vector_test.cc
+++ b/test/core/util/chunked_vector_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/util/chunked_vector.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <algorithm>
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/util/cpp_impl_of_test.cc b/test/core/util/cpp_impl_of_test.cc
index 49653bee36b..ef1e9a60eb7 100644
--- a/test/core/util/cpp_impl_of_test.cc
+++ b/test/core/util/cpp_impl_of_test.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/util/cpp_impl_of.h"
 
-#include <memory>
-
 #include <gtest/gtest.h>
 
+#include <memory>
+
 typedef struct grpc_foo grpc_foo;
 
 namespace grpc_core {
diff --git a/test/core/util/cpu_test.cc b/test/core/util/cpu_test.cc
index 1c480304f47..00bc201cacd 100644
--- a/test/core/util/cpu_test.cc
+++ b/test/core/util/cpu_test.cc
@@ -21,6 +21,10 @@
 // gpr_cpu_current_cpu()
 //
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -28,12 +32,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/cpu.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/directory_reader_test.cc b/test/core/util/directory_reader_test.cc
index e117bc2b058..57022e69689 100644
--- a/test/core/util/directory_reader_test.cc
+++ b/test/core/util/directory_reader_test.cc
@@ -22,7 +22,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 static constexpr absl::string_view kCrlDirectory =
diff --git a/test/core/util/dual_ref_counted_test.cc b/test/core/util/dual_ref_counted_test.cc
index 4c9e2de162f..150fd39c03b 100644
--- a/test/core/util/dual_ref_counted_test.cc
+++ b/test/core/util/dual_ref_counted_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/manual_constructor.h"
 #include "src/core/util/ref_counted.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/util/env_test.cc b/test/core/util/env_test.cc
index df82aa37752..2b497db9106 100644
--- a/test/core/util/env_test.cc
+++ b/test/core/util/env_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 TEST(EnvTest, SetenvGetenv) {
diff --git a/test/core/util/fork_test.cc b/test/core/util/fork_test.cc
index 543c00da713..cce0af99e0b 100644
--- a/test/core/util/fork_test.cc
+++ b/test/core/util/fork_test.cc
@@ -18,12 +18,10 @@
 
 #include "src/core/util/fork.h"
 
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/glob_test.cc b/test/core/util/glob_test.cc
index 84df18db721..284464f395a 100644
--- a/test/core/util/glob_test.cc
+++ b/test/core/util/glob_test.cc
@@ -14,11 +14,10 @@
 
 #include "src/core/util/glob.h"
 
-#include "absl/strings/match.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/strings/match.h"
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/util/gpr_time_test.cc b/test/core/util/gpr_time_test.cc
index 48ea2ce17a2..9ae5d0ed7fb 100644
--- a/test/core/util/gpr_time_test.cc
+++ b/test/core/util/gpr_time_test.cc
@@ -18,6 +18,7 @@
 
 // Test of gpr time support.
 
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
@@ -25,9 +26,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/time.h>
-
 #include "test/core/test_util/test_config.h"
 
 static void to_fp(void* arg, const char* buf, size_t len) {
diff --git a/test/core/util/host_port_test.cc b/test/core/util/host_port_test.cc
index 3f7607c0a56..9845d54b203 100644
--- a/test/core/util/host_port_test.cc
+++ b/test/core/util/host_port_test.cc
@@ -19,7 +19,6 @@
 #include "src/core/util/host_port.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 static void join_host_port_expect(const char* host, int port,
diff --git a/test/core/util/load_file_test.cc b/test/core/util/load_file_test.cc
index 4888749fb40..2c83b2a119b 100644
--- a/test/core/util/load_file_test.cc
+++ b/test/core/util/load_file_test.cc
@@ -14,15 +14,13 @@
 
 #include "src/core/util/load_file.h"
 
+#include <grpc/support/alloc.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <cstdint>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/tmpfile.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/mpscq_test.cc b/test/core/util/mpscq_test.cc
index 65dce481d43..a0c304ead05 100644
--- a/test/core/util/mpscq_test.cc
+++ b/test/core/util/mpscq_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/util/mpscq.h"
 
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -25,10 +27,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "src/core/util/useful.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/util/orphanable_test.cc b/test/core/util/orphanable_test.cc
index 4e38d719d9c..4d21829ad47 100644
--- a/test/core/util/orphanable_test.cc
+++ b/test/core/util/orphanable_test.cc
@@ -19,7 +19,6 @@
 #include "src/core/util/orphanable.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/util/ref_counted_ptr_test.cc b/test/core/util/ref_counted_ptr_test.cc
index e2d7cd0f4db..3271aa4b107 100644
--- a/test/core/util/ref_counted_ptr_test.cc
+++ b/test/core/util/ref_counted_ptr_test.cc
@@ -23,7 +23,6 @@
 #include "absl/container/flat_hash_set.h"
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/ref_counted.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/util/ref_counted_test.cc b/test/core/util/ref_counted_test.cc
index 5b0171d3b4f..2769aec600d 100644
--- a/test/core/util/ref_counted_test.cc
+++ b/test/core/util/ref_counted_test.cc
@@ -25,7 +25,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/util/ring_buffer_test.cc b/test/core/util/ring_buffer_test.cc
index 808018d0538..7c176eabfe2 100644
--- a/test/core/util/ring_buffer_test.cc
+++ b/test/core/util/ring_buffer_test.cc
@@ -18,10 +18,10 @@
 
 #include "src/core/util/ring_buffer.h"
 
-#include "gtest/gtest.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "gtest/gtest.h"
+
 namespace grpc_core {
 
 constexpr int kBufferCapacity = 1000;
diff --git a/test/core/util/spinlock_test.cc b/test/core/util/spinlock_test.cc
index da7c4b4ca57..35eb6a42488 100644
--- a/test/core/util/spinlock_test.cc
+++ b/test/core/util/spinlock_test.cc
@@ -20,16 +20,14 @@
 
 #include "src/core/util/spinlock.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/stat_test.cc b/test/core/util/stat_test.cc
index 4595a6208bd..3c8ad0e5bd5 100644
--- a/test/core/util/stat_test.cc
+++ b/test/core/util/stat_test.cc
@@ -16,14 +16,12 @@
 
 #include "src/core/util/stat.h"
 
+#include <grpc/support/alloc.h>
 #include <stdio.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/tmpfile.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/string_test.cc b/test/core/util/string_test.cc
index 4ca644d8090..7ba0c920c94 100644
--- a/test/core/util/string_test.cc
+++ b/test/core/util/string_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/util/string.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <limits.h>
 #include <stddef.h>
 #include <string.h>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "test/core/test_util/test_config.h"
 
 TEST(StringTest, Strdup) {
diff --git a/test/core/util/sync_test.cc b/test/core/util/sync_test.cc
index 256664302e2..c29b086d1b0 100644
--- a/test/core/util/sync_test.cc
+++ b/test/core/util/sync_test.cc
@@ -18,17 +18,15 @@
 
 // Test of gpr synchronization support.
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/thd_test.cc b/test/core/util/thd_test.cc
index fd93eb278d3..993b6d5ab62 100644
--- a/test/core/util/thd_test.cc
+++ b/test/core/util/thd_test.cc
@@ -20,13 +20,12 @@
 
 #include "src/core/util/thd.h"
 
-#include <atomic>
-
-#include "gtest/gtest.h"
-
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include <atomic>
+
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 #define NUM_THREADS 100
diff --git a/test/core/util/time_averaged_stats_test.cc b/test/core/util/time_averaged_stats_test.cc
index f42f27e3353..2806915dbaf 100644
--- a/test/core/util/time_averaged_stats_test.cc
+++ b/test/core/util/time_averaged_stats_test.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/util/time_averaged_stats.h"
 
-#include <math.h>
-
 #include <gtest/gtest.h>
+#include <math.h>
 
 namespace grpc_core {
 namespace {
diff --git a/test/core/util/time_util_test.cc b/test/core/util/time_util_test.cc
index 749a6f26ec0..85a1558befb 100644
--- a/test/core/util/time_util_test.cc
+++ b/test/core/util/time_util_test.cc
@@ -16,14 +16,14 @@
 
 #include "src/core/util/time_util.h"
 
+#include <grpc/support/time.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
 
-#include <grpc/support/time.h>
-
 TEST(TimeUtilTest, ToGprTimeSpecFromAbslDurationWithRegularValues) {
   std::vector<int> times = {-10, -1, 0, 1, 10};
   for (int t : times) {
diff --git a/test/core/util/unique_ptr_with_bitset_test.cc b/test/core/util/unique_ptr_with_bitset_test.cc
index e5b67a36ff9..16cf91d0252 100644
--- a/test/core/util/unique_ptr_with_bitset_test.cc
+++ b/test/core/util/unique_ptr_with_bitset_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/util/unique_ptr_with_bitset.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <limits>
@@ -25,8 +26,6 @@
 
 #include "gtest/gtest.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 TEST(UniquePtrWithBitsetTest, Basic) {
diff --git a/test/core/util/uri_fuzzer_test.cc b/test/core/util/uri_fuzzer_test.cc
index dd4b1c0f861..0b0c689d5ab 100644
--- a/test/core/util/uri_fuzzer_test.cc
+++ b/test/core/util/uri_fuzzer_test.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/uri.h"
diff --git a/test/core/util/uri_test.cc b/test/core/util/uri_test.cc
index 965d208ae7c..0719b1e5ba2 100644
--- a/test/core/util/uri_test.cc
+++ b/test/core/util/uri_test.cc
@@ -16,14 +16,13 @@
 
 #include "src/core/util/uri.h"
 
+#include <grpc/grpc.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "test/core/test_util/test_config.h"
 
 using ::testing::ContainerEq;
diff --git a/test/core/util/useful_test.cc b/test/core/util/useful_test.cc
index 506b2da3040..8efecba0adb 100644
--- a/test/core/util/useful_test.cc
+++ b/test/core/util/useful_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/util/useful.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <limits>
@@ -25,8 +26,6 @@
 
 #include "gtest/gtest.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 TEST(UsefulTest, ClampWorks) {
diff --git a/test/core/util/validation_errors_test.cc b/test/core/util/validation_errors_test.cc
index e3222408d2e..8423736f3bd 100644
--- a/test/core/util/validation_errors_test.cc
+++ b/test/core/util/validation_errors_test.cc
@@ -17,7 +17,6 @@
 #include "src/core/util/validation_errors.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/util/work_serializer_test.cc b/test/core/util/work_serializer_test.cc
index 773255725bb..e32a83bf31d 100644
--- a/test/core/util/work_serializer_test.cc
+++ b/test/core/util/work_serializer_test.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/util/work_serializer.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <memory>
@@ -30,11 +33,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc
index a0b76e521fb..e486fd33dc6 100644
--- a/test/core/xds/certificate_provider_store_test.cc
+++ b/test/core/xds/certificate_provider_store_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/xds/grpc/certificate_provider_store.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <memory>
 #include <thread>
@@ -25,9 +27,6 @@
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/unique_type_name.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/xds/file_watcher_certificate_provider_factory_test.cc b/test/core/xds/file_watcher_certificate_provider_factory_test.cc
index f0eda5d3f55..581a10db148 100644
--- a/test/core/xds/file_watcher_certificate_provider_factory_test.cc
+++ b/test/core/xds/file_watcher_certificate_provider_factory_test.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/xds/grpc/file_watcher_certificate_provider_factory.h"
 
+#include <grpc/grpc.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/json/json_reader.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc
index 1d673ff7302..5b10e99abf8 100644
--- a/test/core/xds/xds_audit_logger_registry_test.cc
+++ b/test/core/xds/xds_audit_logger_registry_test.cc
@@ -18,11 +18,13 @@
 
 #include "src/core/xds/grpc/xds_audit_logger_registry.h"
 
+#include <google/protobuf/any.pb.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_audit_logging.h>
+
 #include <memory>
 #include <string>
 
-#include <google/protobuf/any.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
@@ -30,12 +32,6 @@
 #include "envoy/config/rbac/v3/rbac.upb.h"
 #include "google/protobuf/struct.pb.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_audit_logging.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/json/json.h"
@@ -46,6 +42,8 @@
 #include "src/proto/grpc/testing/xds/v3/rbac.pb.h"
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 namespace testing {
diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc
index cc77846ae13..45dbfefdf4e 100644
--- a/test/core/xds/xds_bootstrap_test.cc
+++ b/test/core/xds/xds_bootstrap_test.cc
@@ -16,6 +16,10 @@
 
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/alloc.h>
 #include <stdio.h>
 
 #include <map>
@@ -29,12 +33,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc
index a81e03421e8..0d5acb72bd0 100644
--- a/test/core/xds/xds_certificate_provider_test.cc
+++ b/test/core/xds/xds_certificate_provider_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/xds/grpc/xds_certificate_provider.h"
 
+#include <grpc/grpc.h>
+
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/util/status_helper.h"
diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc
index 158563429e8..cc8ebc4f0be 100644
--- a/test/core/xds/xds_client_fuzzer.cc
+++ b/test/core/xds/xds_client_fuzzer.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <map>
 #include <memory>
 #include <set>
@@ -27,9 +29,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc
index c28966f2c23..36ddd7e47a2 100644
--- a/test/core/xds/xds_client_test.cc
+++ b/test/core/xds/xds_client_test.cc
@@ -20,6 +20,11 @@
 
 #include "src/core/xds/xds_client/xds_client.h"
 
+#include <google/protobuf/any.pb.h>
+#include <google/protobuf/struct.pb.h>
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
+#include <grpcpp/impl/codegen/config_protobuf.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -31,21 +36,12 @@
 #include <string>
 #include <vector>
 
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/struct.pb.h>
-
 #include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-#include <grpcpp/impl/codegen/config_protobuf.h>
-
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/json/json.h"
@@ -65,6 +61,7 @@
 #include "test/core/test_util/test_config.h"
 #include "test/core/xds/xds_client_test_peer.h"
 #include "test/core/xds/xds_transport_fake.h"
+#include "upb/reflection/def.h"
 
 // IWYU pragma: no_include <google/protobuf/message.h>
 // IWYU pragma: no_include <google/protobuf/stubs/status.h>
diff --git a/test/core/xds/xds_client_test_peer.h b/test/core/xds/xds_client_test_peer.h
index 9c3bfa61f41..d65b9763748 100644
--- a/test/core/xds/xds_client_test_peer.h
+++ b/test/core/xds/xds_client_test_peer.h
@@ -17,13 +17,12 @@
 #ifndef GRPC_TEST_CORE_XDS_XDS_CLIENT_TEST_PEER_H
 #define GRPC_TEST_CORE_XDS_XDS_CLIENT_TEST_PEER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <set>
 
 #include "absl/functional/function_ref.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/xds/xds_client/xds_client.h"
 
 namespace grpc_core {
diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc
index 804241913e8..8be6ab83171 100644
--- a/test/core/xds/xds_cluster_resource_type_test.cc
+++ b/test/core/xds/xds_cluster_resource_type_test.cc
@@ -14,14 +14,15 @@
 // limitations under the License.
 //
 
-#include <memory>
-#include <string>
-#include <utility>
-
 #include <google/protobuf/any.pb.h>
 #include <google/protobuf/duration.pb.h>
 #include <google/protobuf/struct.pb.h>
 #include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+
+#include <memory>
+#include <string>
+#include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -30,11 +31,6 @@
 #include "absl/types/variant.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
@@ -68,6 +64,8 @@
 #include "src/proto/grpc/testing/xds/v3/wrr_locality.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using envoy::config::cluster::v3::Cluster;
 using envoy::extensions::clusters::aggregate::v3::ClusterConfig;
diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc
index 45ac7574b75..2877e621f66 100644
--- a/test/core/xds/xds_common_types_test.cc
+++ b/test/core/xds/xds_common_types_test.cc
@@ -16,14 +16,15 @@
 
 #include "src/core/xds/grpc/xds_common_types.h"
 
+#include <google/protobuf/struct.pb.h>
+#include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/struct.pb.h>
-#include <google/protobuf/wrappers.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
@@ -33,11 +34,6 @@
 #include "google/protobuf/duration.upb.h"
 #include "gtest/gtest.h"
 #include "re2/re2.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/json/json_writer.h"
@@ -59,6 +55,8 @@
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/util/config_grpc_cli.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using CommonTlsContextProto =
     envoy::extensions::transport_sockets::tls::v3::CommonTlsContext;
diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc
index 8e9da777bc2..af6f708a558 100644
--- a/test/core/xds/xds_endpoint_resource_type_test.cc
+++ b/test/core/xds/xds_endpoint_resource_type_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
 #include <stdint.h>
 
 #include <limits>
@@ -23,18 +25,11 @@
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/wrappers.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
@@ -58,6 +53,8 @@
 #include "src/proto/grpc/testing/xds/v3/percent.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using envoy::config::endpoint::v3::ClusterLoadAssignment;
 
diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc
index c5a76d01ee2..b32b536bc91 100644
--- a/test/core/xds/xds_http_filters_test.cc
+++ b/test/core/xds/xds_http_filters_test.cc
@@ -14,13 +14,17 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <google/protobuf/any.pb.h>
 #include <google/protobuf/duration.pb.h>
 #include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpcpp/impl/codegen/config_protobuf.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
@@ -28,14 +32,6 @@
 #include "absl/strings/strip.h"
 #include "absl/types/variant.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpcpp/impl/codegen/config_protobuf.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h"
@@ -73,6 +69,8 @@
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 // IWYU pragma: no_include <google/protobuf/message.h>
 
diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc
index 34f516e84ef..d50e00c6312 100644
--- a/test/core/xds/xds_lb_policy_registry_test.cc
+++ b/test/core/xds/xds_lb_policy_registry_test.cc
@@ -18,22 +18,18 @@
 
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
 
-#include <string>
-
 #include <google/protobuf/any.pb.h>
 #include <google/protobuf/duration.pb.h>
 #include <google/protobuf/struct.pb.h>
 #include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+
+#include <string>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
@@ -52,6 +48,8 @@
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "src/proto/grpc/testing/xds/v3/wrr_locality.pb.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 namespace testing {
diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc
index 0f3f815faf9..24cbf01ce11 100644
--- a/test/core/xds/xds_listener_resource_type_test.cc
+++ b/test/core/xds/xds_listener_resource_type_test.cc
@@ -14,16 +14,17 @@
 // limitations under the License.
 //
 
+#include <google/protobuf/any.pb.h>
+#include <google/protobuf/duration.pb.h>
+#include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/wrappers.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -33,11 +34,6 @@
 #include "absl/types/variant.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
@@ -67,6 +63,8 @@
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using envoy::config::listener::v3::Listener;
 using envoy::extensions::filters::http::fault::v3::HTTPFault;
diff --git a/test/core/xds/xds_metadata_test.cc b/test/core/xds/xds_metadata_test.cc
index 76769ea1b70..4cdfe1fa351 100644
--- a/test/core/xds/xds_metadata_test.cc
+++ b/test/core/xds/xds_metadata_test.cc
@@ -16,18 +16,17 @@
 
 #include "src/core/xds/grpc/xds_metadata.h"
 
-#include <string>
-#include <utility>
-
 #include <google/protobuf/any.pb.h>
 #include <google/protobuf/struct.pb.h>
 
+#include <string>
+#include <utility>
+
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/json/json.h"
diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc
index 61311226c52..9493ef58354 100644
--- a/test/core/xds/xds_route_config_resource_type_test.cc
+++ b/test/core/xds/xds_route_config_resource_type_test.cc
@@ -14,6 +14,11 @@
 // limitations under the License.
 //
 
+#include <google/protobuf/any.pb.h>
+#include <google/protobuf/duration.pb.h>
+#include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <limits>
@@ -23,10 +28,6 @@
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/wrappers.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -37,12 +38,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "re2/re2.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
@@ -69,6 +64,8 @@
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using envoy::config::route::v3::RouteConfiguration;
 using grpc::lookup::v1::RouteLookupClusterSpecifier;
diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc
index 6369fd60c97..c56124c12ed 100644
--- a/test/core/xds/xds_transport_fake.cc
+++ b/test/core/xds/xds_transport_fake.cc
@@ -16,6 +16,9 @@
 
 #include "test/core/xds/xds_transport_fake.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -25,10 +28,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h
index ffa4c746551..6a4a3d967b2 100644
--- a/test/core/xds/xds_transport_fake.h
+++ b/test/core/xds/xds_transport_fake.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_TEST_CORE_XDS_XDS_TRANSPORT_FAKE_H
 #define GRPC_TEST_CORE_XDS_XDS_TRANSPORT_FAKE_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <deque>
@@ -31,9 +32,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc
index 866fe098f94..8f81b956775 100644
--- a/test/cpp/client/credentials_test.cc
+++ b/test/cpp/client/credentials_test.cc
@@ -16,13 +16,7 @@
 //
 //
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security.h>
@@ -30,7 +24,11 @@
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
 #include "src/core/util/env.h"
 #include "src/core/util/tmpfile.h"
 #include "src/cpp/client/secure_credentials.h"
diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc
index c2777262475..85407fd9afb 100644
--- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc
+++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc
@@ -16,15 +16,7 @@
 //
 //
 
-#include <atomic>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <sstream>
-#include <thread>
-
 #include <gmock/gmock.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
@@ -36,6 +28,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 
+#include <atomic>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <sstream>
+#include <thread>
+
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/cpp/codegen/codegen_test_full.cc b/test/cpp/codegen/codegen_test_full.cc
index b27e1b5fc5d..7ccdd02d690 100644
--- a/test/cpp/codegen/codegen_test_full.cc
+++ b/test/cpp/codegen/codegen_test_full.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/support/time.h>
 #include <grpcpp/completion_queue.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/codegen/golden_file_test.cc b/test/cpp/codegen/golden_file_test.cc
index 5c45db77f7e..ec3550a6d3b 100644
--- a/test/cpp/codegen/golden_file_test.cc
+++ b/test/cpp/codegen/golden_file_test.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <gtest/gtest.h>
+
 #include <fstream>
 #include <sstream>
 
-#include <gtest/gtest.h>
-
 #include "absl/flags/flag.h"
-
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/util/test_config.h"
 
diff --git a/test/cpp/codegen/proto_utils_test.cc b/test/cpp/codegen/proto_utils_test.cc
index 1a95bee1f8e..fccde1da362 100644
--- a/test/cpp/codegen/proto_utils_test.cc
+++ b/test/cpp/codegen/proto_utils_test.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/slice.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/impl/proto_utils.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/common/alarm_test.cc b/test/cpp/common/alarm_test.cc
index 63eb170dfc1..15161fa2b31 100644
--- a/test/cpp/common/alarm_test.cc
+++ b/test/cpp/common/alarm_test.cc
@@ -16,16 +16,15 @@
 //
 //
 
+#include <grpcpp/alarm.h>
+#include <grpcpp/completion_queue.h>
+#include <gtest/gtest.h>
+
 #include <condition_variable>
 #include <memory>
 #include <mutex>
 #include <thread>
 
-#include <gtest/gtest.h>
-
-#include <grpcpp/alarm.h>
-#include <grpcpp/completion_queue.h>
-
 #include "src/core/util/notification.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/common/alts_util_test.cc b/test/cpp/common/alts_util_test.cc
index 5fe52338ff4..7bb3f3bf9de 100644
--- a/test/cpp/common/alts_util_test.cc
+++ b/test/cpp/common/alts_util_test.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <gtest/gtest.h>
-
-#include "upb/mem/arena.hpp"
-
 #include <grpcpp/security/alts_context.h>
 #include <grpcpp/security/alts_util.h>
 #include <grpcpp/security/auth_context.h>
+#include <gtest/gtest.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"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/util/string_ref_helper.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc {
 namespace {
diff --git a/test/cpp/common/auth_property_iterator_test.cc b/test/cpp/common/auth_property_iterator_test.cc
index 7d72a344344..f8c08a90ff9 100644
--- a/test/cpp/common/auth_property_iterator_test.cc
+++ b/test/cpp/common/auth_property_iterator_test.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/security/context/security_context.h"
 #include "src/cpp/common/secure_auth_context.h"
diff --git a/test/cpp/common/channel_arguments_test.cc b/test/cpp/common/channel_arguments_test.cc
index a6c7167d25e..0857154685c 100644
--- a/test/cpp/common/channel_arguments_test.cc
+++ b/test/cpp/common/channel_arguments_test.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/channel_arguments.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
diff --git a/test/cpp/common/secure_auth_context_test.cc b/test/cpp/common/secure_auth_context_test.cc
index ca50902377f..719281f9ede 100644
--- a/test/cpp/common/secure_auth_context_test.cc
+++ b/test/cpp/common/secure_auth_context_test.cc
@@ -18,10 +18,9 @@
 
 #include "src/cpp/common/secure_auth_context.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/security/context/security_context.h"
 #include "test/cpp/util/string_ref_helper.h"
diff --git a/test/cpp/common/time_jump_test.cc b/test/cpp/common/time_jump_test.cc
index e1593a59daa..f8a0abef634 100644
--- a/test/cpp/common/time_jump_test.cc
+++ b/test/cpp/common/time_jump_test.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <gtest/gtest.h>
 #include <spawn.h>
 
 #include <sstream>
@@ -23,14 +25,9 @@
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/cpp/common/timer_test.cc b/test/cpp/common/timer_test.cc
index e3f2a31c1dd..a656e509448 100644
--- a/test/cpp/common/timer_test.cc
+++ b/test/cpp/common/timer_test.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/iomgr/timer.h"
 
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/cpp/end2end/admin_services_end2end_test.cc b/test/cpp/end2end/admin_services_end2end_test.cc
index 95fae195c06..83615c2df22 100644
--- a/test/cpp/end2end/admin_services_end2end_test.cc
+++ b/test/cpp/end2end/admin_services_end2end_test.cc
@@ -17,14 +17,12 @@
 //
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/strings/str_cat.h"
-
 #include <grpcpp/ext/admin_services.h>
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/grpcpp.h>
+#include <gtest/gtest.h>
 
+#include "absl/strings/str_cat.h"
 #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc
index 0f59bcab892..22b46c08f14 100644
--- a/test/cpp/end2end/async_end2end_test.cc
+++ b/test/cpp/end2end/async_end2end_test.cc
@@ -16,16 +16,6 @@
 //
 //
 
-#include <cinttypes>
-#include <memory>
-#include <thread>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -37,6 +27,15 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
+#include <cinttypes>
+#include <memory>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc
index c0139db761f..cba2e4f7ddd 100644
--- a/test/cpp/end2end/cfstream_test.cc
+++ b/test/cpp/end2end/cfstream_test.cc
@@ -16,17 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/atm.h>
@@ -38,7 +27,16 @@
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
+#include <algorithm>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/backoff.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc
index 708b4ff53f9..34a89831904 100644
--- a/test/cpp/end2end/channelz_service_test.cc
+++ b/test/cpp/end2end/channelz_service_test.cc
@@ -17,11 +17,6 @@
 //
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
@@ -34,7 +29,10 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc
index fefcc81a976..1df284f3b66 100644
--- a/test/cpp/end2end/client_callback_end2end_test.cc
+++ b/test/cpp/end2end/client_callback_end2end_test.cc
@@ -16,19 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <condition_variable>
-#include <functional>
-#include <mutex>
-#include <sstream>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -38,7 +25,18 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/client_callback.h>
+#include <gtest/gtest.h>
+
+#include <algorithm>
+#include <condition_variable>
+#include <functional>
+#include <mutex>
+#include <sstream>
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc
index 39e857562c8..ba3a2414e35 100644
--- a/test/cpp/end2end/client_crash_test.cc
+++ b/test/cpp/end2end/client_crash_test.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -29,7 +24,10 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/client_crash_test_server.cc b/test/cpp/end2end/client_crash_test_server.cc
index 6d166740ee2..517889f4f68 100644
--- a/test/cpp/end2end/client_crash_test_server.cc
+++ b/test/cpp/end2end/client_crash_test_server.cc
@@ -16,17 +16,16 @@
 //
 //
 
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/end2end/client_fork_test.cc b/test/cpp/end2end/client_fork_test.cc
index c93ff755e83..c004f0d79be 100644
--- a/test/cpp/end2end/client_fork_test.cc
+++ b/test/cpp/end2end/client_fork_test.cc
@@ -19,13 +19,6 @@
 int main(int /* argc */, char** /* argv */) { return 0; }
 #else  // GRPC_ENABLE_FORK_SUPPORT
 
-#include <signal.h>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
@@ -35,7 +28,11 @@ int main(int /* argc */, char** /* argv */) { return 0; }
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+#include <signal.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/util/fork.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/client_interceptors_end2end_test.cc b/test/cpp/end2end/client_interceptors_end2end_test.cc
index 812e529dd66..4a17aa0833e 100644
--- a/test/cpp/end2end/client_interceptors_end2end_test.cc
+++ b/test/cpp/end2end/client_interceptors_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <memory>
-#include <vector>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -35,7 +27,13 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/server_posix.h>
 #include <grpcpp/support/client_interceptor.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc
index 0b7349ceb26..a72c77b319f 100644
--- a/test/cpp/end2end/client_lb_end2end_test.cc
+++ b/test/cpp/end2end/client_lb_end2end_test.cc
@@ -12,27 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
-#include <chrono>
-#include <deque>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <set>
-#include <string>
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
@@ -48,7 +28,25 @@
 #include <grpcpp/impl/sync.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <algorithm>
+#include <chrono>
+#include <deque>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <set>
+#include <string>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/client_channel/config_selector.h"
 #include "src/core/client_channel/global_subchannel_pool.h"
diff --git a/test/cpp/end2end/connection_attempt_injector.cc b/test/cpp/end2end/connection_attempt_injector.cc
index a7b64bfcea3..c87b73b5666 100644
--- a/test/cpp/end2end/connection_attempt_injector.cc
+++ b/test/cpp/end2end/connection_attempt_injector.cc
@@ -20,7 +20,6 @@
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/utility/utility.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/cpp/end2end/context_allocator_end2end_test.cc b/test/cpp/end2end/context_allocator_end2end_test.cc
index 6b9b7a355e7..a70ad1f2f53 100644
--- a/test/cpp/end2end/context_allocator_end2end_test.cc
+++ b/test/cpp/end2end/context_allocator_end2end_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/support/message_allocator.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <atomic>
 #include <condition_variable>
@@ -25,20 +35,8 @@
 #include <sstream>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/crl_provider_test.cc b/test/cpp/end2end/crl_provider_test.cc
index c8e332b0a12..3ea440294f3 100644
--- a/test/cpp/end2end/crl_provider_test.cc
+++ b/test/cpp/end2end/crl_provider_test.cc
@@ -15,19 +15,6 @@
 // limitations under the License.
 //
 //
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
-#include "absl/synchronization/notification.h"
-
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/channel.h>
@@ -42,7 +29,18 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <string>
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
+#include "absl/synchronization/notification.h"
 #include "src/cpp/client/secure_credentials.h"
 #include "src/proto/grpc/testing/echo_messages.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/delegating_channel_test.cc b/test/cpp/end2end/delegating_channel_test.cc
index d675b2bdc8e..019e98be05e 100644
--- a/test/cpp/end2end/delegating_channel_test.cc
+++ b/test/cpp/end2end/delegating_channel_test.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -31,6 +26,10 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/client_interceptor.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <vector>
 
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 1bf43444442..818a643b089 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -16,16 +16,6 @@
 //
 //
 
-#include <mutex>
-#include <thread>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/ascii.h"
-#include "absl/strings/match.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -42,6 +32,15 @@
 #include <grpcpp/support/string_ref.h>
 #include <grpcpp/test/channel_test_peer.h>
 
+#include <mutex>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
+#include "absl/strings/ascii.h"
+#include "absl/strings/match.h"
+#include "absl/strings/str_format.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/test/cpp/end2end/exception_test.cc b/test/cpp/end2end/exception_test.cc
index d5fa8424b27..395b29b506f 100644
--- a/test/cpp/end2end/exception_test.cc
+++ b/test/cpp/end2end/exception_test.cc
@@ -16,17 +16,16 @@
 //
 //
 
-#include <exception>
-#include <memory>
-
-#include <gtest/gtest.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <exception>
+#include <memory>
 
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/flaky_network_test.cc b/test/cpp/end2end/flaky_network_test.cc
index 3df6f1e080f..58415f620d5 100644
--- a/test/cpp/end2end/flaky_network_test.cc
+++ b/test/cpp/end2end/flaky_network_test.cc
@@ -16,18 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/atm.h>
@@ -40,7 +28,17 @@
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <algorithm>
+#include <condition_variable>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <thread>
+
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
 #include "src/core/util/backoff.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc
index c853a0bf257..cf933fd107c 100644
--- a/test/cpp/end2end/generic_end2end_test.cc
+++ b/test/cpp/end2end/generic_end2end_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <memory>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -35,7 +28,12 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/slice.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <thread>
 
+#include "absl/memory/memory.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/grpc_authz_end2end_test.cc b/test/cpp/end2end/grpc_authz_end2end_test.cc
index 0d3473c76fa..868ec7bd80a 100644
--- a/test/cpp/end2end/grpc_authz_end2end_test.cc
+++ b/test/cpp/end2end/grpc_authz_end2end_test.cc
@@ -12,11 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -24,6 +20,9 @@
 #include <grpcpp/security/authorization_policy_provider.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h"
diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc
index 34eeb7b5202..f5d4c5da167 100644
--- a/test/cpp/end2end/grpclb_end2end_test.cc
+++ b/test/cpp/end2end/grpclb_end2end_test.cc
@@ -14,6 +14,18 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
 #include <deque>
 #include <memory>
 #include <mutex>
@@ -22,9 +34,6 @@
 #include <string>
 #include <thread>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/cleanup/cleanup.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
@@ -33,17 +42,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/notification.h"
 #include "absl/types/span.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/cpp/end2end/health_service_end2end_test.cc b/test/cpp/end2end/health_service_end2end_test.cc
index 167396cad45..b3ebb18c63b 100644
--- a/test/cpp/end2end/health_service_end2end_test.cc
+++ b/test/cpp/end2end/health_service_end2end_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <memory>
-#include <mutex>
-#include <thread>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -32,6 +25,12 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <mutex>
+#include <thread>
+#include <vector>
 
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/health/v1/health.grpc.pb.h"
diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc
index 139dda2eb5d..eb52a780a5a 100644
--- a/test/cpp/end2end/hybrid_end2end_test.cc
+++ b/test/cpp/end2end/hybrid_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <memory>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -32,7 +24,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
diff --git a/test/cpp/end2end/interceptors_util.cc b/test/cpp/end2end/interceptors_util.cc
index f14ef471b6a..37d039a628b 100644
--- a/test/cpp/end2end/interceptors_util.cc
+++ b/test/cpp/end2end/interceptors_util.cc
@@ -20,7 +20,6 @@
 
 #include "absl/log/check.h"
 #include "absl/memory/memory.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc {
diff --git a/test/cpp/end2end/interceptors_util.h b/test/cpp/end2end/interceptors_util.h
index c16c34cd714..7a890adc944 100644
--- a/test/cpp/end2end/interceptors_util.h
+++ b/test/cpp/end2end/interceptors_util.h
@@ -19,15 +19,13 @@
 #ifndef GRPC_TEST_CPP_END2END_INTERCEPTORS_UTIL_H
 #define GRPC_TEST_CPP_END2END_INTERCEPTORS_UTIL_H
 
-#include <condition_variable>
-
+#include <grpcpp/channel.h>
 #include <gtest/gtest.h>
 
+#include <condition_variable>
+
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpcpp/channel.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/util/string_ref_helper.h"
diff --git a/test/cpp/end2end/message_allocator_end2end_test.cc b/test/cpp/end2end/message_allocator_end2end_test.cc
index 5546f5685f5..ca9a5d1aab5 100644
--- a/test/cpp/end2end/message_allocator_end2end_test.cc
+++ b/test/cpp/end2end/message_allocator_end2end_test.cc
@@ -16,6 +16,17 @@
 //
 //
 
+#include <google/protobuf/arena.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/support/message_allocator.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <atomic>
 #include <condition_variable>
@@ -25,21 +36,8 @@
 #include <sstream>
 #include <thread>
 
-#include <google/protobuf/arena.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc
index 281267a7f9c..d485c31fda7 100644
--- a/test/cpp/end2end/mock_test.cc
+++ b/test/cpp/end2end/mock_test.cc
@@ -16,15 +16,7 @@
 //
 //
 
-#include <climits>
-#include <iostream>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -35,7 +27,13 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/test/default_reactor_test_peer.h>
 #include <grpcpp/test/mock_stream.h>
+#include <gtest/gtest.h>
 
+#include <climits>
+#include <iostream>
+
+#include "absl/log/log.h"
+#include "absl/types/optional.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/nonblocking_test.cc b/test/cpp/end2end/nonblocking_test.cc
index 465766afa0a..0d8bcd9ac55 100644
--- a/test/cpp/end2end/nonblocking_test.cc
+++ b/test/cpp/end2end/nonblocking_test.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -28,6 +23,10 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/orca_service_end2end_test.cc b/test/cpp/end2end/orca_service_end2end_test.cc
index ce88cb19110..5bc12964b20 100644
--- a/test/cpp/end2end/orca_service_end2end_test.cc
+++ b/test/cpp/end2end/orca_service_end2end_test.cc
@@ -15,12 +15,6 @@
 //
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -31,7 +25,11 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/types/optional.h"
 #include "src/core/util/time.h"
 #include "src/proto/grpc/testing/xds/v3/orca_service.grpc.pb.h"
 #include "src/proto/grpc/testing/xds/v3/orca_service.pb.h"
diff --git a/test/cpp/end2end/port_sharing_end2end_test.cc b/test/cpp/end2end/port_sharing_end2end_test.cc
index 93461bd9ff4..0527ffc895b 100644
--- a/test/cpp/end2end/port_sharing_end2end_test.cc
+++ b/test/cpp/end2end/port_sharing_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <mutex>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -35,7 +27,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <mutex>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset.h"
diff --git a/test/cpp/end2end/proto_server_reflection_test.cc b/test/cpp/end2end/proto_server_reflection_test.cc
index 478c3c80193..1b4f8d9bd07 100644
--- a/test/cpp/end2end/proto_server_reflection_test.cc
+++ b/test/cpp/end2end/proto_server_reflection_test.cc
@@ -16,12 +16,7 @@
 //
 //
 
-#include <memory>
-#include <vector>
-
 #include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -32,6 +27,10 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <vector>
 
 #include "src/proto/grpc/reflection/v1/reflection.grpc.pb.h"
 #include "src/proto/grpc/reflection/v1/reflection.pb.h"
diff --git a/test/cpp/end2end/raw_end2end_test.cc b/test/cpp/end2end/raw_end2end_test.cc
index 8b28df798f6..c1e2df79e76 100644
--- a/test/cpp/end2end/raw_end2end_test.cc
+++ b/test/cpp/end2end/raw_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <cinttypes>
-#include <memory>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -33,7 +25,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <cinttypes>
+#include <memory>
+#include <thread>
+
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/resource_quota_end2end_stress_test.cc b/test/cpp/end2end/resource_quota_end2end_stress_test.cc
index 64987700a62..37955f80d40 100644
--- a/test/cpp/end2end/resource_quota_end2end_stress_test.cc
+++ b/test/cpp/end2end/resource_quota_end2end_stress_test.cc
@@ -12,24 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/server_callback.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <thread>
 #include <utility>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/server_callback.h>
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc
index 2ed47362d5e..6a6f1f47a1f 100644
--- a/test/cpp/end2end/rls_end2end_test.cc
+++ b/test/cpp/end2end/rls_end2end_test.cc
@@ -21,19 +21,7 @@
 //   fires; request is processed at that point
 // - find some deterministic way to exercise adaptive throttler code
 
-#include <deque>
-#include <map>
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
-#include "absl/types/optional.h"
-
 #include <grpc/credentials.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/create_channel.h>
@@ -41,7 +29,17 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
+#include <gtest/gtest.h>
+
+#include <deque>
+#include <map>
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/types/optional.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/cpp/end2end/rls_server.cc b/test/cpp/end2end/rls_server.cc
index f0b520fe9d6..226823d2942 100644
--- a/test/cpp/end2end/rls_server.cc
+++ b/test/cpp/end2end/rls_server.cc
@@ -19,7 +19,6 @@
 #include <gmock/gmock.h>
 
 #include "absl/log/log.h"
-
 #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h"
 #include "src/proto/grpc/lookup/v1/rls.pb.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/rls_server.h b/test/cpp/end2end/rls_server.h
index 149e38c6395..584991da0c4 100644
--- a/test/cpp/end2end/rls_server.h
+++ b/test/cpp/end2end/rls_server.h
@@ -18,7 +18,6 @@
 #define GRPC_TEST_CPP_END2END_RLS_SERVER_H
 
 #include "absl/types/optional.h"
-
 #include "src/core/util/time.h"
 #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h"
 #include "src/proto/grpc/lookup/v1/rls.pb.h"
diff --git a/test/cpp/end2end/server_builder_plugin_test.cc b/test/cpp/end2end/server_builder_plugin_test.cc
index 488e4bbaa58..4dabffdc0b1 100644
--- a/test/cpp/end2end/server_builder_plugin_test.cc
+++ b/test/cpp/end2end/server_builder_plugin_test.cc
@@ -16,12 +16,6 @@
 //
 //
 
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -34,7 +28,11 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <thread>
+
+#include "absl/memory/memory.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc
index bbdea2c1af2..5b784255c5e 100644
--- a/test/cpp/end2end/server_crash_test.cc
+++ b/test/cpp/end2end/server_crash_test.cc
@@ -16,12 +16,6 @@
 //
 //
 
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -30,7 +24,11 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/server_crash_test_client.cc b/test/cpp/end2end/server_crash_test_client.cc
index 01b25967be3..ac1918fa6d7 100644
--- a/test/cpp/end2end/server_crash_test_client.cc
+++ b/test/cpp/end2end/server_crash_test_client.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -24,11 +28,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/end2end/server_early_return_test.cc b/test/cpp/end2end/server_early_return_test.cc
index ddcc713cb86..ac3aff3d404 100644
--- a/test/cpp/end2end/server_early_return_test.cc
+++ b/test/cpp/end2end/server_early_return_test.cc
@@ -16,8 +16,6 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -29,6 +27,7 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/server_interceptors_end2end_test.cc b/test/cpp/end2end/server_interceptors_end2end_test.cc
index 5c33115312a..380f7ce3806 100644
--- a/test/cpp/end2end/server_interceptors_end2end_test.cc
+++ b/test/cpp/end2end/server_interceptors_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <memory>
-#include <vector>
-
-#include <gtest/gtest.h>
-
-#include "absl/memory/memory.h"
-#include "absl/strings/match.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -33,7 +25,13 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/server_interceptor.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+#include <vector>
+
+#include "absl/memory/memory.h"
+#include "absl/strings/match.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/server_load_reporting_end2end_test.cc b/test/cpp/end2end/server_load_reporting_end2end_test.cc
index 5365264c5bd..076ca75c7dd 100644
--- a/test/cpp/end2end/server_load_reporting_end2end_test.cc
+++ b/test/cpp/end2end/server_load_reporting_end2end_test.cc
@@ -16,20 +16,18 @@
 //
 //
 
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc++/grpc++.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpcpp/ext/server_load_reporting.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc
index 6ff1835aa2f..381440cc61e 100644
--- a/test/cpp/end2end/service_config_end2end_test.cc
+++ b/test/cpp/end2end/service_config_end2end_test.cc
@@ -16,22 +16,7 @@
 //
 //
 
-#include <algorithm>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <set>
-#include <string>
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/atm.h>
@@ -44,7 +29,20 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/validate_service_config.h>
+#include <gtest/gtest.h>
+
+#include <algorithm>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <set>
+#include <string>
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/client_channel/global_subchannel_pool.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc
index dcfb52099b6..13dd5b0fa13 100644
--- a/test/cpp/end2end/shutdown_test.cc
+++ b/test/cpp/end2end/shutdown_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/sync.h>
 #include <grpcpp/channel.h>
@@ -31,7 +24,12 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/ssl_credentials_test.cc b/test/cpp/end2end/ssl_credentials_test.cc
index b111e5bfbc2..64ec168f016 100644
--- a/test/cpp/end2end/ssl_credentials_test.cc
+++ b/test/cpp/end2end/ssl_credentials_test.cc
@@ -15,14 +15,7 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/synchronization/notification.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/channel.h>
@@ -30,7 +23,12 @@
 #include <grpcpp/create_channel.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
+#include "absl/log/log.h"
+#include "absl/synchronization/notification.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/cpp/end2end/streaming_throughput_test.cc b/test/cpp/end2end/streaming_throughput_test.cc
index 8fb9f975349..a52fce46a3d 100644
--- a/test/cpp/end2end/streaming_throughput_test.cc
+++ b/test/cpp/end2end/streaming_throughput_test.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <time.h>
-
-#include <mutex>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/time.h>
@@ -36,7 +27,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+#include <time.h>
 
+#include <mutex>
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/test_health_check_service_impl.h b/test/cpp/end2end/test_health_check_service_impl.h
index 55d53082480..f699a78451d 100644
--- a/test/cpp/end2end/test_health_check_service_impl.h
+++ b/test/cpp/end2end/test_health_check_service_impl.h
@@ -18,12 +18,12 @@
 #ifndef GRPC_TEST_CPP_END2END_TEST_HEALTH_CHECK_SERVICE_IMPL_H
 #define GRPC_TEST_CPP_END2END_TEST_HEALTH_CHECK_SERVICE_IMPL_H
 
-#include <map>
-#include <mutex>
-
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/status.h>
 
+#include <map>
+#include <mutex>
+
 #include "src/proto/grpc/health/v1/health.grpc.pb.h"
 
 namespace grpc {
diff --git a/test/cpp/end2end/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc
index 26810842ac3..b2b347f7aab 100644
--- a/test/cpp/end2end/test_service_impl.cc
+++ b/test/cpp/end2end/test_service_impl.cc
@@ -18,18 +18,16 @@
 
 #include "test/cpp/end2end/test_service_impl.h"
 
+#include <grpcpp/alarm.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
 #include <string>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/alarm.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/notification.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/test_service_impl.h b/test/cpp/end2end/test_service_impl.h
index c1860573d9e..0ffa3bceac0 100644
--- a/test/cpp/end2end/test_service_impl.h
+++ b/test/cpp/end2end/test_service_impl.h
@@ -19,22 +19,20 @@
 #ifndef GRPC_TEST_CPP_END2END_TEST_SERVICE_IMPL_H
 #define GRPC_TEST_CPP_END2END_TEST_SERVICE_IMPL_H
 
+#include <grpc/grpc.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
 #include <condition_variable>
 #include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc
index b8171015e6c..b471759ce72 100644
--- a/test/cpp/end2end/thread_stress_test.cc
+++ b/test/cpp/end2end/thread_stress_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <cinttypes>
-#include <mutex>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -34,7 +26,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <cinttypes>
+#include <mutex>
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc
index dd8a9a94441..6c64048903e 100644
--- a/test/cpp/end2end/time_change_test.cc
+++ b/test/cpp/end2end/time_change_test.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <sys/time.h>
-
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -33,7 +24,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+#include <sys/time.h>
 
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/tls_credentials_test.cc b/test/cpp/end2end/tls_credentials_test.cc
index 9e9c69b257c..381faad2314 100644
--- a/test/cpp/end2end/tls_credentials_test.cc
+++ b/test/cpp/end2end/tls_credentials_test.cc
@@ -15,14 +15,7 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/synchronization/notification.h"
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -31,7 +24,12 @@
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
+#include "absl/log/log.h"
+#include "absl/synchronization/notification.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/cpp/end2end/tls_key_export_test.cc b/test/cpp/end2end/tls_key_export_test.cc
index ad08372f20f..e3db9de2f53 100644
--- a/test/cpp/end2end/tls_key_export_test.cc
+++ b/test/cpp/end2end/tls_key_export_test.cc
@@ -12,6 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc++/grpc++.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/security/tls_credentials_options.h>
+#include <grpcpp/support/channel_arguments.h>
+
 #include <memory>
 #include <string>
 #include <thread>  // NOLINT
@@ -23,14 +30,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc++/grpc++.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/security/tls_credentials_options.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/util/tmpfile.h"
 #include "src/cpp/client/secure_credentials.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
index c10f22d4851..282d8fa3d35 100644
--- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
@@ -13,17 +13,16 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <numeric>
 #include <string>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
index b80b344da03..c03bd0580b1 100644
--- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
@@ -13,18 +13,16 @@
 // limitations under the License.
 //
 
-#include <vector>
-
 #include <gmock/gmock.h>
+#include <grpc/event_engine/endpoint_config.h>
 #include <gtest/gtest.h>
 
+#include <vector>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/cpp/end2end/xds/xds_core_end2end_test.cc b/test/cpp/end2end/xds/xds_core_end2end_test.cc
index e8d0ed404eb..194ed6d15b0 100644
--- a/test/cpp/end2end/xds/xds_core_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_core_end2end_test.cc
@@ -13,18 +13,17 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <type_traits>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/listener.pb.h"
diff --git a/test/cpp/end2end/xds/xds_credentials_end2end_test.cc b/test/cpp/end2end/xds/xds_credentials_end2end_test.cc
index 10e4f5cf80c..6eea137a8ea 100644
--- a/test/cpp/end2end/xds/xds_credentials_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_credentials_end2end_test.cc
@@ -17,10 +17,9 @@
 //
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/xds/xds_csds_end2end_test.cc b/test/cpp/end2end/xds/xds_csds_end2end_test.cc
index cf498e060f8..3b697adaf80 100644
--- a/test/cpp/end2end/xds/xds_csds_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_csds_end2end_test.cc
@@ -13,21 +13,19 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc
index cf003274740..428a88c5edc 100644
--- a/test/cpp/end2end/xds/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test.cc
@@ -18,6 +18,21 @@
 // - mTLS functionality on both client and server
 // - RBAC
 
+#include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/audit_logging.h>
+#include <grpcpp/security/tls_certificate_provider.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/xds_server_builder.h>
+#include <gtest/gtest.h>
+
 #include <deque>
 #include <memory>
 #include <mutex>
@@ -28,9 +43,6 @@
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/functional/bind_front.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
@@ -42,20 +54,6 @@
 #include "absl/strings/str_replace.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/audit_logging.h>
-#include <grpcpp/security/tls_certificate_provider.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc
index 1ba85995c09..7ddf6c7b607 100644
--- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc
@@ -15,6 +15,10 @@
 
 #include "test/cpp/end2end/xds/xds_end2end_test_lib.h"
 
+#include <gmock/gmock.h>
+#include <grpcpp/security/tls_certificate_provider.h>
+#include <gtest/gtest.h>
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -23,9 +27,6 @@
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
@@ -34,9 +35,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpcpp/security/tls_certificate_provider.h>
-
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/server/server.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.h b/test/cpp/end2end/xds/xds_end2end_test_lib.h
index 02e3fcbe50d..82164785750 100644
--- a/test/cpp/end2end/xds/xds_end2end_test_lib.h
+++ b/test/cpp/end2end/xds/xds_end2end_test_lib.h
@@ -16,30 +16,28 @@
 #ifndef GRPC_TEST_CPP_END2END_XDS_XDS_END2END_TEST_LIB_H
 #define GRPC_TEST_CPP_END2END_XDS_XDS_END2END_TEST_LIB_H
 
+#include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/ext/call_metric_recorder.h>
+#include <grpcpp/ext/server_metric_recorder.h>
+#include <grpcpp/xds_server_builder.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <set>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/ext/call_metric_recorder.h>
-#include <grpcpp/ext/server_metric_recorder.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/cpp/server/secure_server_credentials.h"
diff --git a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc
index 49e22de0e0b..a1b5c163cc1 100644
--- a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc
@@ -12,22 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+#include <gmock/gmock.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <string_view>
 #include <type_traits>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/cleanup/cleanup.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/strip.h"
-
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "src/proto/grpc/testing/echo_messages.pb.h"
diff --git a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc
index 3c560fc5c5e..40b8ac3c24e 100644
--- a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc
@@ -13,12 +13,12 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <string>
+#include <vector>
+
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
index 775eb60e6fc..19a0bae4a9d 100644
--- a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/support/string_util.h>
+
 #include <string>
 #include <vector>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/string_util.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/http_client/httpcli.h"
diff --git a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
index 17df1d08cac..1c99747b18d 100644
--- a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <chrono>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc
index 69eb72cbddd..c166b5225a5 100644
--- a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc
@@ -12,17 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <string>
+#include <vector>
+
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/time.h"
 #include "src/proto/grpc/testing/xds/v3/stateful_session.pb.h"
diff --git a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
index f0d6796691d..9feba2fd859 100644
--- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
@@ -13,6 +13,10 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
 #include <unistd.h>
 
 #include <cstddef>
@@ -21,14 +25,7 @@
 #include <utility>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
index 86aba3e8121..8fee5c9c99d 100644
--- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
@@ -13,19 +13,17 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
+#include <grpc/event_engine/endpoint_config.h>
 #include <gtest/gtest.h>
 
+#include <string>
+#include <vector>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/cpp/end2end/xds/xds_rls_end2end_test.cc b/test/cpp/end2end/xds/xds_rls_end2end_test.cc
index 2297d159ca9..2f3c9d0f79c 100644
--- a/test/cpp/end2end/xds/xds_rls_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_rls_end2end_test.cc
@@ -13,14 +13,13 @@
 // limitations under the License.
 //
 
-#include <memory>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <memory>
+
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/xds/xds_routing_end2end_test.cc b/test/cpp/end2end/xds/xds_routing_end2end_test.cc
index 7b7a2be9a52..022b92660ed 100644
--- a/test/cpp/end2end/xds/xds_routing_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_routing_end2end_test.cc
@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <chrono>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/fault.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_server.cc b/test/cpp/end2end/xds/xds_server.cc
index bbae462c994..4b7450eb171 100644
--- a/test/cpp/end2end/xds/xds_server.cc
+++ b/test/cpp/end2end/xds/xds_server.cc
@@ -25,7 +25,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/end2end/xds/xds_server.h b/test/cpp/end2end/xds/xds_server.h
index 2b6c508faf7..5ba992abc59 100644
--- a/test/cpp/end2end/xds/xds_server.h
+++ b/test/cpp/end2end/xds/xds_server.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_TEST_CPP_END2END_XDS_XDS_SERVER_H
 #define GRPC_TEST_CPP_END2END_XDS_XDS_SERVER_H
 
+#include <grpcpp/support/status.h>
+
 #include <deque>
 #include <set>
 #include <string>
@@ -26,9 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
-#include <grpcpp/support/status.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/end2end/xds/xds_utils.cc b/test/cpp/end2end/xds/xds_utils.cc
index c52e819172e..28314835ffa 100644
--- a/test/cpp/end2end/xds/xds_utils.cc
+++ b/test/cpp/end2end/xds/xds_utils.cc
@@ -15,6 +15,8 @@
 
 #include "test/cpp/end2end/xds/xds_utils.h"
 
+#include <grpcpp/security/tls_certificate_provider.h>
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -30,9 +32,6 @@
 #include "absl/strings/str_replace.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpcpp/security/tls_certificate_provider.h>
-
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/server/server.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/xds/xds_utils.h b/test/cpp/end2end/xds/xds_utils.h
index 039dd19c53e..7d9a95ffe49 100644
--- a/test/cpp/end2end/xds/xds_utils.h
+++ b/test/cpp/end2end/xds/xds_utils.h
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
 #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
 #include "src/proto/grpc/testing/xds/v3/endpoint.pb.h"
 #include "src/proto/grpc/testing/xds/v3/http_connection_manager.pb.h"
diff --git a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc
index da8cea70f54..bdd42fcedd4 100644
--- a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc
@@ -13,19 +13,17 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpcpp/ext/server_metric_recorder.h>
 #include <gtest/gtest.h>
 
+#include <string>
+#include <vector>
+
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpcpp/ext/server_metric_recorder.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/client_side_weighted_round_robin.grpc.pb.h"
diff --git a/test/cpp/ext/chaotic_good_test.cc b/test/cpp/ext/chaotic_good_test.cc
index d77a3b98d55..c7d7927354d 100644
--- a/test/cpp/ext/chaotic_good_test.cc
+++ b/test/cpp/ext/chaotic_good_test.cc
@@ -14,10 +14,9 @@
 
 #include "src/cpp/ext/chaotic_good.h"
 
-#include "gtest/gtest.h"
-
 #include <grpcpp/create_channel.h>
 
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 namespace grpc {
diff --git a/test/cpp/ext/csm/csm_observability_test.cc b/test/cpp/ext/csm/csm_observability_test.cc
index 380c8940b7a..c36b37efee1 100644
--- a/test/cpp/ext/csm/csm_observability_test.cc
+++ b/test/cpp/ext/csm/csm_observability_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/cpp/ext/csm/csm_observability.h"
 
-#include "google/cloud/opentelemetry/resource_detector.h"
-#include "gtest/gtest.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-
 #include <grpcpp/ext/csm_observability.h>
 #include <grpcpp/ext/otel_plugin.h>
 
+#include "google/cloud/opentelemetry/resource_detector.h"
+#include "gtest/gtest.h"
+#include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "src/core/xds/grpc/xds_enabled_server.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/ext/csm/mesh_id_test.cc b/test/cpp/ext/csm/mesh_id_test.cc
index e1a7f86fc80..c18526dbf84 100644
--- a/test/cpp/ext/csm/mesh_id_test.cc
+++ b/test/cpp/ext/csm/mesh_id_test.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "gtest/gtest.h"
-
 #include <grpcpp/grpcpp.h>
 
+#include "gtest/gtest.h"
 #include "src/core/util/env.h"
 #include "src/core/util/tmpfile.h"
 #include "src/cpp/ext/csm/metadata_exchange.h"
diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc
index 1b85eaf185a..08fb8bd9823 100644
--- a/test/cpp/ext/csm/metadata_exchange_test.cc
+++ b/test/cpp/ext/csm/metadata_exchange_test.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/csm/metadata_exchange.h"
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include "absl/functional/any_invocable.h"
 #include "gmock/gmock.h"
 #include "google/cloud/opentelemetry/resource_detector.h"
@@ -25,10 +28,6 @@
 #include "opentelemetry/metrics/provider.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
-
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/ext/filters/census/constant_labels_test.cc b/test/cpp/ext/filters/census/constant_labels_test.cc
index 0f7c6128814..0688e5c07b6 100644
--- a/test/cpp/ext/filters/census/constant_labels_test.cc
+++ b/test/cpp/ext/filters/census/constant_labels_test.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+
 #include <string>
 #include <thread>  // NOLINT
 #include <vector>
@@ -26,10 +29,6 @@
 #include "opencensus/stats/stats.h"
 #include "opencensus/stats/testing/test_utils.h"
 #include "opencensus/tags/tag_map.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/cpp/ext/filters/census/context.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/ext/filters/census/library.h b/test/cpp/ext/filters/census/library.h
index 243dd968f64..c1fa9f58f71 100644
--- a/test/cpp/ext/filters/census/library.h
+++ b/test/cpp/ext/filters/census/library.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_TEST_CPP_EXT_FILTERS_CENSUS_LIBRARY_H
 #define GRPC_TEST_CPP_EXT_FILTERS_CENSUS_LIBRARY_H
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+
 #include <string>
 #include <thread>  // NOLINT
 #include <vector>
@@ -27,10 +30,6 @@
 #include "gtest/gtest.h"
 #include "opencensus/stats/stats.h"
 #include "opencensus/trace/exporter/span_exporter.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/cpp/client/client_stats_interceptor.h"
 #include "src/cpp/ext/filters/census/client_filter.h"
diff --git a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc
index d569b1a41c9..3bad979cd29 100644
--- a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc
+++ b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+
 #include <string>
 #include <thread>  // NOLINT
 #include <vector>
@@ -29,10 +32,6 @@
 #include "opencensus/stats/testing/test_utils.h"
 #include "opencensus/tags/tag_map.h"
 #include "opencensus/tags/with_tag_map.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/cpp/ext/filters/census/context.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
diff --git a/test/cpp/ext/filters/logging/library.h b/test/cpp/ext/filters/logging/library.h
index f1ca3fc9576..bffa8a18fe7 100644
--- a/test/cpp/ext/filters/logging/library.h
+++ b/test/cpp/ext/filters/logging/library.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_TEST_CPP_EXT_FILTERS_LOGGING_LIBRARY_H
 #define GRPC_TEST_CPP_EXT_FILTERS_LOGGING_LIBRARY_H
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/support/status.h>
+
 #include <chrono>
 #include <thread>  // NOLINT
 
@@ -29,11 +33,6 @@
 #include "gmock/gmock.h"
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/util/sync.h"
 #include "src/cpp/ext/gcp/observability_logging_sink.h"
diff --git a/test/cpp/ext/filters/logging/logging_census_integration_test.cc b/test/cpp/ext/filters/logging/logging_census_integration_test.cc
index 622c93ffbb4..e6142d4f8fa 100644
--- a/test/cpp/ext/filters/logging/logging_census_integration_test.cc
+++ b/test/cpp/ext/filters/logging/logging_census_integration_test.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/support/status.h>
+
 #include <chrono>
 #include <thread>  // NOLINT
 
@@ -25,11 +29,6 @@
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
 #include "opencensus/stats/testing/test_utils.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/ext/filters/logging/logging_test.cc b/test/cpp/ext/filters/logging/logging_test.cc
index 6441e1cefcf..e94c5c5889e 100644
--- a/test/cpp/ext/filters/logging/logging_test.cc
+++ b/test/cpp/ext/filters/logging/logging_test.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/support/status.h>
+
 #include <chrono>
 #include <thread>  // NOLINT
 
@@ -24,10 +27,6 @@
 #include "gmock/gmock.h"
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/util/dump_args.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/ext/gcp/environment_autodetect_test.cc b/test/cpp/ext/gcp/environment_autodetect_test.cc
index d466a48ba93..fa707266829 100644
--- a/test/cpp/ext/gcp/environment_autodetect_test.cc
+++ b/test/cpp/ext/gcp/environment_autodetect_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/cpp/ext/gcp/environment_autodetect.h"
 
+#include <grpc/grpc.h>
+
 #include <string>
 #include <thread>  // NOLINT
 #include <vector>
@@ -26,9 +28,6 @@
 #include "absl/synchronization/notification.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/env.h"
 #include "src/core/util/notification.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/ext/gcp/observability_config_test.cc b/test/cpp/ext/gcp/observability_config_test.cc
index 391832b13d5..31ba998455f 100644
--- a/test/cpp/ext/gcp/observability_config_test.cc
+++ b/test/cpp/ext/gcp/observability_config_test.cc
@@ -16,11 +16,10 @@
 
 #include "src/cpp/ext/gcp/observability_config.h"
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/support/alloc.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/env.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/test/cpp/ext/gcp/observability_logging_sink_test.cc b/test/cpp/ext/gcp/observability_logging_sink_test.cc
index 2349fe6b60c..f425fb7ac64 100644
--- a/test/cpp/ext/gcp/observability_logging_sink_test.cc
+++ b/test/cpp/ext/gcp/observability_logging_sink_test.cc
@@ -21,7 +21,6 @@
 #include "gmock/gmock.h"
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/json/json_reader.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/ext/gcp/observability_test.cc b/test/cpp/ext/gcp/observability_test.cc
index 93779f9da40..ca26f6a9e93 100644
--- a/test/cpp/ext/gcp/observability_test.cc
+++ b/test/cpp/ext/gcp/observability_test.cc
@@ -14,12 +14,11 @@
 // limitations under the License.
 //
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc++/grpc++.h>
 #include <grpcpp/ext/gcp_observability.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "src/proto/grpc/testing/echo_messages.pb.h"
diff --git a/test/cpp/ext/otel/otel_plugin_test.cc b/test/cpp/ext/otel/otel_plugin_test.cc
index d5f95377d00..4c96d0eef26 100644
--- a/test/cpp/ext/otel/otel_plugin_test.cc
+++ b/test/cpp/ext/otel/otel_plugin_test.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/otel/otel_plugin.h"
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <chrono>
 #include <ratio>
@@ -34,10 +37,6 @@
 #include "opentelemetry/sdk/metrics/data/point_data.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
-
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc
index 131aeef222f..15bc96c63c1 100644
--- a/test/cpp/ext/otel/otel_test_library.cc
+++ b/test/cpp/ext/otel/otel_test_library.cc
@@ -18,6 +18,8 @@
 
 #include "test/cpp/ext/otel/otel_test_library.h"
 
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <memory>
 
@@ -28,9 +30,6 @@
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/test/cpp/ext/otel/otel_test_library.h b/test/cpp/ext/otel/otel_test_library.h
index 38859f68710..78195fe3541 100644
--- a/test/cpp/ext/otel/otel_test_library.h
+++ b/test/cpp/ext/otel/otel_test_library.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_TEST_CPP_EXT_OTEL_OTEL_TEST_LIBRARY_H
 #define GRPC_TEST_CPP_EXT_OTEL_OTEL_TEST_LIBRARY_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/generic/generic_stub.h>
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <thread>
 
@@ -28,11 +32,6 @@
 #include "opentelemetry/metrics/provider.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/generic/generic_stub.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/cpp/ext/otel/otel_plugin.h"
diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc
index 31298a2c9c2..b7ee1423d77 100644
--- a/test/cpp/grpclb/grpclb_api_test.cc
+++ b/test/cpp/grpclb/grpclb_api_test.cc
@@ -16,20 +16,18 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/support/config.h>
 #include <gtest/gtest.h>
 
 #include "absl/log/check.h"
 #include "google/protobuf/duration.upb.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/grpc.h>
-#include <grpcpp/support/config.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/load_balancing/grpclb/load_balancer_api.h"
 #include "src/proto/grpc/lb/v1/load_balancer.pb.h"  // C++ version
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc {
 namespace {
diff --git a/test/cpp/interop/backend_metrics_lb_policy.cc b/test/cpp/interop/backend_metrics_lb_policy.cc
index 55487bc221b..58be2709fe0 100644
--- a/test/cpp/interop/backend_metrics_lb_policy.cc
+++ b/test/cpp/interop/backend_metrics_lb_policy.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/interop/backend_metrics_lb_policy.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/oob_backend_metric.h"
diff --git a/test/cpp/interop/backend_metrics_lb_policy_test.cc b/test/cpp/interop/backend_metrics_lb_policy_test.cc
index 0a5fb277bab..1d2dc8372d2 100644
--- a/test/cpp/interop/backend_metrics_lb_policy_test.cc
+++ b/test/cpp/interop/backend_metrics_lb_policy_test.cc
@@ -18,17 +18,16 @@
 
 #include "test/cpp/interop/backend_metrics_lb_policy.h"
 
-#include <memory>
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/ext/call_metric_recorder.h>
 #include <grpcpp/ext/orca_service.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <thread>
 
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc
index fe211e71ddb..4802be5786e 100644
--- a/test/cpp/interop/client.cc
+++ b/test/cpp/interop/client.cc
@@ -16,18 +16,17 @@
 //
 //
 
-#include <memory>
-#include <unordered_map>
-
-#include "absl/flags/flag.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <unordered_map>
+
+#include "absl/flags/flag.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/interop/client_helper.cc b/test/cpp/interop/client_helper.cc
index 8963aecc4ff..b5c78dd303a 100644
--- a/test/cpp/interop/client_helper.cc
+++ b/test/cpp/interop/client_helper.cc
@@ -18,6 +18,13 @@
 
 #include "test/cpp/interop/client_helper.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+
 #include <fstream>
 #include <memory>
 #include <sstream>
@@ -28,14 +35,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
-
 #include "test/core/security/oauth2_utils.h"
 #include "test/cpp/util/create_test_channel.h"
 #include "test/cpp/util/test_credentials_provider.h"
diff --git a/test/cpp/interop/client_helper.h b/test/cpp/interop/client_helper.h
index 35bd62f5a58..1c1ed0d4223 100644
--- a/test/cpp/interop/client_helper.h
+++ b/test/cpp/interop/client_helper.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_TEST_CPP_INTEROP_CLIENT_HELPER_H
 #define GRPC_TEST_CPP_INTEROP_CLIENT_HELPER_H
 
-#include <functional>
-#include <memory>
-#include <unordered_map>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <functional>
+#include <memory>
+#include <unordered_map>
+
 #include "src/core/lib/surface/call_test_only.h"
 #include "src/core/lib/transport/transport.h"
 
diff --git a/test/cpp/interop/grpclb_fallback_test.cc b/test/cpp/interop/grpclb_fallback_test.cc
index 7d3c637fee2..2a8a02c6fc3 100644
--- a/test/cpp/interop/grpclb_fallback_test.cc
+++ b/test/cpp/interop/grpclb_fallback_test.cc
@@ -18,6 +18,12 @@
 
 #include <arpa/inet.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <inttypes.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -35,14 +41,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/interop/http2_client.cc b/test/cpp/interop/http2_client.cc
index d19b0b6616a..76e7794b427 100644
--- a/test/cpp/interop/http2_client.cc
+++ b/test/cpp/interop/http2_client.cc
@@ -18,17 +18,16 @@
 
 #include "test/cpp/interop/http2_client.h"
 
+#include <grpc/support/alloc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+
 #include <thread>
 
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "src/core/util/useful.h"
diff --git a/test/cpp/interop/http2_client.h b/test/cpp/interop/http2_client.h
index 4eeaaf4125b..d6aeaa2a35a 100644
--- a/test/cpp/interop/http2_client.h
+++ b/test/cpp/interop/http2_client.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CPP_INTEROP_HTTP2_CLIENT_H
 #define GRPC_TEST_CPP_INTEROP_HTTP2_CLIENT_H
 
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 
+#include <memory>
+
 #include "src/proto/grpc/testing/messages.pb.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
 
diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc
index 1190ecd7476..d259cdcfd26 100644
--- a/test/cpp/interop/interop_client.cc
+++ b/test/cpp/interop/interop_client.cc
@@ -18,6 +18,14 @@
 
 #include "test/cpp/interop/interop_client.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/security/credentials.h>
+
 #include <cinttypes>
 #include <fstream>
 #include <memory>
@@ -32,15 +40,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/security/credentials.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/interop/interop_client.h b/test/cpp/interop/interop_client.h
index cfebf466678..2cf3fa81b10 100644
--- a/test/cpp/interop/interop_client.h
+++ b/test/cpp/interop/interop_client.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CPP_INTEROP_INTEROP_CLIENT_H
 #define GRPC_TEST_CPP_INTEROP_INTEROP_CLIENT_H
 
-#include <cstdint>
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 
+#include <cstdint>
+#include <memory>
+
 #include "src/proto/grpc/testing/messages.pb.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
 #include "test/cpp/interop/backend_metrics_lb_policy.h"
diff --git a/test/cpp/interop/interop_server.cc b/test/cpp/interop/interop_server.cc
index 25f5f633bfc..f22d4bf035c 100644
--- a/test/cpp/interop/interop_server.cc
+++ b/test/cpp/interop/interop_server.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <fstream>
-#include <memory>
-#include <sstream>
-#include <thread>
-
-#include "absl/flags/flag.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/ext/call_metric_recorder.h>
@@ -35,6 +26,14 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
+#include <fstream>
+#include <memory>
+#include <sstream>
+#include <thread>
+
+#include "absl/flags/flag.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/interop/interop_test.cc b/test/cpp/interop/interop_test.cc
index 1134971371d..74c30d778fd 100644
--- a/test/cpp/interop/interop_test.cc
+++ b/test/cpp/interop/interop_test.cc
@@ -17,6 +17,7 @@
 //
 
 #include <assert.h>
+#include <grpc/support/alloc.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,9 +32,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
diff --git a/test/cpp/interop/istio_echo_server.cc b/test/cpp/interop/istio_echo_server.cc
index bb24edcae46..f661911f3e3 100644
--- a/test/cpp/interop/istio_echo_server.cc
+++ b/test/cpp/interop/istio_echo_server.cc
@@ -14,6 +14,15 @@
 // limitations under the License.
 //
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/support/string_ref.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -34,16 +43,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
-
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/string_ref.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/util/env.h"
 #include "src/core/util/gethostname.h"
diff --git a/test/cpp/interop/istio_echo_server_lib.cc b/test/cpp/interop/istio_echo_server_lib.cc
index f0ddd49c80a..8d8949a820b 100644
--- a/test/cpp/interop/istio_echo_server_lib.cc
+++ b/test/cpp/interop/istio_echo_server_lib.cc
@@ -16,6 +16,9 @@
 
 #include "test/cpp/interop/istio_echo_server_lib.h"
 
+#include <grpcpp/client_context.h>
+#include <grpcpp/grpcpp.h>
+
 #include <thread>
 
 #include "absl/log/log.h"
@@ -23,10 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
 #include "absl/synchronization/blocking_counter.h"
-
-#include <grpcpp/client_context.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/host_port.h"
 #include "src/proto/grpc/testing/istio_echo.pb.h"
 
diff --git a/test/cpp/interop/istio_echo_server_test.cc b/test/cpp/interop/istio_echo_server_test.cc
index faa9a47ac57..927103e405e 100644
--- a/test/cpp/interop/istio_echo_server_test.cc
+++ b/test/cpp/interop/istio_echo_server_test.cc
@@ -14,19 +14,17 @@
 // limitations under the License.
 //
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/host_port.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/interop/metrics_client.cc b/test/cpp/interop/metrics_client.cc
index 9eb4f488b14..06352eaed6b 100644
--- a/test/cpp/interop/metrics_client.cc
+++ b/test/cpp/interop/metrics_client.cc
@@ -16,13 +16,12 @@
 // is % allowed in string
 //
 
+#include <grpcpp/grpcpp.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/flags/flag.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/metrics.grpc.pb.h"
 #include "src/proto/grpc/testing/metrics.pb.h"
diff --git a/test/cpp/interop/observability_client.cc b/test/cpp/interop/observability_client.cc
index c264aa504ec..8e2132dcd98 100644
--- a/test/cpp/interop/observability_client.cc
+++ b/test/cpp/interop/observability_client.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/ext/gcp_observability.h>
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <memory>
 #include <unordered_map>
 
@@ -24,14 +31,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/ext/gcp_observability.h>
-#include <grpcpp/ext/otel_plugin.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/interop/observability_interop_server_bootstrap.cc b/test/cpp/interop/observability_interop_server_bootstrap.cc
index f14755b5cd9..097ff933d03 100644
--- a/test/cpp/interop/observability_interop_server_bootstrap.cc
+++ b/test/cpp/interop/observability_interop_server_bootstrap.cc
@@ -16,13 +16,11 @@
 //
 //
 
+#include <grpcpp/ext/gcp_observability.h>
 #include <signal.h>
 
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/ext/gcp_observability.h>
-
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/interop/server_helper.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/interop/pre_stop_hook_server.cc b/test/cpp/interop/pre_stop_hook_server.cc
index a00ab791a9d..ea8b7d8b807 100644
--- a/test/cpp/interop/pre_stop_hook_server.cc
+++ b/test/cpp/interop/pre_stop_hook_server.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/interop/pre_stop_hook_server.h"
 
+#include <grpcpp/grpcpp.h>
+
 #include <thread>
 
 #include "absl/strings/str_format.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/sync.h"
 #include "src/proto/grpc/testing/messages.pb.h"
 
diff --git a/test/cpp/interop/pre_stop_hook_server_test.cc b/test/cpp/interop/pre_stop_hook_server_test.cc
index 32aa91b1bc2..0097a9e3fbc 100644
--- a/test/cpp/interop/pre_stop_hook_server_test.cc
+++ b/test/cpp/interop/pre_stop_hook_server_test.cc
@@ -16,17 +16,15 @@
 
 #include "test/cpp/interop/pre_stop_hook_server.h"
 
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
 
+#include <thread>
+
+#include "absl/strings/str_format.h"
 #include "src/core/util/sync.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/cpp/interop/reconnect_interop_client.cc b/test/cpp/interop/reconnect_interop_client.cc
index 1c2e4837ec0..bb46bfedd10 100644
--- a/test/cpp/interop/reconnect_interop_client.cc
+++ b/test/cpp/interop/reconnect_interop_client.cc
@@ -16,18 +16,17 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/support/channel_arguments.h>
+
 #include <memory>
 #include <sstream>
 
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/cpp/interop/reconnect_interop_server.cc b/test/cpp/interop/reconnect_interop_server.cc
index a5ac668bb29..a118802661c 100644
--- a/test/cpp/interop/reconnect_interop_server.cc
+++ b/test/cpp/interop/reconnect_interop_server.cc
@@ -18,6 +18,10 @@
 
 // Test description at doc/connection-backoff-interop-test-description.md
 
+#include <grpc/grpc.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
 #include <signal.h>
 
 #include <condition_variable>
@@ -28,12 +32,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/cpp/interop/rpc_behavior_lb_policy.cc b/test/cpp/interop/rpc_behavior_lb_policy.cc
index 8d8826a03d1..4b8cfc10956 100644
--- a/test/cpp/interop/rpc_behavior_lb_policy.cc
+++ b/test/cpp/interop/rpc_behavior_lb_policy.cc
@@ -18,11 +18,10 @@
 
 #include "test/cpp/interop/rpc_behavior_lb_policy.h"
 
-#include "absl/log/check.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/util/json/json_args.h"
diff --git a/test/cpp/interop/server_helper.cc b/test/cpp/interop/server_helper.cc
index 8dfc5576d7a..e79912f3bde 100644
--- a/test/cpp/interop/server_helper.cc
+++ b/test/cpp/interop/server_helper.cc
@@ -18,13 +18,12 @@
 
 #include "test/cpp/interop/server_helper.h"
 
+#include <grpcpp/security/server_credentials.h>
+
 #include <memory>
 
 #include "absl/flags/declare.h"
 #include "absl/flags/flag.h"
-
-#include <grpcpp/security/server_credentials.h>
-
 #include "src/core/lib/surface/call_test_only.h"
 #include "src/core/lib/transport/transport.h"
 #include "test/cpp/util/test_credentials_provider.h"
diff --git a/test/cpp/interop/server_helper.h b/test/cpp/interop/server_helper.h
index 9acb77f624e..bdec6cf4b1e 100644
--- a/test/cpp/interop/server_helper.h
+++ b/test/cpp/interop/server_helper.h
@@ -19,9 +19,6 @@
 #ifndef GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H
 #define GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H
 
-#include <condition_variable>
-#include <memory>
-
 #include <grpc/compression.h>
 #include <grpc/support/atm.h>
 #include <grpcpp/security/server_credentials.h>
@@ -29,6 +26,9 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
+#include <condition_variable>
+#include <memory>
+
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/interop/stress_interop_client.cc b/test/cpp/interop/stress_interop_client.cc
index 0ccacfaefb1..cf92bd1ba8b 100644
--- a/test/cpp/interop/stress_interop_client.cc
+++ b/test/cpp/interop/stress_interop_client.cc
@@ -18,6 +18,8 @@
 
 #include "test/cpp/interop/stress_interop_client.h"
 
+#include <grpcpp/create_channel.h>
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -25,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpcpp/create_channel.h>
-
 #include "src/core/util/crash.h"
 #include "test/cpp/interop/interop_client.h"
 #include "test/cpp/util/metrics_server.h"
diff --git a/test/cpp/interop/stress_interop_client.h b/test/cpp/interop/stress_interop_client.h
index cdc8bf91727..4744bed86c4 100644
--- a/test/cpp/interop/stress_interop_client.h
+++ b/test/cpp/interop/stress_interop_client.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CPP_INTEROP_STRESS_INTEROP_CLIENT_H
 #define GRPC_TEST_CPP_INTEROP_STRESS_INTEROP_CLIENT_H
 
+#include <grpcpp/create_channel.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <grpcpp/create_channel.h>
-
 #include "test/cpp/interop/interop_client.h"
 #include "test/cpp/util/metrics_server.h"
 
diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc
index 3f27484111c..addf9bfb14f 100644
--- a/test/cpp/interop/stress_test.cc
+++ b/test/cpp/interop/stress_test.cc
@@ -16,6 +16,9 @@
 // is % allowed in string
 //
 
+#include <grpc/support/time.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/grpcpp.h>
 #include <limits.h>
 
 #include <memory>
@@ -28,11 +31,6 @@
 #include "absl/log/check.h"
 #include "absl/log/globals.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/time.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/metrics.grpc.pb.h"
 #include "src/proto/grpc/testing/metrics.pb.h"
diff --git a/test/cpp/interop/xds_federation_client.cc b/test/cpp/interop/xds_federation_client.cc
index 8c8c4ffc6b7..2edbf491815 100644
--- a/test/cpp/interop/xds_federation_client.cc
+++ b/test/cpp/interop/xds_federation_client.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+
 #include <memory>
 #include <thread>
 
@@ -23,10 +26,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_split.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/interop/client_helper.h"
diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc
index f3af46b19f2..d2296032267 100644
--- a/test/cpp/interop/xds_interop_client.cc
+++ b/test/cpp/interop/xds_interop_client.cc
@@ -16,6 +16,14 @@
 //
 //
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -38,15 +46,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/empty.pb.h"
diff --git a/test/cpp/interop/xds_interop_server.cc b/test/cpp/interop/xds_interop_server.cc
index eb2fa7ad08f..8d70944b4e7 100644
--- a/test/cpp/interop/xds_interop_server.cc
+++ b/test/cpp/interop/xds_interop_server.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 
 #include "absl/flags/flag.h"
@@ -23,11 +27,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #include "src/core/util/gethostname.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/interop/xds_interop_server_lib.h"
diff --git a/test/cpp/interop/xds_interop_server_lib.cc b/test/cpp/interop/xds_interop_server_lib.cc
index 6a4202ff9fa..5a7d4ce3f2c 100644
--- a/test/cpp/interop/xds_interop_server_lib.cc
+++ b/test/cpp/interop/xds_interop_server_lib.cc
@@ -18,12 +18,6 @@
 
 #include "test/cpp/interop/xds_interop_server_lib.h"
 
-#include <memory>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_split.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/ext/admin_services.h>
@@ -33,6 +27,11 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/xds_server_builder.h>
 
+#include <memory>
+
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_split.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
diff --git a/test/cpp/interop/xds_interop_server_lib.h b/test/cpp/interop/xds_interop_server_lib.h
index 01e0b6185b9..5d99413ba55 100644
--- a/test/cpp/interop/xds_interop_server_lib.h
+++ b/test/cpp/interop/xds_interop_server_lib.h
@@ -18,11 +18,11 @@
 
 #ifndef GRPC_TEST_CPP_INTEROP_XDS_INTEROP_SERVER_LIB_H
 #define GRPC_TEST_CPP_INTEROP_XDS_INTEROP_SERVER_LIB_H
+#include <grpcpp/server.h>
+
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpcpp/server.h>
-
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/interop/xds_interop_server_test.cc b/test/cpp/interop/xds_interop_server_test.cc
index 808924ed0b3..8aeb6e948a4 100644
--- a/test/cpp/interop/xds_interop_server_test.cc
+++ b/test/cpp/interop/xds_interop_server_test.cc
@@ -14,16 +14,14 @@
 // limitations under the License.
 //
 
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/grpcpp.h>
+#include <gtest/gtest.h>
 
+#include <thread>
+
+#include "absl/strings/str_format.h"
 #include "src/core/util/sync.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
diff --git a/test/cpp/interop/xds_stats_watcher.h b/test/cpp/interop/xds_stats_watcher.h
index 530358dadab..5d92f8517f2 100644
--- a/test/cpp/interop/xds_stats_watcher.h
+++ b/test/cpp/interop/xds_stats_watcher.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_TEST_CPP_INTEROP_XDS_STATS_WATCHER_H
 #define GRPC_TEST_CPP_INTEROP_XDS_STATS_WATCHER_H
 
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -34,9 +36,6 @@
 
 #include "absl/status/status.h"
 #include "absl/types/span.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
 
diff --git a/test/cpp/interop/xds_stats_watcher_test.cc b/test/cpp/interop/xds_stats_watcher_test.cc
index 6f29c96002c..65ef8568984 100644
--- a/test/cpp/interop/xds_stats_watcher_test.cc
+++ b/test/cpp/interop/xds_stats_watcher_test.cc
@@ -16,13 +16,12 @@
 
 #include "test/cpp/interop/xds_stats_watcher.h"
 
-#include <map>
-#include <memory>
-
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include <grpc/grpc.h>
+#include <map>
+#include <memory>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/microbenchmarks/bm_alarm.cc b/test/cpp/microbenchmarks/bm_alarm.cc
index f72220e9aa6..b64d670129b 100644
--- a/test/cpp/microbenchmarks/bm_alarm.cc
+++ b/test/cpp/microbenchmarks/bm_alarm.cc
@@ -19,7 +19,6 @@
 // This benchmark exists to ensure that immediately-firing alarms are fast
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/alarm.h>
 #include <grpcpp/completion_queue.h>
diff --git a/test/cpp/microbenchmarks/bm_basic_work_queue.cc b/test/cpp/microbenchmarks/bm_basic_work_queue.cc
index c84cd3d1829..c0188e6cb98 100644
--- a/test/cpp/microbenchmarks/bm_basic_work_queue.cc
+++ b/test/cpp/microbenchmarks/bm_basic_work_queue.cc
@@ -11,15 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <deque>
-
 #include <benchmark/benchmark.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <deque>
+
+#include "absl/log/check.h"
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/microbenchmarks/bm_byte_buffer.cc b/test/cpp/microbenchmarks/bm_byte_buffer.cc
index 0de947fbec3..8b0c9a302a8 100644
--- a/test/cpp/microbenchmarks/bm_byte_buffer.cc
+++ b/test/cpp/microbenchmarks/bm_byte_buffer.cc
@@ -18,18 +18,16 @@
 
 // This benchmark exists to show that byte-buffer copy is size-independent
 
-#include <memory>
-
 #include <benchmark/benchmark.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/slice.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/byte_buffer.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/microbenchmarks/helpers.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/microbenchmarks/bm_channel.cc b/test/cpp/microbenchmarks/bm_channel.cc
index 45fc8b64852..7e11dfa14dc 100644
--- a/test/cpp/microbenchmarks/bm_channel.cc
+++ b/test/cpp/microbenchmarks/bm_channel.cc
@@ -19,7 +19,6 @@
 // Benchmark channel
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
diff --git a/test/cpp/microbenchmarks/bm_channel_args.cc b/test/cpp/microbenchmarks/bm_channel_args.cc
index f68c2a05428..3ccdcd2039b 100644
--- a/test/cpp/microbenchmarks/bm_channel_args.cc
+++ b/test/cpp/microbenchmarks/bm_channel_args.cc
@@ -15,14 +15,12 @@
 // Benchmark ChannelArgs comparison performance between grpc_channel_args and
 // grpc_core::ChannelArgs
 
-#include <random>
-
 #include <benchmark/benchmark.h>
-
-#include "absl/container/btree_map.h"
-
 #include <grpcpp/support/channel_arguments.h>
 
+#include <random>
+
+#include "absl/container/btree_map.h"
 #include "src/core/lib/channel/channel_args.h"
 
 const char kKey[] = "a very long key";
diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
index 90d4ccee01f..37006f4eede 100644
--- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
+++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
@@ -18,20 +18,17 @@
 
 // Microbenchmarks around CHTTP2 HPACK operations
 
+#include <benchmark/benchmark.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
 #include <string.h>
 
 #include <memory>
 #include <sstream>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/random/random.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc
index 1622cc2fc93..41ae38416d0 100644
--- a/test/cpp/microbenchmarks/bm_closure.cc
+++ b/test/cpp/microbenchmarks/bm_closure.cc
@@ -18,12 +18,11 @@
 
 // Test various closure related operations
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 
+#include <sstream>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc
index 6b490df906b..c84a974babe 100644
--- a/test/cpp/microbenchmarks/bm_cq.cc
+++ b/test/cpp/microbenchmarks/bm_cq.cc
@@ -20,13 +20,11 @@
 // working
 
 #include <benchmark/benchmark.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/grpc_library.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
index f504af9f5fe..8acdb307950 100644
--- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
+++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
@@ -16,18 +16,15 @@
 //
 //
 
+#include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
 #include <string.h>
 
 #include <atomic>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/surface/completion_queue.h"
diff --git a/test/cpp/microbenchmarks/bm_event_engine_run.cc b/test/cpp/microbenchmarks/bm_event_engine_run.cc
index 5f70aea856f..752d9d440e9 100644
--- a/test/cpp/microbenchmarks/bm_event_engine_run.cc
+++ b/test/cpp/microbenchmarks/bm_event_engine_run.cc
@@ -12,21 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <benchmark/benchmark.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpcpp/impl/grpc_library.h>
+
 #include <atomic>
 #include <cmath>
 #include <memory>
 #include <vector>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/debugging/leak_check.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpcpp/impl/grpc_library.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/microbenchmarks/bm_exec_ctx.cc b/test/cpp/microbenchmarks/bm_exec_ctx.cc
index 4a464856764..f90c558976a 100644
--- a/test/cpp/microbenchmarks/bm_exec_ctx.cc
+++ b/test/cpp/microbenchmarks/bm_exec_ctx.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <atomic>
-#include <memory>
-
 #include <benchmark/benchmark.h>
-
 #include <grpcpp/impl/grpc_library.h>
 
+#include <atomic>
+#include <memory>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/notification.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/microbenchmarks/bm_huffman_decode.cc b/test/cpp/microbenchmarks/bm_huffman_decode.cc
index 59a684f1298..770082666a5 100644
--- a/test/cpp/microbenchmarks/bm_huffman_decode.cc
+++ b/test/cpp/microbenchmarks/bm_huffman_decode.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <benchmark/benchmark.h>
+
 #include <cstdint>
 #include <random>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/strings/escaping.h"
-
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/decode_huff.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc
index e2d2adebbe6..8e85213182b 100644
--- a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc
+++ b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc
@@ -16,19 +16,17 @@
 //
 //
 
+#include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/opencensus.h>
+
 #include <string>
 #include <thread>  // NOLINT
 
-#include <benchmark/benchmark.h>
-
 #include "absl/base/call_once.h"
 #include "absl/strings/str_cat.h"
 #include "opencensus/stats/stats.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/microbenchmarks/bm_rng.cc b/test/cpp/microbenchmarks/bm_rng.cc
index bf84e39910e..fe34430b8e0 100644
--- a/test/cpp/microbenchmarks/bm_rng.cc
+++ b/test/cpp/microbenchmarks/bm_rng.cc
@@ -21,7 +21,6 @@
 #include <benchmark/benchmark.h>
 
 #include "absl/random/random.h"
-
 #include "src/core/util/sync.h"
 
 static void BM_OneRngFromFreshBitSet(benchmark::State& state) {
diff --git a/test/cpp/microbenchmarks/bm_stats_plugin.cc b/test/cpp/microbenchmarks/bm_stats_plugin.cc
index abc55bf80c2..39dfae190d4 100644
--- a/test/cpp/microbenchmarks/bm_stats_plugin.cc
+++ b/test/cpp/microbenchmarks/bm_stats_plugin.cc
@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
 #include <benchmark/benchmark.h>
+#include <grpcpp/ext/otel_plugin.h>
+
+#include <memory>
 
 #include "absl/log/absl_check.h"
 #include "absl/strings/string_view.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpcpp/ext/otel_plugin.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/telemetry/metrics.h"
 #include "test/core/test_util/fake_stats_plugin.h"
diff --git a/test/cpp/microbenchmarks/bm_thread_pool.cc b/test/cpp/microbenchmarks/bm_thread_pool.cc
index 620a7ce7d1c..a185c361451 100644
--- a/test/cpp/microbenchmarks/bm_thread_pool.cc
+++ b/test/cpp/microbenchmarks/bm_thread_pool.cc
@@ -12,19 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <benchmark/benchmark.h>
+#include <grpc/support/cpu.h>
+#include <grpcpp/impl/grpc_library.h>
+
 #include <atomic>
 #include <cmath>
 #include <memory>
 #include <vector>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/cpu.h>
-#include <grpcpp/impl/grpc_library.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/microbenchmarks/callback_streaming_ping_pong.h b/test/cpp/microbenchmarks/callback_streaming_ping_pong.h
index 7987200a245..54deee57868 100644
--- a/test/cpp/microbenchmarks/callback_streaming_ping_pong.h
+++ b/test/cpp/microbenchmarks/callback_streaming_ping_pong.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_STREAMING_PING_PONG_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_STREAMING_PING_PONG_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
+#include <sstream>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/callback_test_service.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
diff --git a/test/cpp/microbenchmarks/callback_test_service.h b/test/cpp/microbenchmarks/callback_test_service.h
index bf907d22c49..09ea69ed8f6 100644
--- a/test/cpp/microbenchmarks/callback_test_service.h
+++ b/test/cpp/microbenchmarks/callback_test_service.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_TEST_SERVICE_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_TEST_SERVICE_H
 
+#include <benchmark/benchmark.h>
+
 #include <condition_variable>
 #include <memory>
 #include <mutex>
 #include <sstream>
 
-#include <benchmark/benchmark.h>
-
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/util/string_ref_helper.h"
 
diff --git a/test/cpp/microbenchmarks/callback_unary_ping_pong.h b/test/cpp/microbenchmarks/callback_unary_ping_pong.h
index a7188fc1f0d..7f139342da8 100644
--- a/test/cpp/microbenchmarks/callback_unary_ping_pong.h
+++ b/test/cpp/microbenchmarks/callback_unary_ping_pong.h
@@ -21,12 +21,11 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_UNARY_PING_PONG_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_UNARY_PING_PONG_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
-#include "absl/log/check.h"
+#include <sstream>
 
+#include "absl/log/check.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/callback_test_service.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h
index 79e48ae646b..56c205466b4 100644
--- a/test/cpp/microbenchmarks/fullstack_fixtures.h
+++ b/test/cpp/microbenchmarks/fullstack_fixtures.h
@@ -19,8 +19,6 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_FIXTURES_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_FIXTURES_H
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
 #include <grpcpp/channel.h>
@@ -30,6 +28,7 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 
+#include "absl/log/check.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h
index 6fd8ba807fe..fd2e0a001c6 100644
--- a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h
+++ b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h
@@ -21,12 +21,11 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PING_PONG_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PING_PONG_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
-#include "absl/log/check.h"
+#include <sstream>
 
+#include "absl/log/check.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
 #include "test/cpp/microbenchmarks/fullstack_fixtures.h"
diff --git a/test/cpp/microbenchmarks/fullstack_streaming_pump.h b/test/cpp/microbenchmarks/fullstack_streaming_pump.h
index df0953fd9b0..70187affb2f 100644
--- a/test/cpp/microbenchmarks/fullstack_streaming_pump.h
+++ b/test/cpp/microbenchmarks/fullstack_streaming_pump.h
@@ -21,12 +21,11 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PUMP_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PUMP_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
-#include "absl/log/check.h"
+#include <sstream>
 
+#include "absl/log/check.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
 #include "test/cpp/microbenchmarks/fullstack_fixtures.h"
diff --git a/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h b/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h
index f6a7c8b88aa..5ef7a3f22f1 100644
--- a/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h
+++ b/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h
@@ -21,12 +21,11 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_UNARY_PING_PONG_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_UNARY_PING_PONG_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
-#include "absl/log/check.h"
+#include <sstream>
 
+#include "absl/log/check.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
 #include "test/cpp/microbenchmarks/fullstack_fixtures.h"
diff --git a/test/cpp/microbenchmarks/helpers.h b/test/cpp/microbenchmarks/helpers.h
index 34105a98d63..99400c05034 100644
--- a/test/cpp/microbenchmarks/helpers.h
+++ b/test/cpp/microbenchmarks/helpers.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_HELPERS_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_HELPERS_H
 
-#include <sstream>
-#include <vector>
-
 #include <benchmark/benchmark.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/grpc_library.h>
 
+#include <sstream>
+#include <vector>
+
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 
diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc
index e1fa4111ed6..00a55c37d7c 100644
--- a/test/cpp/naming/address_sorting_test.cc
+++ b/test/cpp/naming/address_sorting_test.cc
@@ -16,23 +16,20 @@
 //
 //
 
-#include <string.h>
-#include <sys/types.h>
-
-#include <vector>
-
 #include <address_sorting/address_sorting.h>
 #include <gmock/gmock.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <string.h>
+#include <sys/types.h>
 
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc
index b77330ee595..cb05f8d9030 100644
--- a/test/cpp/naming/cancel_ares_query_test.cc
+++ b/test/cpp/naming/cancel_ares_query_test.cc
@@ -16,24 +16,21 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include <string>
-
 #include <gmock/gmock.h>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc
index f5a4984e98c..050e42dd00e 100644
--- a/test/cpp/naming/resolver_component_test.cc
+++ b/test/cpp/naming/resolver_component_test.cc
@@ -18,28 +18,25 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/grpc_types.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <string>
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/grpc_types.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/test/cpp/naming/resolver_component_tests_runner_invoker.cc b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
index 26fe87fb600..4c095a7d4bf 100644
--- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc
+++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
@@ -12,15 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
 #include <signal.h>
 #include <string.h>
 
-#include <grpc/support/port_platform.h>
-
 #ifndef GPR_WINDOWS
 #include <unistd.h>
 #endif  // GPR_WINDOWS
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+
 #include <memory>
 #include <string>
 #include <thread>
@@ -30,11 +33,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 
 #ifdef __FreeBSD__
diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc
index d540c21a225..c171daeebd6 100644
--- a/test/cpp/performance/writes_per_rpc_test.cc
+++ b/test/cpp/performance/writes_per_rpc_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <chrono>
-#include <utility>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/create_channel.h>
 #include <grpcpp/impl/grpc_library.h>
@@ -31,7 +23,13 @@
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <chrono>
+#include <utility>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/cpp/qps/benchmark_config.cc b/test/cpp/qps/benchmark_config.cc
index 58b4f57be42..007480fe994 100644
--- a/test/cpp/qps/benchmark_config.cc
+++ b/test/cpp/qps/benchmark_config.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/qps/benchmark_config.h"
 
-#include "absl/flags/flag.h"
-#include "absl/log/check.h"
-
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>
 
+#include "absl/flags/flag.h"
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 #include "test/cpp/util/test_credentials_provider.h"
 
diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h
index fe66465bbce..fdc2e8bbff7 100644
--- a/test/cpp/qps/client.h
+++ b/test/cpp/qps/client.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_TEST_CPP_QPS_CLIENT_H
 #define GRPC_TEST_CPP_QPS_CLIENT_H
 
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/support/byte_buffer.h>
+#include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/slice.h>
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -33,13 +38,6 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/support/byte_buffer.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/slice.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc
index 889d935f989..855859159cf 100644
--- a/test/cpp/qps/client_async.cc
+++ b/test/cpp/qps/client_async.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/cpu.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/generic/generic_stub.h>
+
 #include <forward_list>
 #include <functional>
 #include <list>
@@ -30,14 +37,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/cpu.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/generic/generic_stub.h>
-
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
diff --git a/test/cpp/qps/client_callback.cc b/test/cpp/qps/client_callback.cc
index 29a35676aa4..d34373def15 100644
--- a/test/cpp/qps/client_callback.cc
+++ b/test/cpp/qps/client_callback.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/cpu.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+
 #include <list>
 #include <memory>
 #include <mutex>
@@ -27,13 +33,6 @@
 
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/cpu.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "test/cpp/qps/client.h"
diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc
index 23778475ac7..fd2c6d17589 100644
--- a/test/cpp/qps/client_sync.cc
+++ b/test/cpp/qps/client_sync.cc
@@ -16,6 +16,14 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+
 #include <chrono>
 #include <memory>
 #include <mutex>
@@ -26,15 +34,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "test/cpp/qps/client.h"
diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc
index 3f015de1236..a2dee89e905 100644
--- a/test/cpp/qps/driver.cc
+++ b/test/cpp/qps/driver.cc
@@ -18,6 +18,12 @@
 
 #include "test/cpp/qps/driver.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+
 #include <cinttypes>
 #include <deque>
 #include <list>
@@ -28,13 +34,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "google/protobuf/timestamp.pb.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "src/core/util/host_port.h"
diff --git a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc
index 57e826a5dff..766e555c7aa 100644
--- a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc
+++ b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc
@@ -19,7 +19,6 @@
 #include <set>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/benchmark_config.h"
diff --git a/test/cpp/qps/interarrival.h b/test/cpp/qps/interarrival.h
index 3d11b208cba..59af99f2ca1 100644
--- a/test/cpp/qps/interarrival.h
+++ b/test/cpp/qps/interarrival.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_QPS_INTERARRIVAL_H
 #define GRPC_TEST_CPP_QPS_INTERARRIVAL_H
 
+#include <grpcpp/support/config.h>
+
 #include <chrono>
 #include <cmath>
 #include <random>
 #include <vector>
 
-#include <grpcpp/support/config.h>
-
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/qps/json_run_localhost.cc b/test/cpp/qps/json_run_localhost.cc
index 59d46414bca..c577328637b 100644
--- a/test/cpp/qps/json_run_localhost.cc
+++ b/test/cpp/qps/json_run_localhost.cc
@@ -30,7 +30,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/qps/parse_json.cc b/test/cpp/qps/parse_json.cc
index 0b6af9f962d..2a28339d384 100644
--- a/test/cpp/qps/parse_json.cc
+++ b/test/cpp/qps/parse_json.cc
@@ -23,7 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc {
diff --git a/test/cpp/qps/qps_json_driver.cc b/test/cpp/qps/qps_json_driver.cc
index c11e9f2bd81..4614eacf663 100644
--- a/test/cpp/qps/qps_json_driver.cc
+++ b/test/cpp/qps/qps_json_driver.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpcpp/impl/codegen/config_protobuf.h>
+
 #include <fstream>
 #include <iostream>
 #include <memory>
@@ -24,9 +26,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/impl/codegen/config_protobuf.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/benchmark_config.h"
diff --git a/test/cpp/qps/qps_openloop_test.cc b/test/cpp/qps/qps_openloop_test.cc
index 92db5ef53c4..5335aab7689 100644
--- a/test/cpp/qps/qps_openloop_test.cc
+++ b/test/cpp/qps/qps_openloop_test.cc
@@ -19,7 +19,6 @@
 #include <set>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/benchmark_config.h"
diff --git a/test/cpp/qps/qps_server_builder.h b/test/cpp/qps/qps_server_builder.h
index bf604c00d27..f5f5a6f6180 100644
--- a/test/cpp/qps/qps_server_builder.h
+++ b/test/cpp/qps/qps_server_builder.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CPP_QPS_QPS_SERVER_BUILDER_H
 #define GRPC_TEST_CPP_QPS_QPS_SERVER_BUILDER_H
 
+#include <grpcpp/server_builder.h>
+
 #include <functional>
 #include <memory>
 
-#include <grpcpp/server_builder.h>
-
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc
index 4f396456c51..7dff6a20c0a 100644
--- a/test/cpp/qps/qps_worker.cc
+++ b/test/cpp/qps/qps_worker.cc
@@ -18,6 +18,14 @@
 
 #include "test/cpp/qps/qps_worker.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/cpu.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+
 #include <memory>
 #include <mutex>
 #include <sstream>
@@ -28,15 +36,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/cpu.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/host_port.h"
 #include "src/proto/grpc/testing/worker_service.grpc.pb.h"
diff --git a/test/cpp/qps/qps_worker.h b/test/cpp/qps/qps_worker.h
index b0c5af09566..ad8956bf5b3 100644
--- a/test/cpp/qps/qps_worker.h
+++ b/test/cpp/qps/qps_worker.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_QPS_QPS_WORKER_H
 #define GRPC_TEST_CPP_QPS_QPS_WORKER_H
 
-#include <memory>
-
 #include <grpc/support/atm.h>
 #include <grpcpp/server.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 #include "test/cpp/qps/server.h"
 
 namespace grpc {
diff --git a/test/cpp/qps/report.cc b/test/cpp/qps/report.cc
index e0b0cd646b2..0b3784e4885 100644
--- a/test/cpp/qps/report.cc
+++ b/test/cpp/qps/report.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/qps/report.h"
 
+#include <grpcpp/client_context.h>
+
 #include <fstream>
 
 #include "absl/log/log.h"
-
-#include <grpcpp/client_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h"
 #include "test/cpp/qps/driver.h"
diff --git a/test/cpp/qps/report.h b/test/cpp/qps/report.h
index 30539e73f1b..0478a171126 100644
--- a/test/cpp/qps/report.h
+++ b/test/cpp/qps/report.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_QPS_REPORT_H
 #define GRPC_TEST_CPP_QPS_REPORT_H
 
+#include <grpcpp/channel.h>
+#include <grpcpp/support/config.h>
+
 #include <memory>
 #include <set>
 #include <vector>
 
-#include <grpcpp/channel.h>
-#include <grpcpp/support/config.h>
-
 #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h"
 #include "test/cpp/qps/driver.h"
 
diff --git a/test/cpp/qps/scenario_runner.cc b/test/cpp/qps/scenario_runner.cc
index 7ca32f983ca..220a65697fd 100644
--- a/test/cpp/qps/scenario_runner.cc
+++ b/test/cpp/qps/scenario_runner.cc
@@ -14,7 +14,6 @@
 
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
diff --git a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc
index d64d40c8e8a..091502f96e3 100644
--- a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc
+++ b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc
@@ -19,7 +19,6 @@
 #include <set>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/benchmark_config.h"
diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h
index 98d0ee1dd6d..4edf5b7531b 100644
--- a/test/cpp/qps/server.h
+++ b/test/cpp/qps/server.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_TEST_CPP_QPS_SERVER_H
 #define GRPC_TEST_CPP_QPS_SERVER_H
 
-#include <vector>
-
-#include "absl/log/log.h"
-
 #include <grpc/support/cpu.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server_builder.h>
 
+#include <vector>
+
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/control.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc
index f091c11d69b..2e290ca7e3e 100644
--- a/test/cpp/qps/server_async.cc
+++ b/test/cpp/qps/server_async.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <forward_list>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <thread>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/generic/async_generic_service.h>
@@ -35,6 +26,14 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/config.h>
 
+#include <algorithm>
+#include <forward_list>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/host_port.h"
diff --git a/test/cpp/qps/server_callback.cc b/test/cpp/qps/server_callback.cc
index 07c65226872..a3f56541d93 100644
--- a/test/cpp/qps/server_callback.cc
+++ b/test/cpp/qps/server_callback.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_context.h>
 
+#include "absl/log/log.h"
 #include "src/core/util/host_port.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "test/cpp/qps/qps_server_builder.h"
diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc
index fe9f8274f52..54aaee5d245 100644
--- a/test/cpp/qps/server_sync.cc
+++ b/test/cpp/qps/server_sync.cc
@@ -16,17 +16,16 @@
 //
 //
 
-#include <atomic>
-#include <thread>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_context.h>
 
+#include <atomic>
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/util/host_port.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "test/cpp/qps/qps_server_builder.h"
diff --git a/test/cpp/qps/usage_timer.cc b/test/cpp/qps/usage_timer.cc
index 9bea4846a4f..a44527700a6 100644
--- a/test/cpp/qps/usage_timer.cc
+++ b/test/cpp/qps/usage_timer.cc
@@ -18,14 +18,13 @@
 
 #include "test/cpp/qps/usage_timer.h"
 
+#include <grpc/support/time.h>
+
 #include <fstream>
 #include <sstream>
 #include <string>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #ifdef __linux__
 #include <sys/resource.h>
diff --git a/test/cpp/qps/worker.cc b/test/cpp/qps/worker.cc
index e7aaaf70389..54f08f9a98a 100644
--- a/test/cpp/qps/worker.cc
+++ b/test/cpp/qps/worker.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/time.h>
 #include <signal.h>
 
 #include <chrono>
@@ -23,10 +25,6 @@
 #include <vector>
 
 #include "absl/flags/flag.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/time.h>
-
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/qps_worker.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/security/tls_certificate_verifier_test.cc b/test/cpp/security/tls_certificate_verifier_test.cc
index 2b370c03667..c0cfa10adfb 100644
--- a/test/cpp/security/tls_certificate_verifier_test.cc
+++ b/test/cpp/security/tls_certificate_verifier_test.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/security/tls_credentials_options.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
 #include "src/cpp/client/secure_credentials.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/server/authorization_policy_provider_test.cc b/test/cpp/server/authorization_policy_provider_test.cc
index 25784cbb6b5..573f7dec763 100644
--- a/test/cpp/server/authorization_policy_provider_test.cc
+++ b/test/cpp/server/authorization_policy_provider_test.cc
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-
 #include <grpcpp/security/authorization_policy_provider.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/cpp/server/credentials_test.cc b/test/cpp/server/credentials_test.cc
index 32f14c38752..c7d395bf252 100644
--- a/test/cpp/server/credentials_test.cc
+++ b/test/cpp/server/credentials_test.cc
@@ -14,19 +14,17 @@
 // limitations under the License.
 //
 
-#include <memory>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/security/tls_crl_provider.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tls_utils.h"
 #include "test/cpp/util/tls_test_utils.h"
diff --git a/test/cpp/server/load_reporter/get_cpu_stats_test.cc b/test/cpp/server/load_reporter/get_cpu_stats_test.cc
index 3f35adba2de..744c4e0968e 100644
--- a/test/cpp/server/load_reporter/get_cpu_stats_test.cc
+++ b/test/cpp/server/load_reporter/get_cpu_stats_test.cc
@@ -18,10 +18,9 @@
 
 #include "src/cpp/server/load_reporter/get_cpu_stats.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/server/load_reporter/load_data_store_test.cc b/test/cpp/server/load_reporter/load_data_store_test.cc
index a850de29d75..454a9b6a161 100644
--- a/test/cpp/server/load_reporter/load_data_store_test.cc
+++ b/test/cpp/server/load_reporter/load_data_store_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/cpp/server/load_reporter/load_data_store.h"
 
-#include <set>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
+#include <set>
+#include <vector>
 
 #include "src/cpp/server/load_reporter/constants.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/server/load_reporter/load_reporter_test.cc b/test/cpp/server/load_reporter/load_reporter_test.cc
index fd1d4aeef67..c04e1dbb78f 100644
--- a/test/cpp/server/load_reporter/load_reporter_test.cc
+++ b/test/cpp/server/load_reporter/load_reporter_test.cc
@@ -18,20 +18,18 @@
 
 #include "src/cpp/server/load_reporter/load_reporter.h"
 
-#include <set>
-#include <vector>
-
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <gtest/gtest.h>
 
+#include <set>
+#include <vector>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "opencensus/stats/testing/test_utils.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/cpp/server/load_reporter/constants.h"
diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc
index 73e02cedbde..c32f55082a4 100644
--- a/test/cpp/server/server_builder_test.cc
+++ b/test/cpp/server/server_builder_test.cc
@@ -16,15 +16,13 @@
 //
 //
 
-#include <sys/socket.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/grpc.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/config.h>
+#include <gtest/gtest.h>
+#include <sys/socket.h>
 
 #include "src/core/util/notification.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/server/server_builder_with_socket_mutator_test.cc b/test/cpp/server/server_builder_with_socket_mutator_test.cc
index e9e148c7793..065f8a8f163 100644
--- a/test/cpp/server/server_builder_with_socket_mutator_test.cc
+++ b/test/cpp/server/server_builder_with_socket_mutator_test.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include <memory>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/config.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/server/server_request_call_test.cc b/test/cpp/server/server_request_call_test.cc
index bf781e3e2bf..d32765308ac 100644
--- a/test/cpp/server/server_request_call_test.cc
+++ b/test/cpp/server/server_request_call_test.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/config.h>
+#include <gtest/gtest.h>
+
+#include <thread>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/test/client_context_test_peer_test.cc b/test/cpp/test/client_context_test_peer_test.cc
index ee1347cdb21..93295f53918 100644
--- a/test/cpp/test/client_context_test_peer_test.cc
+++ b/test/cpp/test/client_context_test_peer_test.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <cstring>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/test/client_context_test_peer.h>
+#include <gtest/gtest.h>
+
+#include <cstring>
+#include <vector>
 
 namespace grpc {
 namespace testing {
diff --git a/test/cpp/test/mock_stream_test.cc b/test/cpp/test/mock_stream_test.cc
index f88be58c360..4b972f31b57 100644
--- a/test/cpp/test/mock_stream_test.cc
+++ b/test/cpp/test/mock_stream_test.cc
@@ -16,12 +16,10 @@
 //
 //
 
+#include <grpcpp/test/mock_stream.h>
 #include <gtest/gtest.h>
 
 #include "absl/memory/memory.h"
-
-#include <grpcpp/test/mock_stream.h>
-
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 
 using grpc::testing::EchoRequest;
diff --git a/test/cpp/test/server_context_test_spouse_test.cc b/test/cpp/test/server_context_test_spouse_test.cc
index e778484d88a..0091f101a03 100644
--- a/test/cpp/test/server_context_test_spouse_test.cc
+++ b/test/cpp/test/server_context_test_spouse_test.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <cstring>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/test/server_context_test_spouse.h>
+#include <gtest/gtest.h>
+
+#include <cstring>
+#include <vector>
 
 namespace grpc {
 namespace testing {
diff --git a/test/cpp/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc
index 751ab3977c6..95a392436b6 100644
--- a/test/cpp/thread_manager/thread_manager_test.cc
+++ b/test/cpp/thread_manager/thread_manager_test.cc
@@ -18,19 +18,17 @@
 
 #include "src/cpp/thread_manager/thread_manager.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/grpcpp.h>
+#include <gtest/gtest.h>
+
 #include <atomic>
 #include <chrono>
 #include <climits>
 #include <memory>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/byte_buffer_proto_helper.h b/test/cpp/util/byte_buffer_proto_helper.h
index ecc0085039a..d70167083c9 100644
--- a/test/cpp/util/byte_buffer_proto_helper.h
+++ b/test/cpp/util/byte_buffer_proto_helper.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CPP_UTIL_BYTE_BUFFER_PROTO_HELPER_H
 #define GRPC_TEST_CPP_UTIL_BYTE_BUFFER_PROTO_HELPER_H
 
-#include <memory>
-
 #include <grpcpp/impl/codegen/config_protobuf.h>
 #include <grpcpp/support/byte_buffer.h>
 
+#include <memory>
+
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/util/byte_buffer_test.cc b/test/cpp/util/byte_buffer_test.cc
index be9a4a75fc3..1dfc17169d7 100644
--- a/test/cpp/util/byte_buffer_test.cc
+++ b/test/cpp/util/byte_buffer_test.cc
@@ -16,16 +16,15 @@
 //
 //
 
-#include <cstring>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpc++/support/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/slice.h>
+#include <gtest/gtest.h>
+
+#include <cstring>
+#include <vector>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/channel_trace_proto_helper.cc b/test/cpp/util/channel_trace_proto_helper.cc
index 0c11284c81a..0566a6cf566 100644
--- a/test/cpp/util/channel_trace_proto_helper.cc
+++ b/test/cpp/util/channel_trace_proto_helper.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/util/channel_trace_proto_helper.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>
 #include <grpcpp/support/config.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/util/channelz_sampler.cc b/test/cpp/util/channelz_sampler.cc
index 043625afa4d..6344dbd272c 100644
--- a/test/cpp/util/channelz_sampler.cc
+++ b/test/cpp/util/channelz_sampler.cc
@@ -15,6 +15,18 @@
 // limitations under the License.
 //
 //
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/ext/channelz_service_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
 #include <unistd.h>
 
 #include <cstdlib>
@@ -32,20 +44,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "google/protobuf/text_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/ext/channelz_service_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_writer.h"
 #include "src/cpp/server/channelz/channelz_service.h"
diff --git a/test/cpp/util/channelz_sampler_test.cc b/test/cpp/util/channelz_sampler_test.cc
index 5c5f1118d60..eb480e5e143 100644
--- a/test/cpp/util/channelz_sampler_test.cc
+++ b/test/cpp/util/channelz_sampler_test.cc
@@ -15,20 +15,6 @@
 // limitations under the License.
 //
 //
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <cstdlib>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <thread>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
@@ -42,7 +28,19 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <stdlib.h>
+#include <unistd.h>
 
+#include <cstdlib>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
 #include "src/core/util/env.h"
 #include "src/cpp/server/channelz/channelz_service.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
diff --git a/test/cpp/util/cli_call.cc b/test/cpp/util/cli_call.cc
index 9f7df96bf8e..367669fecf1 100644
--- a/test/cpp/util/cli_call.cc
+++ b/test/cpp/util/cli_call.cc
@@ -18,18 +18,17 @@
 
 #include "test/cpp/util/cli_call.h"
 
-#include <cmath>
-#include <iostream>
-#include <utility>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/support/byte_buffer.h>
 
+#include <cmath>
+#include <iostream>
+#include <utility>
+
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 
 namespace grpc {
diff --git a/test/cpp/util/cli_call.h b/test/cpp/util/cli_call.h
index f2a43f9d789..bb13e5e809c 100644
--- a/test/cpp/util/cli_call.h
+++ b/test/cpp/util/cli_call.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_TEST_CPP_UTIL_CLI_CALL_H
 #define GRPC_TEST_CPP_UTIL_CLI_CALL_H
 
-#include <map>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/generic/generic_stub.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <map>
+
 namespace grpc {
 
 class ClientContext;
diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc
index 8e313aacd28..9a827d78ce7 100644
--- a/test/cpp/util/cli_call_test.cc
+++ b/test/cpp/util/cli_call_test.cc
@@ -18,8 +18,6 @@
 
 #include "test/cpp/util/cli_call.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -27,6 +25,7 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/util/cli_credentials.cc b/test/cpp/util/cli_credentials.cc
index 61e90282ae0..f3df7eb4da1 100644
--- a/test/cpp/util/cli_credentials.cc
+++ b/test/cpp/util/cli_credentials.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/util/cli_credentials.h"
 
-#include "absl/flags/flag.h"
-#include "absl/log/log.h"
-
 #include <grpc/slice.h>
 #include <grpcpp/support/slice.h>
 
+#include "absl/flags/flag.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/load_file.h"
 
diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc
index 73d92b20ae4..38828ec698a 100644
--- a/test/cpp/util/create_test_channel.cc
+++ b/test/cpp/util/create_test_channel.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/util/create_test_channel.h"
 
-#include "absl/flags/flag.h"
-#include "absl/log/check.h"
-
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>
 
+#include "absl/flags/flag.h"
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 #include "test/cpp/util/test_credentials_provider.h"
 
diff --git a/test/cpp/util/create_test_channel.h b/test/cpp/util/create_test_channel.h
index 1ed9c44e491..04ea33e4607 100644
--- a/test/cpp/util/create_test_channel.h
+++ b/test/cpp/util/create_test_channel.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_UTIL_CREATE_TEST_CHANNEL_H
 #define GRPC_TEST_CPP_UTIL_CREATE_TEST_CHANNEL_H
 
-#include <memory>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
 
+#include <memory>
+
 namespace grpc {
 class Channel;
 
diff --git a/test/cpp/util/error_details_test.cc b/test/cpp/util/error_details_test.cc
index 271360d66c4..0fa2ac122ce 100644
--- a/test/cpp/util/error_details_test.cc
+++ b/test/cpp/util/error_details_test.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpcpp/support/error_details.h>
+#include <gtest/gtest.h>
 
 #include "src/proto/grpc/status/status.pb.h"
 #include "src/proto/grpc/testing/echo_messages.pb.h"
diff --git a/test/cpp/util/grpc_cli.cc b/test/cpp/util/grpc_cli.cc
index 48d07b37c79..9790d5ec003 100644
--- a/test/cpp/util/grpc_cli.cc
+++ b/test/cpp/util/grpc_cli.cc
@@ -61,14 +61,13 @@
 //      address of the connection that each RPC is made on to stderr.
 //
 
+#include <grpcpp/support/config.h>
+
 #include <fstream>
 #include <functional>
 #include <iostream>
 
 #include "absl/flags/flag.h"
-
-#include <grpcpp/support/config.h>
-
 #include "test/cpp/util/cli_credentials.h"
 #include "test/cpp/util/grpc_tool.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/util/grpc_tool.cc b/test/cpp/util/grpc_tool.cc
index 8f171274bb4..9040de69a9b 100644
--- a/test/cpp/util/grpc_tool.cc
+++ b/test/cpp/util/grpc_tool.cc
@@ -18,6 +18,14 @@
 
 #include "test/cpp/util/grpc_tool.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <cstdio>
 #include <fstream>
 #include <iostream>
@@ -31,15 +39,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/string_ref.h>
-
 #include "test/cpp/util/cli_call.h"
 #include "test/cpp/util/proto_file_parser.h"
 #include "test/cpp/util/proto_reflection_descriptor_database.h"
diff --git a/test/cpp/util/grpc_tool.h b/test/cpp/util/grpc_tool.h
index 471830f2fcb..defd8d04516 100644
--- a/test/cpp/util/grpc_tool.h
+++ b/test/cpp/util/grpc_tool.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CPP_UTIL_GRPC_TOOL_H
 #define GRPC_TEST_CPP_UTIL_GRPC_TOOL_H
 
-#include <functional>
-
 #include <grpcpp/support/config.h>
 
+#include <functional>
+
 #include "test/cpp/util/cli_credentials.h"
 
 namespace grpc {
diff --git a/test/cpp/util/grpc_tool_test.cc b/test/cpp/util/grpc_tool_test.cc
index 6d3b6d528da..294df983daf 100644
--- a/test/cpp/util/grpc_tool_test.cc
+++ b/test/cpp/util/grpc_tool_test.cc
@@ -18,16 +18,7 @@
 
 #include "test/cpp/util/grpc_tool.h"
 
-#include <chrono>
-#include <sstream>
-
 #include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-
-#include "absl/flags/declare.h"
-#include "absl/flags/flag.h"
-#include "absl/strings/str_split.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/channel.h>
@@ -37,7 +28,14 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <chrono>
+#include <sstream>
 
+#include "absl/flags/declare.h"
+#include "absl/flags/flag.h"
+#include "absl/strings/str_split.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.pb.h"
diff --git a/test/cpp/util/metrics_server.cc b/test/cpp/util/metrics_server.cc
index 28dc7e670be..fd149fa76b6 100644
--- a/test/cpp/util/metrics_server.cc
+++ b/test/cpp/util/metrics_server.cc
@@ -18,11 +18,10 @@
 
 #include "test/cpp/util/metrics_server.h"
 
-#include "absl/log/log.h"
-
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/metrics.grpc.pb.h"
 #include "src/proto/grpc/testing/metrics.pb.h"
diff --git a/test/cpp/util/metrics_server.h b/test/cpp/util/metrics_server.h
index 846b542db32..fae7bdf06b5 100644
--- a/test/cpp/util/metrics_server.h
+++ b/test/cpp/util/metrics_server.h
@@ -18,11 +18,11 @@
 #ifndef GRPC_TEST_CPP_UTIL_METRICS_SERVER_H
 #define GRPC_TEST_CPP_UTIL_METRICS_SERVER_H
 
+#include <grpcpp/server.h>
+
 #include <map>
 #include <mutex>
 
-#include <grpcpp/server.h>
-
 #include "src/proto/grpc/testing/metrics.grpc.pb.h"
 #include "src/proto/grpc/testing/metrics.pb.h"
 
diff --git a/test/cpp/util/proto_buffer_reader_test.cc b/test/cpp/util/proto_buffer_reader_test.cc
index 46137658f97..b4ffbff3e5a 100644
--- a/test/cpp/util/proto_buffer_reader_test.cc
+++ b/test/cpp/util/proto_buffer_reader_test.cc
@@ -14,10 +14,9 @@
 // limitations under the License.
 //
 
-#include <gtest/gtest.h>
-
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/proto_buffer_reader.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/proto_buffer_writer_test.cc b/test/cpp/util/proto_buffer_writer_test.cc
index 77057b5fc33..3de8f6fde0e 100644
--- a/test/cpp/util/proto_buffer_writer_test.cc
+++ b/test/cpp/util/proto_buffer_writer_test.cc
@@ -14,10 +14,9 @@
 // limitations under the License.
 //
 
-#include <gtest/gtest.h>
-
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/proto_buffer_writer.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/proto_file_parser.cc b/test/cpp/util/proto_file_parser.cc
index 5e570c57372..0613fd53751 100644
--- a/test/cpp/util/proto_file_parser.cc
+++ b/test/cpp/util/proto_file_parser.cc
@@ -18,6 +18,8 @@
 
 #include "test/cpp/util/proto_file_parser.h"
 
+#include <grpcpp/support/config.h>
+
 #include <algorithm>
 #include <iostream>
 #include <sstream>
@@ -26,8 +28,6 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/str_split.h"
 
-#include <grpcpp/support/config.h>
-
 namespace grpc {
 namespace testing {
 namespace {
diff --git a/test/cpp/util/proto_file_parser.h b/test/cpp/util/proto_file_parser.h
index a397aa43eeb..84b43717ac8 100644
--- a/test/cpp/util/proto_file_parser.h
+++ b/test/cpp/util/proto_file_parser.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CPP_UTIL_PROTO_FILE_PARSER_H
 #define GRPC_TEST_CPP_UTIL_PROTO_FILE_PARSER_H
 
-#include <memory>
-
 #include <grpcpp/channel.h>
 
+#include <memory>
+
 #include "test/cpp/util/config_grpc_cli.h"
 #include "test/cpp/util/proto_reflection_descriptor_database.h"
 
diff --git a/test/cpp/util/proto_reflection_descriptor_database.cc b/test/cpp/util/proto_reflection_descriptor_database.cc
index ac0113fd509..6025a502c42 100644
--- a/test/cpp/util/proto_reflection_descriptor_database.cc
+++ b/test/cpp/util/proto_reflection_descriptor_database.cc
@@ -21,7 +21,6 @@
 #include <vector>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 
 using grpc::reflection::v1alpha::ErrorResponse;
diff --git a/test/cpp/util/proto_reflection_descriptor_database.h b/test/cpp/util/proto_reflection_descriptor_database.h
index 2489860be66..a8a9b497246 100644
--- a/test/cpp/util/proto_reflection_descriptor_database.h
+++ b/test/cpp/util/proto_reflection_descriptor_database.h
@@ -18,14 +18,14 @@
 #ifndef GRPC_TEST_CPP_UTIL_PROTO_REFLECTION_DESCRIPTOR_DATABASE_H
 #define GRPC_TEST_CPP_UTIL_PROTO_REFLECTION_DESCRIPTOR_DATABASE_H
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/impl/codegen/config_protobuf.h>
+
 #include <mutex>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/impl/codegen/config_protobuf.h>
-
 #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h"
 
 namespace grpc {
diff --git a/test/cpp/util/slice_test.cc b/test/cpp/util/slice_test.cc
index e8d2f3b04e2..1689f2f1cd7 100644
--- a/test/cpp/util/slice_test.cc
+++ b/test/cpp/util/slice_test.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc++/support/slice.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpcpp/impl/grpc_library.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/string_ref_test.cc b/test/cpp/util/string_ref_test.cc
index 6af0e73c632..eddaef5abad 100644
--- a/test/cpp/util/string_ref_test.cc
+++ b/test/cpp/util/string_ref_test.cc
@@ -16,11 +16,9 @@
 //
 //
 
-#include <string.h>
-
-#include <gtest/gtest.h>
-
 #include <grpcpp/support/string_ref.h>
+#include <gtest/gtest.h>
+#include <string.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/test_config_cc.cc b/test/cpp/util/test_config_cc.cc
index cf32dbc0eae..c1eea1502ef 100644
--- a/test/cpp/util/test_config_cc.cc
+++ b/test/cpp/util/test_config_cc.cc
@@ -19,7 +19,6 @@
 #include <vector>
 
 #include "absl/flags/parse.h"
-
 #include "test/cpp/util/test_config.h"
 
 namespace grpc {
diff --git a/test/cpp/util/test_credentials_provider.cc b/test/cpp/util/test_credentials_provider.cc
index b4d3e116cd3..748d1398a96 100644
--- a/test/cpp/util/test_credentials_provider.cc
+++ b/test/cpp/util/test_credentials_provider.cc
@@ -19,6 +19,9 @@
 
 #include "test/cpp/util/test_credentials_provider.h"
 
+#include <grpc/support/sync.h>
+#include <grpcpp/security/server_credentials.h>
+
 #include <cstdio>
 #include <fstream>
 #include <iostream>
@@ -28,10 +31,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/sync.h>
-#include <grpcpp/security/server_credentials.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/end2end/data/ssl_test_data.h"
 
diff --git a/test/cpp/util/test_credentials_provider.h b/test/cpp/util/test_credentials_provider.h
index 40f90703237..91fbad33918 100644
--- a/test/cpp/util/test_credentials_provider.h
+++ b/test/cpp/util/test_credentials_provider.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CPP_UTIL_TEST_CREDENTIALS_PROVIDER_H
 #define GRPC_TEST_CPP_UTIL_TEST_CREDENTIALS_PROVIDER_H
 
-#include <memory>
-
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/util/time_test.cc b/test/cpp/util/time_test.cc
index 11b141cc70f..01038486f53 100644
--- a/test/cpp/util/time_test.cc
+++ b/test/cpp/util/time_test.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/support/time.h>
 #include <grpcpp/support/time.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/tls_test_utils.h b/test/cpp/util/tls_test_utils.h
index 9b4e69bcd80..52b9cf1e25c 100644
--- a/test/cpp/util/tls_test_utils.h
+++ b/test/cpp/util/tls_test_utils.h
@@ -17,12 +17,12 @@
 #ifndef GRPC_TEST_CPP_UTIL_TLS_TEST_UTILS_H
 #define GRPC_TEST_CPP_UTIL_TLS_TEST_UTILS_H
 
-#include <deque>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <deque>
+
 #include "src/core/util/thd.h"
 
 namespace grpc {
diff --git a/test/cpp/util/windows/manifest_file.cc b/test/cpp/util/windows/manifest_file.cc
index 85ac3d7eb37..d983f74bcc3 100644
--- a/test/cpp/util/windows/manifest_file.cc
+++ b/test/cpp/util/windows/manifest_file.cc
@@ -28,7 +28,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc {
diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/main.cc b/tools/distrib/python/grpcio_tools/grpc_tools/main.cc
index 866b1e2866b..6ccdafaae29 100644
--- a/tools/distrib/python/grpcio_tools/grpc_tools/main.cc
+++ b/tools/distrib/python/grpcio_tools/grpc_tools/main.cc
@@ -14,13 +14,6 @@
 
 #include "grpc_tools/main.h"
 
-#include <algorithm>
-#include <map>
-#include <string>
-#include <tuple>
-#include <unordered_set>
-#include <vector>
-
 #include <google/protobuf/compiler/code_generator.h>
 #include <google/protobuf/compiler/command_line_interface.h>
 #include <google/protobuf/compiler/importer.h>
@@ -29,8 +22,14 @@
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/io/zero_copy_stream_impl_lite.h>
 
-#include "absl/strings/string_view.h"
+#include <algorithm>
+#include <map>
+#include <string>
+#include <tuple>
+#include <unordered_set>
+#include <vector>
 
+#include "absl/strings/string_view.h"
 #include "src/compiler/python_generator.h"
 
 using ::google::protobuf::FileDescriptor;