 diff -Naur ../newlib-2.5.0.20170922/libgloss/enclave/enclave_syscalls.h ./libgloss/enclave/enclave_syscalls.h
 --- ../newlib-2.5.0.20170922/libgloss/enclave/enclave_syscalls.h
 +++ ./libgloss/enclave/enclave_syscalls.h
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,47 @@
 +#ifndef THIRD_PARTY_NEWLIB_SRC_LIBGLOSS_ENCLAVE_ENCLAVE_SYSCALLS_H_
 +#define THIRD_PARTY_NEWLIB_SRC_LIBGLOSS_ENCLAVE_ENCLAVE_SYSCALLS_H_
 +

+#include <string.h>
+
+#endif  // _MEMORY_H
diff -Naur ../newlib-2.5.0.20170922/newlib/libc/sys/enclave/include/nl_types.h ./newlib/libc/sys/enclave/include/nl_types.h
--- ../newlib-2.5.0.20170922/newlib/libc/sys/enclave/include/nl_types.h
+++ ./newlib/libc/sys/enclave/include/nl_types.h

+#include <sys/types.h>
+
+
+// The changed signatures need to match immediately and in the container, but
+// the container is behind until the next release. This define allows manual
+// installs to use the new signatures (since the define is present) but the
+// container to use the old signatures (since the define is not yet present).
+#define ASYLO_ENCLAVE_SYSCALL_TRANSITION 1
+
+#if defined(__cplusplus)
