diff --git a/include/grpc++/impl/rpc_service_method.h b/include/grpc++/impl/rpc_service_method.h
index 325c8812cafe968c6e86eaa225ff38154f2b027b..097667827a133a75eaadb402df58211284155222 100644
--- a/include/grpc++/impl/rpc_service_method.h
+++ b/include/grpc++/impl/rpc_service_method.h
@@ -39,10 +39,10 @@
 #include <memory>
 #include <vector>
 
+#include <grpc++/config.h>
 #include <grpc++/impl/rpc_method.h>
 #include <grpc++/status.h>
 #include <grpc++/stream.h>
-#include <google/protobuf/message.h>
 
 namespace grpc {
 class ServerContext;
diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h
index 9387f4a7e267a6bc6cf2765b7ae4b48943ff9b4a..a986fff46bf1a28787f00c6d22f2f60ff65f5f98 100644
--- a/include/grpc++/server_context.h
+++ b/include/grpc++/server_context.h
@@ -37,7 +37,7 @@
 #include <chrono>
 #include <map>
 
-#include "config.h"
+#include <grpc++/config.h>
 
 struct gpr_timespec;
 struct grpc_metadata;
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc
index ca69d66cbbfcf541e7e0bdfde03b77052c74d929..450cf67ac8be9a546fa91ba92428930de6ca8ecc 100644
--- a/src/cpp/client/channel.cc
+++ b/src/cpp/client/channel.cc
@@ -50,7 +50,6 @@
 #include <grpc++/impl/call.h>
 #include <grpc++/impl/rpc_method.h>
 #include <grpc++/status.h>
-#include <google/protobuf/message.h>
 
 namespace grpc {
 
diff --git a/src/cpp/common/call.cc b/src/cpp/common/call.cc
index b2b6c627857b84abc9acb5eb889c9024d11c0bab..6ce1e8a7d580eb30eab36afce5e08af53737e854 100644
--- a/src/cpp/common/call.cc
+++ b/src/cpp/common/call.cc
@@ -31,7 +31,6 @@
  *
  */
 
-#include <google/protobuf/message.h>
 #include <grpc/support/alloc.h>
 #include <grpc++/impl/call.h>
 #include <grpc++/client_context.h>
diff --git a/src/cpp/proto/proto_utils.cc b/src/cpp/proto/proto_utils.cc
index e6badd5d6e7922c371747123fb5ddc2bb9cbb73d..72f1bf74417e7210cf989eff0c1c6dc88e48066d 100644
--- a/src/cpp/proto/proto_utils.cc
+++ b/src/cpp/proto/proto_utils.cc
@@ -36,7 +36,6 @@
 
 #include <grpc/grpc.h>
 #include <grpc/support/slice.h>
-#include <google/protobuf/message.h>
 
 namespace grpc {
 
diff --git a/src/cpp/server/async_server_context.cc b/src/cpp/server/async_server_context.cc
index bee75497b8cf39262a585775db687fbdcd2864f9..f21efcfb19ac2c0b82986ce88bfcf9127b093c76 100644
--- a/src/cpp/server/async_server_context.cc
+++ b/src/cpp/server/async_server_context.cc
@@ -36,7 +36,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
 #include "src/cpp/proto/proto_utils.h"
-#include <google/protobuf/message.h>
+#include <grpc++/config.h>
 #include <grpc++/status.h>
 
 namespace grpc {