Update src/core/.clang-format

src/core/.clang-format

@@ -5,9 +5,6 @@ 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

src/core/lib/address_utils/parse_address.cc

@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
 
 #ifdef GRPC_HAVE_VSOCK

src/core/lib/address_utils/parse_address.h

@@ -19,13 +19,13 @@
 #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/lib/uri/uri_parser.h"

src/core/lib/address_utils/sockaddr_utils.cc

@@ -16,12 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 
 #include <errno.h>
 #include <inttypes.h>
+
+#include <grpc/support/port_platform.h>
 #ifdef GRPC_HAVE_VSOCK
 #include <linux/vm_sockets.h>
 #endif

src/core/lib/address_utils/sockaddr_utils.h

@@ -19,14 +19,14 @@
 #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

src/core/lib/avl/avl.h

@@ -15,14 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_AVL_AVL_H
 #define GRPC_SRC_CORE_LIB_AVL_AVL_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdlib.h>
 
 #include <algorithm>  // IWYU pragma: keep
 #include <iterator>
 #include <utility>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"

src/core/lib/backoff/backoff.cc

@@ -16,12 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/backoff/backoff.h"
 
 #include <algorithm>
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 BackOff::BackOff(const Options& options) : options_(options) { Reset(); }

src/core/lib/backoff/backoff.h

