 +    ],
 +    hdrs = PSW_COMMON_HDRS,
 +    copts = PSW_COMMON_INCLUDES + [
++        "-Iexternal/linux_sgx/external/epid-sdk",
 +        "-Iexternal/linux_sgx/common/inc/internal",
 +        "-Iexternal/linux_sgx/common/inc/internal/linux",
 +        "-Iexternal/linux_sgx/external/vtune/linux/include",

+    deps = [
+        ":common_inc",
+        ":common_inc_internal",
+        ":epid_inc",
+        ":ipc_common_proto_cc_cc_proto",
+        ":pse_types",
+        ":sim_common",

+        "common/inc/internal/xsave.h",
+    ],
+    copts = [
+        "-Iexternal/linux_sgx/external/epid-sdk",
+        # common/inc/internal cannot be included via "includes" since
+        # __cpuid gets overwritten with an incompatible definition from
+        # the usual cpuid.h header file.
