diff --git a/BUILD.gn b/BUILD.gn
index 1417f1db5ea..7bec321153f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1003,6 +1003,7 @@ config("grpc_config") {
         "include/grpcpp/alarm.h",
         "include/grpcpp/alarm_impl.h",
         "include/grpcpp/channel.h",
+        "include/grpcpp/channel_impl.h",
         "include/grpcpp/client_context.h",
         "include/grpcpp/completion_queue.h",
         "include/grpcpp/create_channel.h",
diff --git a/include/grpcpp/impl/codegen/completion_queue.h b/include/grpcpp/impl/codegen/completion_queue.h
index c64d581d71d..77753bb37f0 100644
--- a/include/grpcpp/impl/codegen/completion_queue.h
+++ b/include/grpcpp/impl/codegen/completion_queue.h
@@ -45,7 +45,7 @@ namespace grpc_impl {
 
 class Channel;
 class ServerBuilder;
-} // namespace grpc_impl
+}  // namespace grpc_impl
 namespace grpc {
 
 template <class R>
diff --git a/include/grpcpp/impl/codegen/server_interface.h b/include/grpcpp/impl/codegen/server_interface.h
index 78814aa9862..9299fdb20e1 100644
--- a/include/grpcpp/impl/codegen/server_interface.h
+++ b/include/grpcpp/impl/codegen/server_interface.h
@@ -31,7 +31,7 @@
 namespace grpc_impl {
 class Channel;
 class ServerCredentials;
-} // namespace grpc_impl
+}  // namespace grpc_impl
 namespace grpc {
 
 class AsyncGenericService;
diff --git a/include/grpcpp/security/credentials.h b/include/grpcpp/security/credentials.h
index 7b1efddfc08..5846da106d5 100644
--- a/include/grpcpp/security/credentials.h
+++ b/include/grpcpp/security/credentials.h
@@ -35,7 +35,7 @@ struct grpc_call;
 namespace grpc_impl {
 
 class Channel;
-} // namespace grpc_impl
+}  // namespace grpc_impl
 namespace grpc {
 
 class CallCredentials;