Merge pull request #950 from jtattermusch/csharp_cloud_to_prod
C# interop client support for external CA file
diff --git a/include/grpc++/impl/rpc_service_method.h b/include/grpc++/impl/rpc_service_method.h
index 325c881..0976678 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 9387f4a..a986fff 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 ca69d66..450cf67 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 b2b6c62..6ce1e8a 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 e6badd5..72f1bf7 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 bee7549..f21efcf 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 {