              if (status != SGX_SUCCESS) {
                  if (enclave_error != NULL)
                      *enclave_error = error_aesm2api(status);
-@@ -842,6 +845,13 @@
+@@ -842,6 +853,13 @@
      }
  
      se_mutex_lock(&s_enclave_mutex);

 extern "C" sgx_status_t __sgx_create_enclave_ex(const char *file_name, 
                                                 const int debug, 
                                                 sgx_launch_token_t *launch_token, 
@@ -74,7 +100,10 @@
                                                 const uint32_t ex_features,
                                                 const void* ex_features_p[32])
 {

diff -Nur psw/urts/linux/urts.cpp psw/urts/linux/urts.cpp
--- psw/urts/linux/urts.cpp
+++ psw/urts/linux/urts.cpp
@@ -29,21 +29,24 @@
  *
  */
 
-
+#include "arch.h"
+#include "edmm_utility.h"
+#include "enclave.h"
 #include "sgx_error.h"
 #include "sgx_urts.h"
