diff --git a/expected/wasm32-wasi/predefined-macros.txt b/expected/wasm32-wasi/predefined-macros.txt
index d7d7c65..b4c9fcc 100644
--- a/expected/wasm32-wasi/predefined-macros.txt
+++ b/expected/wasm32-wasi/predefined-macros.txt
@@ -3106,14 +3106,14 @@
 #define __wasilibc___header_fcntl_h 
 #define __wasilibc___header_netinet_in_h 
 #define __wasilibc___header_poll_h 
+#define __wasilibc___header_stdlib_h 
+#define __wasilibc___header_string_h 
 #define __wasilibc___header_sys_ioctl_h 
 #define __wasilibc___header_sys_resource_h 
 #define __wasilibc___header_sys_socket_h 
 #define __wasilibc___header_sys_stat_h 
 #define __wasilibc___header_time_h 
 #define __wasilibc___header_unistd_h 
-#define __wasilibc___headers_stdlib_h 
-#define __wasilibc___headers_string_h 
 #define __wasilibc___macro_FD_SETSIZE_h 
 #define __wasilibc___mode_t_h 
 #define __wasilibc___seek_h 
diff --git a/libc-bottom-half/headers/public/__header_stdlib.h b/libc-bottom-half/headers/public/__header_stdlib.h
index 99be458..a6c49a5 100644
--- a/libc-bottom-half/headers/public/__header_stdlib.h
+++ b/libc-bottom-half/headers/public/__header_stdlib.h
@@ -1,5 +1,5 @@
-#ifndef __wasilibc___headers_stdlib_h
-#define __wasilibc___headers_stdlib_h
+#ifndef __wasilibc___header_stdlib_h
+#define __wasilibc___header_stdlib_h
 
 #define __need_size_t
 #include <stddef.h>
diff --git a/libc-bottom-half/headers/public/__header_string.h b/libc-bottom-half/headers/public/__header_string.h
index 5e75674..eb98a8a 100644
--- a/libc-bottom-half/headers/public/__header_string.h
+++ b/libc-bottom-half/headers/public/__header_string.h
@@ -1,5 +1,5 @@
-#ifndef __wasilibc___headers_string_h
-#define __wasilibc___headers_string_h
+#ifndef __wasilibc___header_string_h
+#define __wasilibc___header_string_h
 
 #define __need_size_t
 #define __need_NULL
diff --git a/libc-bottom-half/headers/public/stdlib.h b/libc-bottom-half/headers/public/stdlib.h
index 5f03dcb..7ff8236 100644
--- a/libc-bottom-half/headers/public/stdlib.h
+++ b/libc-bottom-half/headers/public/stdlib.h
@@ -5,6 +5,6 @@
  * Include the real implementation, which is factored into a separate file so
  * that it can be reused by other libc stdlib implementations.
  */
-#include <__headers_stdlib.h>
+#include <__header_stdlib.h>
 
 #endif
diff --git a/libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_rmdirat.c b/libc-bottom-half/sources/__wasilibc_rmdirat.c
similarity index 100%
rename from libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_rmdirat.c
rename to libc-bottom-half/sources/__wasilibc_rmdirat.c
diff --git a/libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_unlinkat.c b/libc-bottom-half/sources/__wasilibc_unlinkat.c
similarity index 100%
rename from libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_unlinkat.c
rename to libc-bottom-half/sources/__wasilibc_unlinkat.c