1 files changed, 15 insertions, 8 deletions
diff --git a/src/ipc/client_impl.h b/src/ipc/client_impl.h
index 35dea50c4..ff9c7bc7a 100644
--- a/src/ipc/client_impl.h
+++ b/src/ipc/client_impl.h
@@ -17,20 +17,25 @@
 #ifndef SRC_IPC_CLIENT_IMPL_H_
 #define SRC_IPC_CLIENT_IMPL_H_
 
+#include <list>
+#include <map>
+#include <memory>
+
 #include "perfetto/base/task_runner.h"
 #include "perfetto/ext/base/scoped_file.h"
 #include "perfetto/ext/base/unix_socket.h"
 #include "perfetto/ext/ipc/client.h"
 #include "src/ipc/buffered_frame_deserializer.h"
 
-#include "protos/perfetto/ipc/wire_protocol.gen.h"
-
-#include <list>
-#include <map>
-#include <memory>
-
 namespace perfetto {
 
+namespace protos {
+namespace gen {
+class IPCFrame_BindServiceReply;
+class IPCFrame_InvokeMethodReply;
+}  // namespace gen
+}  // namespace protos
+
 namespace base {
 class TaskRunner;
 }  // namespace base
@@ -78,8 +83,10 @@ class ClientImpl : public Client, public base::UnixSocket::EventListener {
 
   bool SendFrame(const Frame&, int fd = -1);
   void OnFrameReceived(const Frame&);
-  void OnBindServiceReply(QueuedRequest, const Frame::BindServiceReply&);
-  void OnInvokeMethodReply(QueuedRequest, const Frame::InvokeMethodReply&);
+  void OnBindServiceReply(QueuedRequest,
+                          const protos::gen::IPCFrame_BindServiceReply&);
+  void OnInvokeMethodReply(QueuedRequest,
+                           const protos::gen::IPCFrame_InvokeMethodReply&);
 
   bool invoking_method_reply_ = false;
   std::unique_ptr<base::UnixSocket> sock_;