[clang-format] Remove custom clang-format rules for include ordering (#37820)

Closes #37820 PiperOrigin-RevId: 682352913
2 months ago · dbb5164ac7
parent 41dc97e1d6
commit dbb5164ac7
2150 changed files with 5746 additions and 9439 deletions
--- 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
--- 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) {
--- 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 {
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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");
--- 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");
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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"
--- 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;
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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;
--- 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;
--- 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;
--- 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;
--- 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
--- 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
--- 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
--- a/include/grpc++/impl/.clang-format
+++ b/include/grpc++/impl/.clang-format
@ -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
-...
--- a/include/grpc/.clang-format
+++ b/include/grpc/.clang-format
@ -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
-...
--- 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" {
--- 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" {
--- 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 {

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

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

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

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

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

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

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

--- 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" {
--- 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" {
--- 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,
--- 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" {
--- 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;

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

--- 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
--- a/Show More
+++ b/Show More