diff --git a/src/mem/largealloc.h b/src/mem/largealloc.h
index 5c1437b..583acc4 100644
--- a/src/mem/largealloc.h
+++ b/src/mem/largealloc.h
@@ -9,6 +9,7 @@
 #include "sizeclass.h"
 
 #include <new>
+#include <string.h>
 
 namespace snmalloc
 {
diff --git a/src/pal/pal_open_enclave.h b/src/pal/pal_open_enclave.h
index 3b33378..88ecbd8 100644
--- a/src/pal/pal_open_enclave.h
+++ b/src/pal/pal_open_enclave.h
@@ -4,7 +4,7 @@
 #ifdef OPEN_ENCLAVE
 extern "C" const void* __oe_get_heap_base();
 extern "C" const void* __oe_get_heap_end();
-extern "C" void* oe_memset(void* p, int c, size_t size);
+extern "C" void* oe_memset_s(void* p, size_t p_size, int c, size_t size);
 extern "C" void oe_abort();
 
 namespace snmalloc
@@ -54,7 +54,7 @@ namespace snmalloc
     template<bool page_aligned = false>
     void zero(void* p, size_t size) noexcept
     {
-      oe_memset(p, 0, size);
+      oe_memset_s(p, size, 0, size);
     }
   };
 }
diff --git a/src/test/func/fixed_region/fixed_region.cc b/src/test/func/fixed_region/fixed_region.cc
index c8a8177..183ae24 100644
--- a/src/test/func/fixed_region/fixed_region.cc
+++ b/src/test/func/fixed_region/fixed_region.cc
@@ -17,9 +17,9 @@ extern "C" const void* __oe_get_heap_end()
   return oe_end;
 }
 
-extern "C" void* oe_memset(void* p, int c, size_t size)
+extern "C" void* oe_memset_s(void* p, size_t p_size, int c, size_t size)
 {
-  std::cout << "Memset " << p << " - " << size << std::endl;
+  std::cout << "Memset " << p << " (" << p_size << ") - " << size << std::endl;
 
   return memset(p, c, size);
 }
diff --git a/src/test/func/two_alloc_types/main.cc b/src/test/func/two_alloc_types/main.cc
index 74ae32f..341f32d 100644
--- a/src/test/func/two_alloc_types/main.cc
+++ b/src/test/func/two_alloc_types/main.cc
@@ -17,8 +17,9 @@ extern "C" const void* __oe_get_heap_end()
   return oe_end;
 }
 
-extern "C" void* oe_memset(void* p, int c, size_t size)
+extern "C" void* oe_memset_s(void* p, size_t p_size, int c, size_t size)
 {
+  UNUSED(p_size);
   return memset(p, c, size);
 }