diff --git a/include/grpcpp/impl/.clang-format b/include/grpcpp/impl/.clang-format
index 64387e9e515..5f150ef6edb 100644
--- a/include/grpcpp/impl/.clang-format
+++ b/include/grpcpp/impl/.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
diff --git a/include/grpcpp/impl/status.h b/include/grpcpp/impl/status.h
index a068f9b0af2..94c0e80a9b6 100644
--- a/include/grpcpp/impl/status.h
+++ b/include/grpcpp/impl/status.h
@@ -21,9 +21,8 @@
 
 // IWYU pragma: private, include <grpcpp/support/status.h>
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/status_code_enum.h>