 +cc_library(
 +    name = "sgx_runtime_support",
 +    srcs = [
-+        "runtime_support/sgx_init_crypto_lib.c",
-+        "runtime_support/sgx_init_string_lib.c",
 +        "sdk/compiler-rt/stack_chk.c",
 +        "sdk/tlibc/string/consttime_memequal.c",
 +        "sdk/tlibc/string/memset_s.c",
-+    ],
-+    hdrs = ["runtime_support/rts_config.h"],
++        "//runtime_support:sgx_init_crypto_lib.c",
++        "//runtime_support:sgx_init_string_lib.c",
++    ],
++    hdrs = ["//runtime_support:rts_config.h"],
 +    deps = [":common_inc"],
 +)
 +
 +# A non-versioned, publicly-consumable target for the UAE service.
 +cc_library(
 +    name = "uae_service",
-+    hdrs = ["include/sgx_uae_service.h"],
++    hdrs = ["//include:sgx_uae_service.h"],
 +    visibility = ["//visibility:public"],
 +    deps = [
 +        ":uae_service_select",

+cc_library(
+    name = "public",
+    hdrs = [
+        "include/global_data.h",
+        "include/se_memcpy.h",
+        "include/sgx_cpuid.h",
+        "include/sgx_edger8r.h",
+        "include/sgx_eid.h",
+        "include/sgx_error.h",
+        "include/sgx_key.h",
+        "include/sgx_lfence.h",
+        "include/sgx_quote.h",
+        "include/sgx_report.h",
+        "include/sgx_thread.h",
+        "include/sgx_tseal.h",
+    ],
+    copts = [
+        "-Iexternal/linux_sgx/common/inc/internal",

diff -Nur /dev/null include/sgx_error.h
--- /dev/null
+++ include/sgx_error.h
@@ -0,0 +1,24 @@
+/*
+ *
+ * Copyright 2018 Asylo authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef _INCLUDE_SGX_ERROR_H_
+#define _INCLUDE_SGX_ERROR_H_
+
