          if (eventNum == -1)
          {
              errorDetected = true;
+diff -Nur -x '*.png' -x '*.gif' psw/ae/common/src/ProtobufSerializer.cpp psw/ae/common/src/ProtobufSerializer.cpp
+--- psw/ae/common/src/ProtobufSerializer.cpp
++++ psw/ae/common/src/ProtobufSerializer.cpp
+@@ -34,7 +34,6 @@
+  */
+ 
+ #include <ProtobufSerializer.h>
+-#include <google/protobuf/message.h>
+ #include <IAEMessage.h>
+ 
+ #include <IAERequest.h>
 diff -Nur -x '*.png' -x '*.gif' psw/ae/common/src/SocketTransporter.cpp psw/ae/common/src/SocketTransporter.cpp
 --- psw/ae/common/src/SocketTransporter.cpp
 +++ psw/ae/common/src/SocketTransporter.cpp

+        "common/inc/internal/se_*.h",
+    ]) + [
+        "external/epid/epid/common/types.h",
+        ":ipc_common_proto",
+    ],
+    hdrs = [
+        "common/inc/internal/arch.h",

+sgx_enclave_configuration(name = "enclave_debug_config")
+
+
+proto_library(
+    name = "ipc_common_proto",
+    srcs = ["psw/ae/common/proto/messages.proto"],
+)
+cc_proto_library(
+    name = "ipc_common_proto_cc",
+    deps = [":ipc_common_proto"],
+)
+
+cc_library(
