From 6f2f9ae2c362eac6b76da442606b2486623b4d6b Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Fri, 23 Aug 2019 10:07:17 -0700
Subject: [PATCH 1/3] import ProtoRPC and GRPCCallOptions in ProtoService

---
 src/objective-c/ProtoRPC/ProtoService.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/objective-c/ProtoRPC/ProtoService.h b/src/objective-c/ProtoRPC/ProtoService.h
index 8543f5dee43..45376a94353 100644
--- a/src/objective-c/ProtoRPC/ProtoService.h
+++ b/src/objective-c/ProtoRPC/ProtoService.h
@@ -18,15 +18,12 @@
 
 #import <Foundation/Foundation.h>
 
-@class GRPCProtoCall;
+#import "ProtoRPC.h"
+#import <GRPCClient/GRPCCallOptions.h>
+
 @protocol GRXWriteable;
 @class GRXWriter;
 @class GRPCCallOptions;
-@class GRPCProtoCall;
-@class GRPCUnaryProtoCall;
-@class GRPCStreamingProtoCall;
-@protocol GRPCProtoResponseHandler;
-@protocol GRXWriteable;
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnullability-completeness"

From e21ec5d4d5d7f549d65f32535229ed0eb58bd73c Mon Sep 17 00:00:00 2001
From: Muxi Yan <muxi@users.noreply.github.com>
Date: Fri, 23 Aug 2019 16:46:01 -0700
Subject: [PATCH 2/3] clang-format

---
 src/objective-c/ProtoRPC/ProtoService.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/objective-c/ProtoRPC/ProtoService.h b/src/objective-c/ProtoRPC/ProtoService.h
index 45376a94353..fd8a86bb2b2 100644
--- a/src/objective-c/ProtoRPC/ProtoService.h
+++ b/src/objective-c/ProtoRPC/ProtoService.h
@@ -18,8 +18,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "ProtoRPC.h"
 #import <GRPCClient/GRPCCallOptions.h>
+#import "ProtoRPC.h"
 
 @protocol GRXWriteable;
 @class GRXWriter;

From 80163ef83b800d9aad1740b1762514a7aca5dddc Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Sat, 24 Aug 2019 10:39:38 -0700
Subject: [PATCH 3/3] Update BUILD file accordingly

---
 src/objective-c/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/objective-c/BUILD b/src/objective-c/BUILD
index e71dd3eed81..5f53486d17e 100644
--- a/src/objective-c/BUILD
+++ b/src/objective-c/BUILD
@@ -232,6 +232,7 @@ grpc_objc_library(
     ],
     hdrs = [
         "ProtoRPC/ProtoMethod.h",
+        "ProtoRPC/ProtoRPC.h",
         "ProtoRPC/ProtoRPCLegacy.h",
         "ProtoRPC/ProtoService.h",
     ],