diff --git a/wasi-libc/.footprint b/wasi-libc/.footprint
index b11e06eb3..71d2f959c 100644
--- a/wasi-libc/.footprint
+++ b/wasi-libc/.footprint
@@ -2,210 +2,213 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/wasi-sysroot/
 drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__errno.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__errno_values.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__fd_set.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__function___isatty.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__functions_malloc.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__functions_memcpy.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_dirent.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_fcntl.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_inttypes.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_netinet_in.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_poll.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_stdlib.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_string.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_sys_ioctl.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_sys_resource.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_sys_socket.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_sys_stat.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_time.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__header_unistd.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__macro_FD_SETSIZE.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__macro_PAGESIZE.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__mode_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__seek.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_dirent.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_in6_addr.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_in_addr.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_iovec.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_msghdr.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_pollfd.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_rusage.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_sockaddr.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_sockaddr_in.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_sockaddr_in6.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_sockaddr_storage.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_sockaddr_un.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_stat.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_timespec.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_timeval.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_tm.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__struct_tms.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_DIR.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_blkcnt_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_blksize_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_clock_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_clockid_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_dev_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_fd_set.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_gid_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_in_addr_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_in_port_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_ino_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_mode_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_nfds_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_nlink_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_off_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_sa_family_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_sigset_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_socklen_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_ssize_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_suseconds_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_time_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/__typedef_uid_t.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/alloca.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/ar.h
-drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/arpa/
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/arpa/ftp.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/arpa/inet.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/arpa/nameser.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/arpa/nameser_compat.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/arpa/telnet.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/arpa/tftp.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/assert.h
-drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/bits/
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/alltypes.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/dirent.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/fcntl.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/fenv.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/float.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/hwcap.h (EMPTY)
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/io.h (EMPTY)
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/ioctl.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/ioctl_fix.h (EMPTY)
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/ipcstat.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/limits.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/mman.h (EMPTY)
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/poll.h (EMPTY)
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/posix.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/reg.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/resource.h (EMPTY)
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/signal.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/socket.h (EMPTY)
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/stat.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/bits/stdint.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/byteswap.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/complex.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/cpio.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/crypt.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/ctype.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/dirent.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/dlfcn.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/endian.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/err.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/errno.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/fcntl.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/features.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/fenv.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/float.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/fmtmsg.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/fnmatch.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/ftw.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/getopt.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/glob.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/iconv.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/ifaddrs.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/inttypes.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/iso646.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/langinfo.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/libgen.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/limits.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/locale.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/malloc.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/math.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/memory.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/monetary.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/mqueue.h
-drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/net/
-drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/netinet/
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netinet/icmp6.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netinet/igmp.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netinet/in.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netinet/in_systm.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netinet/ip.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netinet/ip6.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netinet/ip_icmp.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netinet/tcp.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netinet/udp.h
-drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/netpacket/
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/netpacket/packet.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/nl_types.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/poll.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/regex.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sched.h
-drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/scsi/
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/search.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/semaphore.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/signal.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/stdalign.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/stdbool.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/stdc-predef.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/stdint.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/stdio.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/stdio_ext.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/stdlib.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/stdnoreturn.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/string.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/strings.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/stropts.h
-drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/sys/
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/dir.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/errno.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/eventfd.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/fcntl.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/file.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/ioctl.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/mman.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/param.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/poll.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/random.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/reg.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/resource.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/select.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/signal.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/socket.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/stat.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/stropts.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/syscall.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/sysinfo.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/time.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/timeb.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/times.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/timex.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/ttydefaults.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/types.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/uio.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/un.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sys/utsname.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/syscall.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/sysexits.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/tar.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/tgmath.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/threads.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/time.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/uchar.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/unistd.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/utime.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/values.h
-drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasi/
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasi/api.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasi/libc-environ.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasi/libc-find-relpath.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasi/libc-nocwd.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasi/libc.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/wchar.h
--rw-r--r--	root/root	usr/share/wasi-sysroot/include/wctype.h
+drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__errno.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__errno_values.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__fd_set.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__function___isatty.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__functions_malloc.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__functions_memcpy.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_dirent.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_fcntl.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_inttypes.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_netinet_in.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_poll.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_stdlib.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_string.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_sys_ioctl.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_sys_resource.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_sys_socket.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_sys_stat.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_time.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__header_unistd.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__macro_FD_SETSIZE.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__macro_PAGESIZE.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__mode_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__seek.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_dirent.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_in6_addr.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_in_addr.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_iovec.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_msghdr.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_pollfd.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_rusage.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in6.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_storage.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_un.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_stat.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_timespec.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_timeval.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_tm.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__struct_tms.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_DIR.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_blkcnt_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_blksize_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_clock_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_clockid_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_dev_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_fd_set.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_gid_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_in_addr_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_in_port_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_ino_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_mode_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_nfds_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_nlink_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_off_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_sa_family_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_sigset_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_socklen_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_ssize_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_suseconds_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_time_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/__typedef_uid_t.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/alloca.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/ar.h
+drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/arpa/
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/arpa/ftp.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/arpa/inet.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/arpa/nameser.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/arpa/nameser_compat.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/arpa/telnet.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/arpa/tftp.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/assert.h
+drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/alltypes.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/dirent.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/fcntl.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/fenv.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/float.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/hwcap.h (EMPTY)
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/io.h (EMPTY)
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/ioctl.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/ioctl_fix.h (EMPTY)
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/ipcstat.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/limits.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/mman.h (EMPTY)
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/poll.h (EMPTY)
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/posix.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/reg.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/resource.h (EMPTY)
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/signal.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/socket.h (EMPTY)
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/stat.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/bits/stdint.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/byteswap.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/complex.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/cpio.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/crypt.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/ctype.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/dirent.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/dlfcn.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/endian.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/err.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/errno.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/fcntl.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/features.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/fenv.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/float.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/fmtmsg.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/fnmatch.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/ftw.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/getopt.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/glob.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/iconv.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/ifaddrs.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/inttypes.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/iso646.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/langinfo.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/libgen.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/limits.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/locale.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/malloc.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/math.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/memory.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/monetary.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/mqueue.h
+drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/net/
+drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/icmp6.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/igmp.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/in.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/in_systm.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/ip.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/ip6.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/ip_icmp.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/tcp.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netinet/udp.h
+drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netpacket/
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/netpacket/packet.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/nl_types.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/poll.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/regex.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sched.h
+drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/scsi/
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/search.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/semaphore.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/signal.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/stdalign.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/stdbool.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/stdc-predef.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/stdint.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/stdio.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/stdio_ext.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/stdlib.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/stdnoreturn.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/string.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/strings.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/stropts.h
+drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/dir.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/errno.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/eventfd.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/fcntl.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/file.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/ioctl.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/mman.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/param.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/poll.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/random.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/reg.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/resource.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/select.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/signal.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/socket.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/stat.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/statvfs.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/stropts.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/syscall.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/sysinfo.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/time.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/timeb.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/times.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/timex.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/ttydefaults.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/types.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/uio.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/un.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sys/utsname.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/syscall.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/sysexits.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/tar.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/tgmath.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/threads.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/time.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/uchar.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/unistd.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/utime.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/values.h
+drwxr-xr-x	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/wasi/
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/wasi/libc.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/wasi/preview2.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/wchar.h
+-rw-r--r--	root/root	usr/share/wasi-sysroot/include/wasm32-wasi/wctype.h
 drwxr-xr-x	root/root	usr/share/wasi-sysroot/lib/
 drwxr-xr-x	root/root	usr/share/wasi-sysroot/lib/wasm32-wasi/
 -rw-r--r--	root/root	usr/share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
