diff --git a/cpp/helloworld/greeter_async_client.cc b/cpp/helloworld/greeter_async_client.cc
index 561b880ecb6..d99f89b1359 100644
--- a/cpp/helloworld/greeter_async_client.cc
+++ b/cpp/helloworld/greeter_async_client.cc
@@ -37,18 +37,15 @@
 
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
-#include <grpc++/async_unary_call.h>
-#include <grpc++/channel_arguments.h>
-#include <grpc++/channel_interface.h>
+#include <grpc++/channel.h>
 #include <grpc++/client_context.h>
 #include <grpc++/completion_queue.h>
 #include <grpc++/create_channel.h>
 #include <grpc++/credentials.h>
-#include <grpc++/status.h>
 #include "helloworld.grpc.pb.h"
 
+using grpc::Channel;
 using grpc::ChannelArguments;
-using grpc::ChannelInterface;
 using grpc::ClientAsyncResponseReader;
 using grpc::ClientContext;
 using grpc::CompletionQueue;
@@ -59,7 +56,7 @@ using helloworld::Greeter;
 
 class GreeterClient {
  public:
-  explicit GreeterClient(std::shared_ptr<ChannelInterface> channel)
+  explicit GreeterClient(std::shared_ptr<Channel> channel)
       : stub_(Greeter::NewStub(channel)) {}
 
   std::string SayHello(const std::string& user) {
diff --git a/cpp/helloworld/greeter_async_server.cc b/cpp/helloworld/greeter_async_server.cc
index d3ff14775ce..b8a0dbf0e2e 100644
--- a/cpp/helloworld/greeter_async_server.cc
+++ b/cpp/helloworld/greeter_async_server.cc
@@ -38,13 +38,11 @@
 
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
-#include <grpc++/async_unary_call.h>
 #include <grpc++/completion_queue.h>
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>
 #include <grpc++/server_context.h>
 #include <grpc++/server_credentials.h>
-#include <grpc++/status.h>
 #include "helloworld.grpc.pb.h"
 
 using grpc::Server;
diff --git a/cpp/helloworld/greeter_client.cc b/cpp/helloworld/greeter_client.cc
index 44e4447f1f9..dd0358ac95d 100644
--- a/cpp/helloworld/greeter_client.cc
+++ b/cpp/helloworld/greeter_client.cc
@@ -36,16 +36,14 @@
 #include <string>
 
 #include <grpc/grpc.h>
-#include <grpc++/channel_arguments.h>
-#include <grpc++/channel_interface.h>
+#include <grpc++/channel.h>
 #include <grpc++/client_context.h>
 #include <grpc++/create_channel.h>
 #include <grpc++/credentials.h>
-#include <grpc++/status.h>
 #include "helloworld.grpc.pb.h"
 
+using grpc::Channel;
 using grpc::ChannelArguments;
-using grpc::ChannelInterface;
 using grpc::ClientContext;
 using grpc::Status;
 using helloworld::HelloRequest;
@@ -54,7 +52,7 @@ using helloworld::Greeter;
 
 class GreeterClient {
  public:
-  GreeterClient(std::shared_ptr<ChannelInterface> channel)
+  GreeterClient(std::shared_ptr<Channel> channel)
       : stub_(Greeter::NewStub(channel)) {}
 
   std::string SayHello(const std::string& user) {
diff --git a/cpp/helloworld/greeter_server.cc b/cpp/helloworld/greeter_server.cc
index e40bf1b3a1a..c1efdf563c4 100644
--- a/cpp/helloworld/greeter_server.cc
+++ b/cpp/helloworld/greeter_server.cc
@@ -40,7 +40,6 @@
 #include <grpc++/server_builder.h>
 #include <grpc++/server_context.h>
 #include <grpc++/server_credentials.h>
-#include <grpc++/status.h>
 #include "helloworld.grpc.pb.h"
 
 using grpc::Server;