diff --git a/basics/include/__functions_malloc.h b/basics/include/__functions_malloc.h
index cd6644d..803bc11 100644
--- a/basics/include/__functions_malloc.h
+++ b/basics/include/__functions_malloc.h
@@ -1,5 +1,5 @@
-#ifndef __wasm___functions_malloc_h
-#define __wasm___functions_malloc_h
+#ifndef __wasm_basics___functions_malloc_h
+#define __wasm_basics___functions_malloc_h
 
 #define __need_size_t
 #define __need_wchar_t
diff --git a/basics/include/__functions_memcpy.h b/basics/include/__functions_memcpy.h
index 028bf6a..4d17572 100644
--- a/basics/include/__functions_memcpy.h
+++ b/basics/include/__functions_memcpy.h
@@ -1,5 +1,5 @@
-#ifndef __wasm___functions_memcpy_h
-#define __wasm___functions_memcpy_h
+#ifndef __wasm_basics___functions_memcpy_h
+#define __wasm_basics___functions_memcpy_h
 
 #define __need_size_t
 #define __need_NULL
diff --git a/basics/include/stdlib.h b/basics/include/stdlib.h
index 4d7355e..170efe9 100644
--- a/basics/include/stdlib.h
+++ b/basics/include/stdlib.h
@@ -1,5 +1,5 @@
-#ifndef __wasm_stdlib_h
-#define __wasm_stdlib_h
+#ifndef __wasm_basics_stdlib_h
+#define __wasm_basics_stdlib_h
 
 /*
  * Include the real implementation, which is factored into a separate file so
diff --git a/basics/include/string.h b/basics/include/string.h
index f7cb593..54dd841 100644
--- a/basics/include/string.h
+++ b/basics/include/string.h
@@ -1,5 +1,5 @@
-#ifndef __wasm_string_h
-#define __wasm_string_h
+#ifndef __wasm_basics_string_h
+#define __wasm_basics_string_h
 
 /*
  * Include the real implementation, which is factored into a separate file so
diff --git a/expected/wasm32-wasi/predefined-macros.txt b/expected/wasm32-wasi/predefined-macros.txt
index 2d0c627..984cae1 100644
--- a/expected/wasm32-wasi/predefined-macros.txt
+++ b/expected/wasm32-wasi/predefined-macros.txt
@@ -3612,9 +3612,9 @@
 #define __wasm32 1
 #define __wasm32__ 1
 #define __wasm__ 1
-#define __wasm___functions_malloc_h 
-#define __wasm___functions_memcpy_h 
 #define __wasm_basics___errno_h 
+#define __wasm_basics___functions_malloc_h 
+#define __wasm_basics___functions_memcpy_h 
 #define __wasm_basics___include_inttypes_h 
 #define __wasm_basics___macro_PAGESIZE_h 
 #define __wasm_basics___struct_stat_h