diff --git a/wasi-libc/.nostrip b/wasi-libc/.nostrip
index 1cfddbbdc..f29e12907 100644
--- a/wasi-libc/.nostrip
+++ b/wasi-libc/.nostrip
@@ -1,2 +1 @@
 usr/share/wasi-sysroot/lib/wasm32-wasi/.*\.a
-usr/lib/clang/.*/lib/wasi/.*\.a
diff --git a/wasi-libc/.signature b/wasi-libc/.signature
index bd1b30216..092299940 100644
--- a/wasi-libc/.signature
+++ b/wasi-libc/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/5m/PtC8xEKCO3534419OfPaTWOf2ktYcETarSgMv2PGNtnUsetWozquZMO3ggRy7Crot9wcAXk9faD92FekA0=
-SHA256 (Pkgfile) = 3ad7c7b8ae3aba4c9f4b18c59b32611e3edd32c2948c241e89017b3b10179a41
-SHA256 (.footprint) = 647b7f359411873bd2ba87e4f1196b6a9937be9d6c5af79eedefd5bbfcadb08f
-SHA256 (wasi-libc-0.20231115.tar.gz) = 6d63c256293f1544512dd8c47301138d030750492fba5b0ee8827421aa4f7c67
+RWSagIOpLGJF32dqV+4IeS55H7onXovwTa3umlrjqt9KW2dlLa3JIHPGc/Xf66Fl8jgCTICl7XhFC6MJkhl+nFgdGzvs9oY6/g8=
+SHA256 (Pkgfile) = 353e5f0de25ae4b6196cdf81a47fa6622a57da76288173bbe4d7a2baddd66727
+SHA256 (.footprint) = 7e58837319483ed0f5e67f19de6b796ebac902471c996a15e4d04a3878ac0251
+SHA256 (wasi-libc-0.20240222.tar.gz) = 4a114e8c7dede2c629a314d63f09bc5396d7d332f111af083ad6b5e579d389d8
 SHA256 (no-double-build.patch) = 875fd0131997dfdec737ba7a2df93d6d243def5ad0b60aac6d48fab9c902b464
diff --git a/wasi-libc/Pkgfile b/wasi-libc/Pkgfile
index d22a38137..cb1241065 100644
--- a/wasi-libc/Pkgfile
+++ b/wasi-libc/Pkgfile
@@ -4,8 +4,8 @@
 # Depends on: clang
 
 name=wasi-libc
-version=0.20231115
-_commit=b85d65528d6e17ae1874c6cc6a6a3ac02e83021a
+version=0.20240222
+_commit=55df1f54e2e54b64ad1cc385986cd1863f45e211
 release=1
 source=(https://github.com/WebAssembly/$name/archive/$_commit/$name-$version.tar.gz
   no-double-build.patch)