@@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H
 #define GRPC_SRC_CORE_LIB_BACKOFF_BACKOFF_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/random/random.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/time.h"
 
 namespace grpc_core {

src/core/lib/backoff/random_early_detection.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 "src/core/lib/backoff/random_early_detection.h"
 
 #include "absl/random/distributions.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 bool RandomEarlyDetection::Reject(uint64_t size, absl::BitGenRef bitsrc) const {

src/core/lib/backoff/random_early_detection.h

@@ -15,14 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H
 #define GRPC_SRC_CORE_LIB_BACKOFF_RANDOM_EARLY_DETECTION_H
 
-#include <grpc/support/port_platform.h>
-
 #include <limits.h>
 
 #include <cstdint>
 
 #include "absl/random/bit_gen_ref.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 // Implements the random early detection algorithm - allows items to be rejected

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 <grpc/support/port_platform.h>
-
 #include <utility>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/call_final_info.h"

src/core/lib/channel/call_tracer.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/call_tracer.h"
 
 #include <memory>
@@ -25,6 +23,7 @@
 #include <vector>
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/tcp_tracer.h"
 #include "src/core/lib/promise/context.h"

src/core/lib/channel/call_tracer.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CALL_TRACER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 #include <string>
 
@@ -28,6 +26,7 @@
 #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"

src/core/lib/channel/channel_args.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 
 #include <limits.h>
@@ -38,6 +36,7 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/gpr/useful.h"

src/core/lib/channel/channel_args.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -37,6 +35,7 @@
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/avl/avl.h"
 #include "src/core/lib/gpr/useful.h"

src/core/lib/channel/channel_args_preconditioning.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 "src/core/lib/channel/channel_args_preconditioning.h"
 
 #include <utility>
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 void ChannelArgsPreconditioning::Builder::RegisterStage(Stage stage) {

src/core/lib/channel/channel_args_preconditioning.h

@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
 
-#include <grpc/support/port_platform.h>
-
 #include <functional>
 #include <vector>
 
 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
 

src/core/lib/channel/channel_stack.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 
 #include <stdint.h>
@@ -26,6 +24,7 @@
 #include <utility>
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"

src/core/lib/channel/channel_stack.h

@@ -44,8 +44,6 @@
 // it can have an effect on the call status.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <functional>
@@ -56,6 +54,7 @@
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/channel/channel_args.h"

src/core/lib/channel/channel_stack_builder.cc

@@ -16,12 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack_builder.h"
 
 #include <algorithm>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_core {

src/core/lib/channel/channel_stack_builder.h

@@ -15,14 +15,14 @@
 #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/gprpp/ref_counted_ptr.h"

src/core/lib/channel/channel_stack_builder_impl.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 
 #include <string.h>
@@ -36,6 +34,7 @@
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"

src/core/lib/channel/channel_stack_builder_impl.h

@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/status/statusor.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/lib/gprpp/ref_counted_ptr.h"

src/core/lib/channel/channel_stack_trace.cc

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack_trace.h"
 
+#include <grpc/support/port_platform.h>
+
 grpc_core::TraceFlag grpc_trace_channel_stack(false, "channel_stack");

src/core/lib/channel/channel_trace.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_trace.h"
 
 #include <memory>
@@ -27,6 +25,7 @@
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channelz.h"
 #include "src/core/lib/gpr/string.h"

src/core/lib/channel/channel_trace.h

@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 

src/core/lib/channel/channelz.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channelz.h"
 
 #include <algorithm>
@@ -31,6 +29,7 @@
 
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/address_utils/parse_address.h"

src/core/lib/channel/channelz.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <atomic>
@@ -36,6 +34,7 @@
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_trace.h"
 #include "src/core/lib/gpr/time_precise.h"

src/core/lib/channel/channelz_registry.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channelz_registry.h"
 
 #include <algorithm>
@@ -29,6 +27,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/channel/channelz.h"

src/core/lib/channel/channelz_registry.h

@@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNELZ_REGISTRY_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_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/lib/channel/channelz.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"

src/core/lib/channel/connected_channel.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/connected_channel.h"
 
 #include <inttypes.h>
@@ -36,6 +34,7 @@
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"

src/core/lib/channel/metrics.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 "src/core/lib/channel/metrics.h"
 
 #include <memory>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/crash.h"
 
 namespace grpc_core {

src/core/lib/channel/metrics.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_METRICS_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_METRICS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <cstdint>
 #include <memory>
 #include <vector>
@@ -29,6 +27,7 @@
 
 #include <grpc/support/log.h>
 #include <grpc/support/metrics.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/call_tracer.h"
 #include "src/core/lib/channel/channel_args.h"

src/core/lib/channel/promise_based_filter.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/promise_based_filter.h"
 
 #include <algorithm>
@@ -30,6 +28,7 @@
 #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"

src/core/lib/channel/promise_based_filter.h

@@ -19,8 +19,6 @@
 // promise-style. Most of this will be removed once the promises conversion is
 // completed.
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -41,6 +39,7 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"

src/core/lib/channel/server_call_tracer_filter.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/server_call_tracer_filter.h"
 
 #include <functional>
@@ -24,6 +22,8 @@
 #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/call_tracer.h"
 #include "src/core/lib/channel/channel_args.h"

src/core/lib/channel/status_util.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/status_util.h"
 
 #include <string.h>
@@ -27,6 +25,8 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gpr/useful.h"
 
 struct status_string_entry {

src/core/lib/channel/status_util.h

@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_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.

src/core/lib/channel/tcp_tracer.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_TCP_TRACER_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_TCP_TRACER_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -29,6 +27,8 @@
 #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.

src/core/lib/compression/compression.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 #include <string.h>
 
@@ -26,6 +24,7 @@
 #include <grpc/compression.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/debug/trace.h"

src/core/lib/compression/compression_internal.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/compression/compression_internal.h"
 
 #include <stdlib.h>
@@ -31,6 +29,7 @@
 
 #include <grpc/compression.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"

src/core/lib/compression/compression_internal.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <initializer_list>
@@ -29,6 +27,7 @@
 #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/gprpp/bitset.h"

src/core/lib/compression/message_compress.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/compression/message_compress.h"
 
 #include <string.h>
@@ -28,6 +26,7 @@
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/slice/slice.h"
 

src/core/lib/compression/message_compress.h

@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_COMPRESSION_MESSAGE_COMPRESS_H
 #define GRPC_SRC_CORE_LIB_COMPRESSION_MESSAGE_COMPRESS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/impl/compression_types.h>
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 
 // compress 'input' to 'output' using 'algorithm'.
 // On success, appends compressed slices to output and returns 1.

src/core/lib/config/config_vars.cc

@@ -16,13 +16,13 @@
 // Automatically generated by tools/codegen/core/gen_config_vars.py
 //
 
-#include <grpc/support/port_platform.h>
-
 #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 "src/core/lib/config/load_config.h"
 
 #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING

src/core/lib/config/config_vars.h

@@ -19,8 +19,6 @@
 #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>
@@ -29,6 +27,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 class GPR_DLL ConfigVars {

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 {

src/core/lib/config/core_configuration.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/core_configuration.h"
 
 #include <atomic>
@@ -21,6 +19,7 @@
 #include <vector>
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_core {
 

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 <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/handshaker/proxy_mapper_registry.h"

src/core/lib/config/load_config.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/load_config.h"
 
 #include <stdio.h>
@@ -23,6 +21,8 @@
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gpr/log_internal.h"
 #include "src/core/lib/gprpp/env.h"
 

src/core/lib/config/load_config.h

@@ -15,8 +15,6 @@
 #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>
@@ -26,6 +24,8 @@
 #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,

src/core/lib/debug/event_log.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/event_log.h"
 
 #include <algorithm>
@@ -23,6 +21,7 @@
 #include "absl/strings/str_join.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_core {
 

src/core/lib/debug/event_log.h

@@ -15,8 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H
 #define GRPC_SRC_CORE_LIB_DEBUG_EVENT_LOG_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <atomic>
@@ -27,6 +25,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/per_cpu.h"
 #include "src/core/lib/gprpp/sync.h"

src/core/lib/debug/histogram_view.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/lib/debug/histogram_view.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 double HistogramView::Count() const {

src/core/lib/debug/histogram_view.h

@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_DEBUG_HISTOGRAM_VIEW_H
 #define GRPC_SRC_CORE_LIB_DEBUG_HISTOGRAM_VIEW_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 struct HistogramView {

src/core/lib/debug/stats.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/stats.h"
 
 #include <stddef.h>
@@ -28,6 +26,8 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 namespace stats_detail {

src/core/lib/debug/stats.h

@@ -19,8 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_DEBUG_STATS_H
 #define GRPC_SRC_CORE_LIB_DEBUG_STATS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <string>
@@ -29,6 +27,8 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/debug/histogram_view.h"
 #include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/gprpp/no_destruct.h"

src/core/lib/debug/stats_data.cc

@@ -14,12 +14,12 @@
 
 // Automatically generated by tools/codegen/core/gen_stats_data.py
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/stats_data.h"
 
 #include <stdint.h>
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 namespace {
 union DblUint {

src/core/lib/debug/stats_data.h

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H
 #define GRPC_SRC_CORE_LIB_DEBUG_STATS_DATA_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <atomic>
@@ -26,6 +24,8 @@
 
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/debug/histogram_view.h"
 #include "src/core/lib/gprpp/per_cpu.h"
 

src/core/lib/debug/trace.cc

@@ -16,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 
 #include <string>
@@ -30,6 +28,7 @@
 
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/config/config_vars.h"
 

src/core/lib/debug/trace.h

@@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_DEBUG_TRACE_H
 #define GRPC_SRC_CORE_LIB_DEBUG_TRACE_H
 
-#include <grpc/support/port_platform.h>
-
 #include <atomic>
 #include <map>
 #include <string>
 
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 void grpc_tracer_init();
 void grpc_tracer_shutdown(void);
 

src/core/lib/event_engine/ares_resolver.cc

@@ -11,13 +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/support/port_platform.h>
-
 #include "src/core/lib/event_engine/ares_resolver.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>

src/core/lib/event_engine/ares_resolver.h

@@ -14,10 +14,10 @@
 #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 <grpc/support/port_platform.h>
+
 #include "src/core/lib/debug/trace.h"
 
 #if GRPC_ARES == 1

src/core/lib/event_engine/channel_args_endpoint_config.cc

@@ -11,8 +11,6 @@
 // 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 "src/core/lib/event_engine/channel_args_endpoint_config.h"
 
 #include <string>
@@ -20,6 +18,7 @@
 #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"
 

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 <grpc/support/port_platform.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 "src/core/lib/channel/channel_args.h"
 

src/core/lib/event_engine/common_closures.h

@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_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 {

src/core/lib/event_engine/default_event_engine.cc

@@ -11,8 +11,6 @@
 // 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 "src/core/lib/event_engine/default_event_engine.h"
 
 #include <atomic>
@@ -22,6 +20,7 @@
 #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"

src/core/lib/event_engine/default_event_engine.h

@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
 
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/debug_location.h"

src/core/lib/event_engine/default_event_engine_factory.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 "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>
 
 #if defined(GPR_WINDOWS)
 #include "src/core/lib/event_engine/windows/windows_engine.h"

src/core/lib/event_engine/default_event_engine_factory.h

@@ -15,11 +15,10 @@
 #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 <grpc/support/port_platform.h>
-
 #include <memory>
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_event_engine {
 namespace experimental {

src/core/lib/event_engine/event_engine.cc

@@ -11,9 +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/support/port_platform.h>
-
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_event_engine {
 namespace experimental {

src/core/lib/event_engine/event_engine_context.h

@@ -15,9 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EVENT_ENGINE_CONTEXT_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EVENT_ENGINE_CONTEXT_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/promise/context.h"
 

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 <grpc/support/port_platform.h>
-
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_event_engine {
 namespace experimental {
 

src/core/lib/event_engine/extensions/chaotic_good_extension.h

@@ -15,10 +15,10 @@
 #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 <grpc/support/port_platform.h>
-
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/resource_quota/memory_quota.h"
 
 namespace grpc_event_engine {

src/core/lib/event_engine/extensions/supports_fd.h

@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_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 {

src/core/lib/event_engine/forkable.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/lib/event_engine/forkable.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK
 #include <pthread.h>

src/core/lib/event_engine/forkable.h

@@ -14,12 +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/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/trace.h"
 

src/core/lib/event_engine/grpc_polled_fd.h

@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H
 
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #if GRPC_ARES == 1
 

src/core/lib/event_engine/handle_containers.h

@@ -14,8 +14,6 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <cstdint>
@@ -25,6 +23,7 @@
 #include "absl/hash/hash.h"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_event_engine {
 namespace experimental {

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

src/core/lib/event_engine/poller.h

@@ -14,11 +14,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/functional/function_ref.h"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_event_engine {
 namespace experimental {

src/core/lib/event_engine/posix.h

@@ -14,12 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_H
 
-#include <grpc/support/port_platform.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/extensions/can_track_errors.h"
 #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h"

src/core/lib/event_engine/query_extensions.h

@@ -14,11 +14,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H
 
-#include <grpc/support/port_platform.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 {

src/core/lib/event_engine/ref_counted_dns_resolver_interface.h

@@ -15,13 +15,12 @@
 #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 <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include "absl/strings/string_view.h"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/orphanable.h"
 

src/core/lib/event_engine/resolved_address.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 "src/core/lib/iomgr/resolved_address.h"
 
 #include <string.h>
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/event_engine/resolved_address_internal.h"
 

src/core/lib/event_engine/resolved_address_internal.h

@@ -13,9 +13,8 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_RESOLVED_ADDRESS_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_RESOLVED_ADDRESS_INTERNAL_H
-#include <grpc/support/port_platform.h>
-
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/resolved_address.h"
 

src/core/lib/event_engine/shim.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/lib/event_engine/shim.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/port.h"
 

src/core/lib/event_engine/slice.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 
 #include <stdint.h>
@@ -24,6 +22,7 @@
 #include <grpc/event_engine/slice.h>
 #include <grpc/slice.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"

src/core/lib/event_engine/slice_buffer.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 <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 "src/core/lib/slice/slice.h"
 

src/core/lib/event_engine/tcp_socket_utils.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 <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/port.h"

src/core/lib/event_engine/tcp_socket_utils.h

@@ -14,14 +14,13 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_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 {

src/core/lib/event_engine/thread_local.cc

@@ -11,10 +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 <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/thread_local.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_event_engine {
 namespace experimental {
 

src/core/lib/event_engine/thread_pool/thread_count.cc

@@ -11,8 +11,6 @@
 // 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 "src/core/lib/event_engine/thread_pool/thread_count.h"
 
 #include <inttypes.h>
@@ -25,6 +23,7 @@
 #include "absl/time/time.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/time.h"
 

src/core/lib/event_engine/thread_pool/thread_count.h

@@ -14,8 +14,6 @@
 #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/port_platform.h>
-
 #include <atomic>
 #include <cstddef>
 #include <cstdint>
@@ -26,6 +24,7 @@
 #include "absl/base/thread_annotations.h"
 
 #include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/sync.h"

src/core/lib/event_engine/thread_pool/thread_pool.h

@@ -13,8 +13,6 @@
 // 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/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <memory>
@@ -22,6 +20,7 @@
 #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"
 

src/core/lib/event_engine/thread_pool/thread_pool_factory.cc

@@ -11,12 +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 <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"

src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc

@@ -15,8 +15,6 @@
 // limitations under the License.
 //
 //
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
 
 #include <inttypes.h>
@@ -33,6 +31,7 @@
 #include "absl/types/optional.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/thd_id.h>
 
 #include "src/core/lib/backoff/backoff.h"

src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h

@@ -18,8 +18,6 @@
 #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/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -31,6 +29,7 @@
 #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/backoff/backoff.h"

src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h"
 
 #include <memory>
@@ -21,6 +19,8 @@
 #include <type_traits>
 #include <vector>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/thd.h"
 

src/core/lib/event_engine/thready_event_engine/thready_event_engine.h

@@ -15,8 +15,6 @@
 #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/support/port_platform.h>
-
 #include <memory>
 #include <utility>
 
@@ -28,6 +26,7 @@
 #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 {