diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ccc323af09..83cf1e7cf4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4794,6 +4794,7 @@ foreach(_hdr
   include/grpcpp/impl/completion_queue_tag.h
   include/grpcpp/impl/create_auth_context.h
   include/grpcpp/impl/delegating_channel.h
+  include/grpcpp/impl/generic_serialize.h
   include/grpcpp/impl/generic_stub_internal.h
   include/grpcpp/impl/grpc_library.h
   include/grpcpp/impl/intercepted_channel.h
@@ -5540,6 +5541,7 @@ foreach(_hdr
   include/grpcpp/impl/completion_queue_tag.h
   include/grpcpp/impl/create_auth_context.h
   include/grpcpp/impl/delegating_channel.h
+  include/grpcpp/impl/generic_serialize.h
   include/grpcpp/impl/generic_stub_internal.h
   include/grpcpp/impl/grpc_library.h
   include/grpcpp/impl/intercepted_channel.h
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 36f819655f9..ff9efc37eb8 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -3850,6 +3850,7 @@ libs:
   - include/grpcpp/impl/completion_queue_tag.h
   - include/grpcpp/impl/create_auth_context.h
   - include/grpcpp/impl/delegating_channel.h
+  - include/grpcpp/impl/generic_serialize.h
   - include/grpcpp/impl/generic_stub_internal.h
   - include/grpcpp/impl/grpc_library.h
   - include/grpcpp/impl/intercepted_channel.h
@@ -4245,6 +4246,7 @@ libs:
   - include/grpcpp/impl/completion_queue_tag.h
   - include/grpcpp/impl/create_auth_context.h
   - include/grpcpp/impl/delegating_channel.h
+  - include/grpcpp/impl/generic_serialize.h
   - include/grpcpp/impl/generic_stub_internal.h
   - include/grpcpp/impl/grpc_library.h
   - include/grpcpp/impl/intercepted_channel.h
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 671a9cf30ba..2365d2e89ed 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -161,6 +161,7 @@ Pod::Spec.new do |s|
                       'include/grpcpp/impl/completion_queue_tag.h',
                       'include/grpcpp/impl/create_auth_context.h',
                       'include/grpcpp/impl/delegating_channel.h',
+                      'include/grpcpp/impl/generic_serialize.h',
                       'include/grpcpp/impl/generic_stub_internal.h',
                       'include/grpcpp/impl/grpc_library.h',
                       'include/grpcpp/impl/intercepted_channel.h',
diff --git a/include/grpcpp/impl/codegen/config_protobuf.h b/include/grpcpp/impl/codegen/config_protobuf.h
index 508fccedb71..ddf56aafdcf 100644
--- a/include/grpcpp/impl/codegen/config_protobuf.h
+++ b/include/grpcpp/impl/codegen/config_protobuf.h
@@ -59,22 +59,26 @@
 #ifndef GRPC_CUSTOM_DESCRIPTORDATABASE
 #include <google/protobuf/descriptor_database.h>
 #define GRPC_CUSTOM_DESCRIPTORDATABASE ::google::protobuf::DescriptorDatabase
-#define GRPC_CUSTOM_SIMPLEDESCRIPTORDATABASE ::google::protobuf::SimpleDescriptorDatabase
+#define GRPC_CUSTOM_SIMPLEDESCRIPTORDATABASE \
+  ::google::protobuf::SimpleDescriptorDatabase
 #endif
 
 #ifndef GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/io/zero_copy_stream.h>
-#define GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM ::google::protobuf::io::ZeroCopyOutputStream
-#define GRPC_CUSTOM_ZEROCOPYINPUTSTREAM ::google::protobuf::io::ZeroCopyInputStream
+#define GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM \
+  ::google::protobuf::io::ZeroCopyOutputStream
+#define GRPC_CUSTOM_ZEROCOPYINPUTSTREAM \
+  ::google::protobuf::io::ZeroCopyInputStream
 #define GRPC_CUSTOM_CODEDINPUTSTREAM ::google::protobuf::io::CodedInputStream
 #define GRPC_CUSTOM_CODEDOUTPUTSTREAM ::google::protobuf::io::CodedOutputStream
 #endif
 
 #ifndef GRPC_CUSTOM_JSONUTIL
-#include "absl/status/status.h"
 #include <google/protobuf/util/json_util.h>
 #include <google/protobuf/util/type_resolver_util.h>
+
+#include "absl/status/status.h"
 #define GRPC_CUSTOM_JSONUTIL ::google::protobuf::util
 #define GRPC_CUSTOM_UTIL_STATUS ::absl::Status
 #endif
diff --git a/include/grpcpp/impl/generic_serialize.h b/include/grpcpp/impl/generic_serialize.h
index 303bca39ebf..191b6465041 100644
--- a/include/grpcpp/impl/generic_serialize.h
+++ b/include/grpcpp/impl/generic_serialize.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPCPP_IMPL_PROTO_UTILS_H
-#define GRPCPP_IMPL_PROTO_UTILS_H
+#ifndef GRPCPP_IMPL_GENERIC_SERIALIZE_H
+#define GRPCPP_IMPL_GENERIC_SERIALIZE_H
 
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/impl/grpc_types.h>
@@ -90,4 +90,4 @@ Status GenericDeserialize(ByteBuffer* buffer,
 
 }  // namespace grpc
 
-#endif  // GRPCPP_IMPL_PROTO_UTILS_H
+#endif  // GRPCPP_IMPL_GENERIC_SERIALIZE_H
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index f0dc270e58c..a10b5eab8c0 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -1028,6 +1028,7 @@ include/grpcpp/impl/codegen/time.h \
 include/grpcpp/impl/completion_queue_tag.h \
 include/grpcpp/impl/create_auth_context.h \
 include/grpcpp/impl/delegating_channel.h \
+include/grpcpp/impl/generic_serialize.h \
 include/grpcpp/impl/generic_stub_internal.h \
 include/grpcpp/impl/grpc_library.h \
 include/grpcpp/impl/intercepted_channel.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index b611cc7877a..87c21198fa7 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1028,6 +1028,7 @@ include/grpcpp/impl/codegen/time.h \
 include/grpcpp/impl/completion_queue_tag.h \
 include/grpcpp/impl/create_auth_context.h \
 include/grpcpp/impl/delegating_channel.h \
+include/grpcpp/impl/generic_serialize.h \
 include/grpcpp/impl/generic_stub_internal.h \
 include/grpcpp/impl/grpc_library.h \
 include/grpcpp/impl/intercepted_channel.h \