diff --git a/.github/workflows/reusable-wasix.yml b/.github/workflows/reusable-wasix.yml
index 7bf21cab9ddc4e..5f40e148dfb061 100644
--- a/.github/workflows/reusable-wasix.yml
+++ b/.github/workflows/reusable-wasix.yml
@@ -19,6 +19,7 @@ jobs:
       OPENSSL_DIR: "/opt/openssl"
       ZLIB_DIR: "/opt/zlib"
       LIBLZMA_DIR: "/opt/liblzma"
+      UTIL_LINUX_DIR: "/opt/util-linux"
       CROSS_BUILD_PYTHON: cross-build/build
       CROSS_BUILD_WASIX: cross-build/wasix
       WASIX_INSTALL: /opt/wasix_install
@@ -64,6 +65,12 @@ jobs:
         cd ${{ env.LIBLZMA_DIR }}
         ./wasix.sh
         cp src/liblzma/.libs/liblzma.a liblzma.a
+    - name: "Compile libuuid"
+      run: |
+        git clone https://github.com/wasix-org/util-linux ${{ env.UTIL_LINUX_DIR }}
+        cd ${{ env.UTIL_LINUX_DIR }}
+        ./wasix.sh
+        cp -v .libs/libuuid.a .
     - name: "Install Wasmer"
       run: |
         mkdir ${{ env.WASMER_DIR }}
@@ -76,6 +83,8 @@ jobs:
         WASIX_ZLIB_LIBS="-L${{ env.ZLIB_DIR }} -lz" \
         WASIX_LIBLZMA_CFLAGS="-I${{ env.LIBLZMA_DIR }}/src/liblzma/api" \
         WASIX_LIBLZMA_LIBS="-L${{ env.LIBLZMA_DIR }} -llzma" \
+        WASIX_LIBUUID_CFLAGS="-I ${{ env.UTIL_LINUX_DIR }}/libuuid/src" \
+        WASIX_LIBUUID_LIBS="-L ${{ env.UTIL_LINUX_DIR }} -l uuid" \
         python3 Tools/wasm/wasm_build.py wasix build
     - name: "List dirs"
       run: |
diff --git a/Tools/wasm/wasix-configure-wrapper b/Tools/wasm/wasix-configure-wrapper
index 139430c17ec1ea..c7e9c10d82e5b6 100755
--- a/Tools/wasm/wasix-configure-wrapper
+++ b/Tools/wasm/wasix-configure-wrapper
@@ -50,6 +50,9 @@ export LIBLZMA_LIBS=$WASIX_LIBLZMA_LIBS
 export ZLIB_CFLAGS=$WASIX_ZLIB_CFLAGS
 export ZLIB_LIBS=$WASIX_ZLIB_LIBS
 
+export LIBUUID_CFLAGS=$WASIX_LIBUUID_CFLAGS
+export LIBUUID_LIBS=$WASIX_LIBUUID_LIBS
+
 export RANLIB="$WASI_SDK_PATH/bin/ranlib"
 export AR="$WASI_SDK_PATH/bin/ar"
 export NM="$WASI_SDK_PATH/bin/nm"
diff --git a/configure b/configure
index cbc13e205eeed7..08a1790b248f9a 100755
--- a/configure
+++ b/configure
@@ -28977,7 +28977,6 @@ case $ac_sys_system in #(
     py_cv_module_syslog=n/a
     py_cv_module__ctypes_test=n/a
     py_cv_module__ctypes=n/a
-    py_cv_module__uuid=n/a
     py_cv_module__testexternalinspection=n/a
     py_cv_module__testimportmultiple=n/a
     py_cv_module__testmultiphase=n/a
@@ -28990,6 +28989,7 @@ case $ac_sys_system in #(
     py_cv_module__testclinic=n/a
     py_cv_module_fcntl=n/a
     py_cv_module_readline=n/a
+    py_cv_module_mmap=n/a
     py_cv_module_xxlimited=n/a
     py_cv_module_xxlimited_35=n/a
     py_cv_module_=n/a
diff --git a/configure.ac b/configure.ac
index 17a12d779c01ab..6cd6893bc7bd15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7519,7 +7519,6 @@ AS_CASE([$ac_sys_system],
       [syslog],
       [_ctypes_test],
       [_ctypes],
-      [_uuid],
       [_testexternalinspection],
       [_testimportmultiple],
       [_testmultiphase],
@@ -7532,6 +7531,7 @@ AS_CASE([$ac_sys_system],
       [_testclinic],
       [fcntl],
       [readline],
+      [mmap],
       [xxlimited],
       [xxlimited_35],
     )