diff --git a/BUILD b/BUILD
index 05880afa3..e531ce1b3 100644
--- a/BUILD
+++ b/BUILD
@@ -187,45 +187,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "wasmtime_lib",
-    srcs = [
-        "src/common/types.h",
-        "src/wasmtime/types.h",
-        "src/wasmtime/wasmtime.cc",
-    ],
-    hdrs = ["include/proxy-wasm/wasmtime.h"],
-    copts = [
-        "-DWASM_API_EXTERN=",
-    ],
-    defines = [
-        "PROXY_WASM_HAS_RUNTIME_WASMTIME",
-        "PROXY_WASM_HOST_ENGINE_WASMTIME",
-    ],
-    # See: https://bytecodealliance.github.io/wasmtime/c-api/
-    linkopts = select({
-        "@platforms//os:macos": [],
-        "@platforms//os:windows": [
-            "ws2_32.lib",
-            "advapi32.lib",
-            "userenv.lib",
-            "ntdll.lib",
-            "shell32.lib",
-            "ole32.lib",
-            "bcrypt.lib",
-        ],
-        "//conditions:default": [
-            "-ldl",
-            "-lm",
-            "-lpthread",
-        ],
-    }),
-    deps = [
-        ":wasm_vm_headers",
-        "@com_github_bytecodealliance_wasmtime//:wasmtime_lib",
-    ],
-)
-
 genrule(
     name = "prefixed_wasmtime_sources",
     srcs = [
@@ -239,15 +200,14 @@ genrule(
     cmd = """
         for file in $(SRCS); do
            sed -e 's/wasm_/wasmtime_wasm_/g' \
-               -e 's/include\\/wasm.h/include\\/prefixed_wasm.h/g' \
                -e 's/wasmtime\\/types.h/wasmtime\\/prefixed_types.h/g' \
-           $$file >$(@D)/$$(dirname $$file)/prefixed_$$(basename $$file)
+           $$file >$(@D)/src/wasmtime/prefixed_$$(basename $$file)
         done
         """,
 )
 
 cc_library(
-    name = "prefixed_wasmtime_lib",
+    name = "wasmtime_lib",
     srcs = [
         "src/common/types.h",
         "src/wasmtime/prefixed_types.h",
@@ -281,7 +241,7 @@ cc_library(
     }),
     deps = [
         ":wasm_vm_headers",
-        "@com_github_bytecodealliance_wasmtime//:prefixed_wasmtime_lib",
+        "@com_github_bytecodealliance_wasmtime//:wasmtime_lib",
     ],
 )
 
@@ -299,6 +259,5 @@ cc_library(
         [":wasmedge_lib"],
     ) + proxy_wasm_select_engine_wasmtime(
         [":wasmtime_lib"],
-        [":prefixed_wasmtime_lib"],
     ),
 )
diff --git a/bazel/cargo/wasmtime/Cargo.Bazel.lock b/bazel/cargo/wasmtime/Cargo.Bazel.lock
index 93579f697..99e93491f 100644
--- a/bazel/cargo/wasmtime/Cargo.Bazel.lock
+++ b/bazel/cargo/wasmtime/Cargo.Bazel.lock
@@ -14,15 +14,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.86"
@@ -67,18 +58,18 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6"
+checksum = "bd5d0c30fdfa774bd91e7261f7fd56da9fce457da89a8442b3648a3af46775d5"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-bitset"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded"
+checksum = "b3eb20c97ecf678a2041846f6093f54eea5dc5ea5752260885f5b8ece95dff42"
 dependencies = [
  "serde",
  "serde_derive",
@@ -86,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397"
+checksum = "44e40598708fd3c0a84d4c962330e5db04a30e751a957acbd310a775d05a5f4a"
 dependencies = [
  "bumpalo",
  "cranelift-bforest",
@@ -109,33 +100,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06"
+checksum = "71891d06220d3a4fd26e602138027d266a41062991e102614fbde7d9c9a645e5"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb"
+checksum = "da72d65dba9a51ab9cbb105cf4e4aadd56b1eba68736f68d396a88a53a91cdb9"
 
 [[package]]
 name = "cranelift-control"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b"
+checksum = "485b4e673fd05c0e7bcef201b3ded21c0166e0d64dcdfc5fcf379c03fdce9775"
 dependencies = [
  "arbitrary",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130"
+checksum = "e6d9e04e7bc3f8006b9b17fe014d98c0e4b65f97c63d536969dfdb7106a1559a"
 dependencies = [
  "cranelift-bitset",
  "serde",
@@ -144,9 +135,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8"
+checksum = "5dd834ba2b0d75dbb7fddce9d1c581c9457d4303921025af2653f42ce4c27bcf"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -156,15 +147,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9"
+checksum = "7714844e9223bb002fdb9b708798cfe92ec3fb4401b21ec6cca1ac0387819489"
 
 [[package]]
 name = "cranelift-native"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b"
+checksum = "1570411d5b06b3252b58033973499142a3c4367888bb070e6b52bfcb1d3e158f"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -173,9 +164,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.111.0"
+version = "0.111.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68"
+checksum = "7f55d300101c656b79d93b1f4018838d03d9444507f8ddde1f6663b869d199a0"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -208,19 +199,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
 
-[[package]]
-name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -229,9 +207,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
  "windows-sys",
@@ -279,18 +257,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
 [[package]]
 name = "id-arena"
 version = "2.2.1"
@@ -308,17 +274,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -342,9 +297,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.182"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
 
 [[package]]
 name = "libm"
@@ -360,9 +315,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "mach2"
@@ -469,35 +424,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "regex"
-version = "1.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -718,9 +644,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7"
+checksum = "3548c6db0acd5c77eae418a2d8b05f963ae6f29be65aed64c652d2aa1eba8b9c"
 dependencies = [
  "anyhow",
  "bitflags",
@@ -758,9 +684,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-asm-macros"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be"
+checksum = "b78a28fc6b83b1f805d61a01aa0426f2f17b37110f86029b7d68ab105243d023"
 dependencies = [
  "cfg-if",
 ]
@@ -768,9 +694,18 @@ dependencies = [
 [[package]]
 name = "wasmtime-c-api-bazel"
 version = "24.0.0"
+dependencies = [
+ "log",
+ "wasmtime-c-api-impl",
+]
+
+[[package]]
+name = "wasmtime-c-api-impl"
+version = "24.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "765e302e7d9125e614aaeec3ad6b6083605393004eca00214106a4ff6b47fc58"
 dependencies = [
  "anyhow",
- "env_logger",
  "log",
  "once_cell",
  "tracing",
@@ -781,7 +716,8 @@ dependencies = [
 [[package]]
 name = "wasmtime-c-api-macros"
 version = "24.0.0"
-source = "git+https://github.com/bytecodealliance/wasmtime?tag=v24.0.0#6fc3d274c7994dad20c816ccc0739bf766b39a11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d09d02eaa84aa2de5babee7b0296557ad6e4903bb10aa8d135e393e753a43d6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -789,9 +725,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-component-macro"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf"
+checksum = "4d22bdf9af333562df78e1b841a3e5a2e99a1243346db973f1af42b93cb97732"
 dependencies = [
  "anyhow",
  "proc-macro2",
@@ -804,15 +740,15 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-component-util"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874"
+checksum = "ace6645ada74c365f94d50f8bd31e383aa5bd419bfaad873f5227768ed33bd99"
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9"
+checksum = "f29888e14ff69a85bc7ca286f0720dcdc79a6ff01f0fc013a1a1a39697778e54"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -834,9 +770,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377"
+checksum = "8978792f7fa4c1c8a11c366880e3b52f881f7382203bee971dd7381b86123ee0"
 dependencies = [
  "anyhow",
  "cranelift-bitset",
@@ -857,9 +793,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit-icache-coherence"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e"
+checksum = "69bb9a6ff1d8f92789cc2a3da13eed4074de65cceb62224cb3d8b306533b7884"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -869,15 +805,15 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-slab"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1"
+checksum = "ec8ac1f5bcfc8038c60b1a0a9116d5fb266ac5ee1529640c1fe763c9bcaa8a9b"
 
 [[package]]
 name = "wasmtime-types"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249"
+checksum = "511ad6ede0cfcb30718b1a378e66022d60d942d42a33fbf5c03c5d8db48d52b9"
 dependencies = [
  "anyhow",
  "cranelift-entity",
@@ -889,9 +825,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-versioned-export-macros"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed"
+checksum = "10283bdd96381b62e9f527af85459bf4c4824a685a882c8886e2b1cdb2f36198"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -900,9 +836,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wit-bindgen"
-version = "24.0.0"
+version = "24.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f"
+checksum = "beb8b981b1982ae3aa83567348cbb68598a2a123646e4aa604a3b5c1804f3383"
 dependencies = [
  "anyhow",
  "heck",
diff --git a/bazel/cargo/wasmtime/Cargo.toml b/bazel/cargo/wasmtime/Cargo.toml
index b038be7fd..ea7b8fe73 100644
--- a/bazel/cargo/wasmtime/Cargo.toml
+++ b/bazel/cargo/wasmtime/Cargo.toml
@@ -13,19 +13,15 @@
 # limitations under the License.
 
 [package]
-edition = "2021"
 name = "wasmtime-c-api-bazel"
 version = "24.0.0"
+edition = "2021"
 rust-version = "1.78.0"
 
 [lib]
 path = "fake_lib.rs"
 
 [dependencies]
-env_logger = "0.10"
-anyhow = "1.0"
-once_cell = "1.12"
-log = {version = "0.4.8", default-features = false}
-tracing = "0.1.26"
-wasmtime = {version = "24.0.0", default-features = false, features = ['cranelift', 'runtime', 'gc', 'std']}
-wasmtime-c-api-macros = {git = "https://github.com/bytecodealliance/wasmtime", tag = "v24.0.0"}
+# Fixes testdata build error due to missing crate_features = ["std"]
+log = {version = "0.4.29", default-features = false, features = ['std']}
+wasmtime-c-api-impl = {version = "=24.0.0", features = ['cranelift']}
diff --git a/bazel/cargo/wasmtime/remote/BUILD.aho-corasick-1.1.3.bazel b/bazel/cargo/wasmtime/remote/BUILD.aho-corasick-1.1.3.bazel
deleted file mode 100644
index 2d8e211ab..000000000
--- a/bazel/cargo/wasmtime/remote/BUILD.aho-corasick-1.1.3.bazel
+++ /dev/null
@@ -1,60 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @//bazel/cargo/wasmtime:crates_vendor
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "aho_corasick",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "perf-literal",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=aho-corasick",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.1.3",
-    deps = [
-        "@cu__memchr-2.7.4//:memchr",
-    ],
-)
diff --git a/bazel/cargo/wasmtime/remote/BUILD.bazel b/bazel/cargo/wasmtime/remote/BUILD.bazel
index 0bf523996..e5d499407 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.bazel
@@ -32,85 +32,25 @@ filegroup(
 
 # Workspace Member Dependencies
 alias(
-    name = "anyhow-1.0.86",
-    actual = "@cu__anyhow-1.0.86//:anyhow",
-    tags = ["manual"],
-)
-
-alias(
-    name = "anyhow",
-    actual = "@cu__anyhow-1.0.86//:anyhow",
-    tags = ["manual"],
-)
-
-alias(
-    name = "env_logger-0.10.2",
-    actual = "@cu__env_logger-0.10.2//:env_logger",
-    tags = ["manual"],
-)
-
-alias(
-    name = "env_logger",
-    actual = "@cu__env_logger-0.10.2//:env_logger",
-    tags = ["manual"],
-)
-
-alias(
-    name = "log-0.4.22",
-    actual = "@cu__log-0.4.22//:log",
+    name = "log-0.4.29",
+    actual = "@cu__log-0.4.29//:log",
     tags = ["manual"],
 )
 
 alias(
     name = "log",
-    actual = "@cu__log-0.4.22//:log",
-    tags = ["manual"],
-)
-
-alias(
-    name = "once_cell-1.19.0",
-    actual = "@cu__once_cell-1.19.0//:once_cell",
-    tags = ["manual"],
-)
-
-alias(
-    name = "once_cell",
-    actual = "@cu__once_cell-1.19.0//:once_cell",
-    tags = ["manual"],
-)
-
-alias(
-    name = "tracing-0.1.40",
-    actual = "@cu__tracing-0.1.40//:tracing",
-    tags = ["manual"],
-)
-
-alias(
-    name = "tracing",
-    actual = "@cu__tracing-0.1.40//:tracing",
-    tags = ["manual"],
-)
-
-alias(
-    name = "wasmtime-24.0.0",
-    actual = "@cu__wasmtime-24.0.0//:wasmtime",
-    tags = ["manual"],
-)
-
-alias(
-    name = "wasmtime",
-    actual = "@cu__wasmtime-24.0.0//:wasmtime",
+    actual = "@cu__log-0.4.29//:log",
     tags = ["manual"],
 )
 
 alias(
-    name = "wasmtime-c-api-macros-24.0.0",
-    actual = "@cu__wasmtime-c-api-macros-24.0.0//:wasmtime_c_api_macros",
+    name = "wasmtime-c-api-impl-24.0.0",
+    actual = "@cu__wasmtime-c-api-impl-24.0.0//:wasmtime_c_api",
     tags = ["manual"],
 )
 
 alias(
-    name = "wasmtime-c-api-macros",
-    actual = "@cu__wasmtime-c-api-macros-24.0.0//:wasmtime_c_api_macros",
+    name = "wasmtime-c-api-impl",
+    actual = "@cu__wasmtime-c-api-impl-24.0.0//:wasmtime_c_api",
     tags = ["manual"],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-bforest-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-bforest-0.111.6.bazel
similarity index 94%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-bforest-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-bforest-0.111.6.bazel
index 33d2d7800..2194a02ad 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-bforest-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-bforest-0.111.6.bazel
@@ -49,8 +49,8 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
-        "@cu__cranelift-entity-0.111.0//:cranelift_entity",
+        "@cu__cranelift-entity-0.111.6//:cranelift_entity",
     ],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-bitset-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-bitset-0.111.6.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-bitset-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-bitset-0.111.6.bazel
index 2c47780b7..94850ef0c 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-bitset-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-bitset-0.111.6.bazel
@@ -55,7 +55,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
         "@cu__serde-1.0.204//:serde",
     ],
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-0.111.6.bazel
similarity index 84%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-0.111.6.bazel
index bfa4d11f6..9842a0db9 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-0.111.6.bazel
@@ -60,18 +60,18 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
         "@cu__bumpalo-3.16.0//:bumpalo",
-        "@cu__cranelift-bforest-0.111.0//:cranelift_bforest",
-        "@cu__cranelift-bitset-0.111.0//:cranelift_bitset",
-        "@cu__cranelift-codegen-0.111.0//:build_script_build",
-        "@cu__cranelift-codegen-shared-0.111.0//:cranelift_codegen_shared",
-        "@cu__cranelift-control-0.111.0//:cranelift_control",
-        "@cu__cranelift-entity-0.111.0//:cranelift_entity",
+        "@cu__cranelift-bforest-0.111.6//:cranelift_bforest",
+        "@cu__cranelift-bitset-0.111.6//:cranelift_bitset",
+        "@cu__cranelift-codegen-0.111.6//:build_script_build",
+        "@cu__cranelift-codegen-shared-0.111.6//:cranelift_codegen_shared",
+        "@cu__cranelift-control-0.111.6//:cranelift_control",
+        "@cu__cranelift-entity-0.111.6//:cranelift_entity",
         "@cu__gimli-0.29.0//:gimli",
         "@cu__hashbrown-0.14.5//:hashbrown",
-        "@cu__log-0.4.22//:log",
+        "@cu__log-0.4.29//:log",
         "@cu__regalloc2-0.9.3//:regalloc2",
         "@cu__rustc-hash-1.1.0//:rustc_hash",
         "@cu__smallvec-1.13.2//:smallvec",
@@ -134,11 +134,11 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     visibility = ["//visibility:private"],
     deps = [
-        "@cu__cranelift-codegen-meta-0.111.0//:cranelift_codegen_meta",
-        "@cu__cranelift-isle-0.111.0//:cranelift_isle",
+        "@cu__cranelift-codegen-meta-0.111.6//:cranelift_codegen_meta",
+        "@cu__cranelift-isle-0.111.6//:cranelift_isle",
     ],
 )
 
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-meta-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-meta-0.111.6.bazel
similarity index 93%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-meta-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-meta-0.111.6.bazel
index 0134446bb..ac1f0ad65 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-meta-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-meta-0.111.6.bazel
@@ -49,8 +49,8 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
-        "@cu__cranelift-codegen-shared-0.111.0//:cranelift_codegen_shared",
+        "@cu__cranelift-codegen-shared-0.111.6//:cranelift_codegen_shared",
     ],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-shared-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-shared-0.111.6.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-shared-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-shared-0.111.6.bazel
index c517dfdf1..667e52e89 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-shared-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-codegen-shared-0.111.6.bazel
@@ -49,5 +49,5 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-control-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-control-0.111.6.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-control-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-control-0.111.6.bazel
index a39be0fc7..b065f6f27 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-control-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-control-0.111.6.bazel
@@ -53,7 +53,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
         "@cu__arbitrary-1.3.2//:arbitrary",
     ],
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-entity-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-entity-0.111.6.bazel
similarity index 94%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-entity-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-entity-0.111.6.bazel
index 02af1d429..2bba7fbd6 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-entity-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-entity-0.111.6.bazel
@@ -57,9 +57,9 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
-        "@cu__cranelift-bitset-0.111.0//:cranelift_bitset",
+        "@cu__cranelift-bitset-0.111.6//:cranelift_bitset",
         "@cu__serde-1.0.204//:serde",
     ],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-frontend-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-frontend-0.111.6.bazel
similarity index 92%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-frontend-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-frontend-0.111.6.bazel
index 34815b864..0c6729ca2 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-frontend-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-frontend-0.111.6.bazel
@@ -53,10 +53,10 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
-        "@cu__cranelift-codegen-0.111.0//:cranelift_codegen",
-        "@cu__log-0.4.22//:log",
+        "@cu__cranelift-codegen-0.111.6//:cranelift_codegen",
+        "@cu__log-0.4.29//:log",
         "@cu__smallvec-1.13.2//:smallvec",
         "@cu__target-lexicon-0.12.16//:target_lexicon",
     ],
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-isle-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-isle-0.111.6.bazel
similarity index 96%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-isle-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-isle-0.111.6.bazel
index 2f938dd6f..4656ac668 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-isle-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-isle-0.111.6.bazel
@@ -56,9 +56,9 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
-        "@cu__cranelift-isle-0.111.0//:build_script_build",
+        "@cu__cranelift-isle-0.111.6//:build_script_build",
     ],
 )
 
@@ -113,7 +113,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     visibility = ["//visibility:private"],
 )
 
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-native-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-native-0.111.6.bazel
similarity index 86%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-native-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-native-0.111.6.bazel
index 628e6ddb8..7ea0f8350 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-native-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-native-0.111.6.bazel
@@ -53,19 +53,19 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
-        "@cu__cranelift-codegen-0.111.0//:cranelift_codegen",
+        "@cu__cranelift-codegen-0.111.6//:cranelift_codegen",
         "@cu__target-lexicon-0.12.16//:target_lexicon",
     ] + select({
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_arch = "s390x", target_arch = "riscv64"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_arch = "s390x", target_arch = "riscv64"))
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_arch = "s390x", target_arch = "riscv64"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_arch = "s390x", target_arch = "riscv64"))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_arch = "s390x", target_arch = "riscv64"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_arch = "s390x", target_arch = "riscv64"))
         ],
         "//conditions:default": [],
     }),
diff --git a/bazel/cargo/wasmtime/remote/BUILD.cranelift-wasm-0.111.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.cranelift-wasm-0.111.6.bazel
similarity index 83%
rename from bazel/cargo/wasmtime/remote/BUILD.cranelift-wasm-0.111.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.cranelift-wasm-0.111.6.bazel
index 901d06c54..13c462189 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.cranelift-wasm-0.111.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.cranelift-wasm-0.111.6.bazel
@@ -53,15 +53,15 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.111.0",
+    version = "0.111.6",
     deps = [
-        "@cu__cranelift-codegen-0.111.0//:cranelift_codegen",
-        "@cu__cranelift-entity-0.111.0//:cranelift_entity",
-        "@cu__cranelift-frontend-0.111.0//:cranelift_frontend",
+        "@cu__cranelift-codegen-0.111.6//:cranelift_codegen",
+        "@cu__cranelift-entity-0.111.6//:cranelift_entity",
+        "@cu__cranelift-frontend-0.111.6//:cranelift_frontend",
         "@cu__itertools-0.12.1//:itertools",
-        "@cu__log-0.4.22//:log",
+        "@cu__log-0.4.29//:log",
         "@cu__smallvec-1.13.2//:smallvec",
         "@cu__wasmparser-0.215.0//:wasmparser",
-        "@cu__wasmtime-types-24.0.0//:wasmtime_types",
+        "@cu__wasmtime-types-24.0.6//:wasmtime_types",
     ],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.env_logger-0.10.2.bazel b/bazel/cargo/wasmtime/remote/BUILD.env_logger-0.10.2.bazel
deleted file mode 100644
index 417a7159c..000000000
--- a/bazel/cargo/wasmtime/remote/BUILD.env_logger-0.10.2.bazel
+++ /dev/null
@@ -1,67 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @//bazel/cargo/wasmtime:crates_vendor
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "env_logger",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "auto-color",
-        "color",
-        "default",
-        "humantime",
-        "regex",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=env_logger",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.10.2",
-    deps = [
-        "@cu__humantime-2.1.0//:humantime",
-        "@cu__is-terminal-0.4.12//:is_terminal",
-        "@cu__log-0.4.22//:log",
-        "@cu__regex-1.10.5//:regex",
-        "@cu__termcolor-1.4.1//:termcolor",
-    ],
-)
diff --git a/bazel/cargo/wasmtime/remote/BUILD.errno-0.3.9.bazel b/bazel/cargo/wasmtime/remote/BUILD.errno-0.3.14.bazel
similarity index 71%
rename from bazel/cargo/wasmtime/remote/BUILD.errno-0.3.9.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.errno-0.3.14.bazel
index e97367042..0220b5cf2 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.errno-0.3.9.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.errno-0.3.14.bazel
@@ -52,106 +52,106 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.3.9",
+    version = "0.3.14",
     deps = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
             "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
             "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@cu__libc-0.2.155//:libc",  # cfg(target_os = "wasi")
+            "@cu__libc-0.2.182//:libc",  # cfg(target_os = "wasi")
         ],
         "@rules_rust//rust/platform:wasm32-wasip1-threads": [
-            "@cu__libc-0.2.155//:libc",  # cfg(target_os = "wasi")
+            "@cu__libc-0.2.182//:libc",  # cfg(target_os = "wasi")
         ],
         "@rules_rust//rust/platform:wasm32-wasip2": [
-            "@cu__libc-0.2.155//:libc",  # cfg(target_os = "wasi")
+            "@cu__libc-0.2.182//:libc",  # cfg(target_os = "wasi")
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
             "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(unix)
+            "@cu__libc-0.2.182//:libc",  # cfg(unix)
         ],
         "//conditions:default": [],
     }),
diff --git a/bazel/cargo/wasmtime/remote/BUILD.hermit-abi-0.3.9.bazel b/bazel/cargo/wasmtime/remote/BUILD.hermit-abi-0.3.9.bazel
deleted file mode 100644
index 519b1dc8d..000000000
--- a/bazel/cargo/wasmtime/remote/BUILD.hermit-abi-0.3.9.bazel
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @//bazel/cargo/wasmtime:crates_vendor
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "hermit_abi",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=hermit-abi",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.3.9",
-)
diff --git a/bazel/cargo/wasmtime/remote/BUILD.humantime-2.1.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.humantime-2.1.0.bazel
deleted file mode 100644
index 85b3772f9..000000000
--- a/bazel/cargo/wasmtime/remote/BUILD.humantime-2.1.0.bazel
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @//bazel/cargo/wasmtime:crates_vendor
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "humantime",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=humantime",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "2.1.0",
-)
diff --git a/bazel/cargo/wasmtime/remote/BUILD.is-terminal-0.4.12.bazel b/bazel/cargo/wasmtime/remote/BUILD.is-terminal-0.4.12.bazel
deleted file mode 100644
index eade1df3c..000000000
--- a/bazel/cargo/wasmtime/remote/BUILD.is-terminal-0.4.12.bazel
+++ /dev/null
@@ -1,155 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @//bazel/cargo/wasmtime:crates_vendor
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "is_terminal",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=is-terminal",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.4.12",
-    deps = select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:i686-linux-android": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:wasm32-wasip1-threads": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:wasm32-wasip2": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(unix, target_os = "wasi"))
-        ],
-        "//conditions:default": [],
-    }),
-)
diff --git a/bazel/cargo/wasmtime/remote/BUILD.libc-0.2.155.bazel b/bazel/cargo/wasmtime/remote/BUILD.libc-0.2.182.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.libc-0.2.155.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.libc-0.2.182.bazel
index 896d5b171..eba1c340a 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.libc-0.2.155.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.libc-0.2.182.bazel
@@ -99,7 +99,7 @@ rust_library(
         "//conditions:default": [],
     }),
     crate_root = "src/lib.rs",
-    edition = "2015",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -113,9 +113,9 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.155",
+    version = "0.2.182",
     deps = [
-        "@cu__libc-0.2.155//:build_script_build",
+        "@cu__libc-0.2.182//:build_script_build",
     ],
 )
 
@@ -212,7 +212,7 @@ cargo_build_script(
             "WORKSPACE.bazel",
         ],
     ),
-    edition = "2015",
+    edition = "2021",
     pkg_name = "libc",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -227,7 +227,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.155",
+    version = "0.2.182",
     visibility = ["//visibility:private"],
 )
 
diff --git a/bazel/cargo/wasmtime/remote/BUILD.log-0.4.22.bazel b/bazel/cargo/wasmtime/remote/BUILD.log-0.4.29.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.log-0.4.22.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.log-0.4.29.bazel
index ba6f7fef4..419676cb3 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.log-0.4.22.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.log-0.4.29.bazel
@@ -52,5 +52,5 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.4.22",
+    version = "0.4.29",
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.mach2-0.4.2.bazel b/bazel/cargo/wasmtime/remote/BUILD.mach2-0.4.2.bazel
index 5b3487ae6..14ab28623 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.mach2-0.4.2.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.mach2-0.4.2.bazel
@@ -55,22 +55,22 @@ rust_library(
     version = "0.4.2",
     deps = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "macos", target_os = "ios"))
         ],
         "//conditions:default": [],
     }),
diff --git a/bazel/cargo/wasmtime/remote/BUILD.regalloc2-0.9.3.bazel b/bazel/cargo/wasmtime/remote/BUILD.regalloc2-0.9.3.bazel
index a973842b2..136fc6128 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.regalloc2-0.9.3.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.regalloc2-0.9.3.bazel
@@ -58,7 +58,7 @@ rust_library(
     version = "0.9.3",
     deps = [
         "@cu__hashbrown-0.13.2//:hashbrown",
-        "@cu__log-0.4.22//:log",
+        "@cu__log-0.4.29//:log",
         "@cu__rustc-hash-1.1.0//:rustc_hash",
         "@cu__slice-group-by-0.3.1//:slice_group_by",
         "@cu__smallvec-1.13.2//:smallvec",
diff --git a/bazel/cargo/wasmtime/remote/BUILD.regex-1.10.5.bazel b/bazel/cargo/wasmtime/remote/BUILD.regex-1.10.5.bazel
deleted file mode 100644
index 33cd9e922..000000000
--- a/bazel/cargo/wasmtime/remote/BUILD.regex-1.10.5.bazel
+++ /dev/null
@@ -1,69 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @//bazel/cargo/wasmtime:crates_vendor
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "regex",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "perf",
-        "perf-backtrack",
-        "perf-cache",
-        "perf-dfa",
-        "perf-inline",
-        "perf-literal",
-        "perf-onepass",
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=regex",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.10.5",
-    deps = [
-        "@cu__aho-corasick-1.1.3//:aho_corasick",
-        "@cu__memchr-2.7.4//:memchr",
-        "@cu__regex-automata-0.4.7//:regex_automata",
-        "@cu__regex-syntax-0.8.4//:regex_syntax",
-    ],
-)
diff --git a/bazel/cargo/wasmtime/remote/BUILD.regex-automata-0.4.7.bazel b/bazel/cargo/wasmtime/remote/BUILD.regex-automata-0.4.7.bazel
deleted file mode 100644
index b95fba8c5..000000000
--- a/bazel/cargo/wasmtime/remote/BUILD.regex-automata-0.4.7.bazel
+++ /dev/null
@@ -1,73 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @//bazel/cargo/wasmtime:crates_vendor
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "regex_automata",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "alloc",
-        "dfa-onepass",
-        "hybrid",
-        "meta",
-        "nfa-backtrack",
-        "nfa-pikevm",
-        "nfa-thompson",
-        "perf-inline",
-        "perf-literal",
-        "perf-literal-multisubstring",
-        "perf-literal-substring",
-        "std",
-        "syntax",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=regex-automata",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.4.7",
-    deps = [
-        "@cu__aho-corasick-1.1.3//:aho_corasick",
-        "@cu__memchr-2.7.4//:memchr",
-        "@cu__regex-syntax-0.8.4//:regex_syntax",
-    ],
-)
diff --git a/bazel/cargo/wasmtime/remote/BUILD.regex-syntax-0.8.4.bazel b/bazel/cargo/wasmtime/remote/BUILD.regex-syntax-0.8.4.bazel
deleted file mode 100644
index 6ff8c9312..000000000
--- a/bazel/cargo/wasmtime/remote/BUILD.regex-syntax-0.8.4.bazel
+++ /dev/null
@@ -1,56 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-#     bazel run @//bazel/cargo/wasmtime:crates_vendor
-###############################################################################
-
-load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "regex_syntax",
-    srcs = glob(
-        include = ["**/*.rs"],
-        allow_empty = True,
-    ),
-    compile_data = glob(
-        include = ["**"],
-        allow_empty = True,
-        exclude = [
-            "**/* *",
-            ".tmp_git_root/**/*",
-            "BUILD",
-            "BUILD.bazel",
-            "WORKSPACE",
-            "WORKSPACE.bazel",
-        ],
-    ),
-    crate_features = [
-        "std",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2021",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=regex-syntax",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "0.8.4",
-)
diff --git a/bazel/cargo/wasmtime/remote/BUILD.rustix-0.38.34.bazel b/bazel/cargo/wasmtime/remote/BUILD.rustix-0.38.34.bazel
index 8af94c4be..0d982665d 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.rustix-0.38.34.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.rustix-0.38.34.bazel
@@ -28,100 +28,100 @@ rust_library(
     ),
     aliases = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # aarch64-apple-darwin, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # aarch64-apple-darwin, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:aarch64-apple-ios": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # aarch64-apple-ios, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # aarch64-apple-ios, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # aarch64-apple-ios-sim, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # aarch64-apple-ios-sim, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:aarch64-linux-android": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # aarch64-linux-android, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # aarch64-linux-android, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(windows)
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(windows)
         },
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # aarch64-unknown-fuchsia, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # aarch64-unknown-fuchsia, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # aarch64-unknown-nto-qnx710, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # aarch64-unknown-nto-qnx710, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:aarch64-unknown-uefi": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:armv7-linux-androideabi": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # armv7-linux-androideabi, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # armv7-linux-androideabi, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:i686-apple-darwin": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-apple-darwin
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-apple-darwin
         },
         "@rules_rust//rust/platform:i686-linux-android": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-linux-android
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-linux-android
         },
         "@rules_rust//rust/platform:i686-pc-windows-msvc": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(windows)
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(windows)
         },
         "@rules_rust//rust/platform:i686-unknown-freebsd": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-unknown-freebsd
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-unknown-freebsd
         },
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), powerpc-unknown-linux-gnu
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), powerpc-unknown-linux-gnu
         },
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), s390x-unknown-linux-gnu
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), s390x-unknown-linux-gnu
         },
         "@rules_rust//rust/platform:thumbv7em-none-eabi": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), wasm32-unknown-emscripten
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), wasm32-unknown-emscripten
         },
         "@rules_rust//rust/platform:wasm32-unknown-unknown": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:wasm32-wasip1": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:wasm32-wasip1-threads": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:wasm32-wasip2": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:x86_64-apple-darwin": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-darwin
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-darwin
         },
         "@rules_rust//rust/platform:x86_64-apple-ios": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-ios
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-ios
         },
         "@rules_rust//rust/platform:x86_64-linux-android": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-linux-android
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-linux-android
         },
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(windows)
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(windows)
         },
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-freebsd
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-freebsd
         },
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-fuchsia
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-fuchsia
         },
         "@rules_rust//rust/platform:x86_64-unknown-none": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "@rules_rust//rust/platform:x86_64-unknown-uefi": {
-            "@cu__errno-0.3.9//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno": "libc_errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         },
         "//conditions:default": {},
     }),
@@ -201,29 +201,29 @@ rust_library(
         "@cu__rustix-0.38.34//:build_script_build",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@cu__errno-0.3.9//:errno",  # aarch64-apple-darwin, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # aarch64-apple-darwin, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # aarch64-apple-darwin, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # aarch64-apple-darwin, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@cu__errno-0.3.9//:errno",  # aarch64-apple-ios, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # aarch64-apple-ios, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # aarch64-apple-ios, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # aarch64-apple-ios, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@cu__errno-0.3.9//:errno",  # aarch64-apple-ios-sim, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # aarch64-apple-ios-sim, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # aarch64-apple-ios-sim, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # aarch64-apple-ios-sim, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@cu__errno-0.3.9//:errno",  # aarch64-linux-android, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # aarch64-linux-android, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # aarch64-linux-android, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # aarch64-linux-android, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(any(target_os = "android", target_os = "linux"), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@cu__errno-0.3.9//:errno",  # cfg(windows)
+            "@cu__errno-0.3.14//:errno",  # cfg(windows)
             "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
-            "@cu__errno-0.3.9//:errno",  # aarch64-unknown-fuchsia, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # aarch64-unknown-fuchsia, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # aarch64-unknown-fuchsia, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # aarch64-unknown-fuchsia, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))
@@ -232,12 +232,12 @@ rust_library(
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
-            "@cu__errno-0.3.9//:errno",  # aarch64-unknown-nto-qnx710, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # aarch64-unknown-nto-qnx710, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # aarch64-unknown-nto-qnx710, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # aarch64-unknown-nto-qnx710, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-uefi": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))
@@ -246,106 +246,106 @@ rust_library(
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@cu__errno-0.3.9//:errno",  # armv7-linux-androideabi, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # armv7-linux-androideabi, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # armv7-linux-androideabi, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # armv7-linux-androideabi, cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(any(target_os = "android", target_os = "linux"), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-apple-darwin
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-apple-darwin
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-apple-darwin
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-apple-darwin
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-linux-android
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-linux-android
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-linux-android
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-linux-android
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(any(target_os = "android", target_os = "linux"), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@cu__errno-0.3.9//:errno",  # cfg(windows)
+            "@cu__errno-0.3.14//:errno",  # cfg(windows)
             "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-unknown-freebsd
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-unknown-freebsd
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-unknown-freebsd
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), i686-unknown-freebsd
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), powerpc-unknown-linux-gnu
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), powerpc-unknown-linux-gnu
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), powerpc-unknown-linux-gnu
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), powerpc-unknown-linux-gnu
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(any(target_os = "android", target_os = "linux"), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), s390x-unknown-linux-gnu
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), s390x-unknown-linux-gnu
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), s390x-unknown-linux-gnu
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), s390x-unknown-linux-gnu
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(any(target_os = "android", target_os = "linux"), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:thumbv7em-none-eabi": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:wasm32-unknown-emscripten": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), wasm32-unknown-emscripten
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), wasm32-unknown-emscripten
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), wasm32-unknown-emscripten
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), wasm32-unknown-emscripten
         ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:wasm32-wasip1": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:wasm32-wasip1-threads": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:wasm32-wasip2": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-darwin
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-darwin
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-darwin
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-darwin
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-ios
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-ios
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-ios
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-apple-ios
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-linux-android
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-linux-android
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-linux-android
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-linux-android
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(any(target_os = "android", target_os = "linux"), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@cu__errno-0.3.9//:errno",  # cfg(windows)
+            "@cu__errno-0.3.14//:errno",  # cfg(windows)
             "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-freebsd
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-freebsd
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-freebsd
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-freebsd
         ],
         "@rules_rust//rust/platform:x86_64-unknown-fuchsia": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-fuchsia
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-fuchsia
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-fuchsia
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))))), x86_64-unknown-fuchsia
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))
@@ -354,12 +354,12 @@ rust_library(
             "@cu__linux-raw-sys-0.4.14//:linux_raw_sys",  # cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-none": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [
-            "@cu__errno-0.3.9//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
-            "@cu__libc-0.2.155//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__errno-0.3.14//:errno",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
+            "@cu__libc-0.2.182//:libc",  # cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))
         ],
         "//conditions:default": [],
     }),
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-24.0.6.bazel
similarity index 93%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-24.0.6.bazel
index 1789db36c..a0e767bed 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-24.0.6.bazel
@@ -49,7 +49,7 @@ rust_library(
     proc_macro_deps = [
         "@cu__paste-1.0.15//:paste",
         "@cu__serde_derive-1.0.204//:serde_derive",
-        "@cu__wasmtime-versioned-export-macros-24.0.0//:wasmtime_versioned_export_macros",
+        "@cu__wasmtime-versioned-export-macros-24.0.6//:wasmtime_versioned_export_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -64,7 +64,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     deps = [
         "@cu__anyhow-1.0.86//:anyhow",
         "@cu__bitflags-2.6.0//:bitflags",
@@ -72,9 +72,9 @@ rust_library(
         "@cu__cfg-if-1.0.0//:cfg_if",
         "@cu__hashbrown-0.14.5//:hashbrown",
         "@cu__indexmap-2.3.0//:indexmap",
-        "@cu__libc-0.2.155//:libc",
+        "@cu__libc-0.2.182//:libc",
         "@cu__libm-0.2.8//:libm",
-        "@cu__log-0.4.22//:log",
+        "@cu__log-0.4.29//:log",
         "@cu__object-0.36.2//:object",
         "@cu__once_cell-1.19.0//:once_cell",
         "@cu__postcard-1.0.8//:postcard",
@@ -83,12 +83,12 @@ rust_library(
         "@cu__sptr-0.3.2//:sptr",
         "@cu__target-lexicon-0.12.16//:target_lexicon",
         "@cu__wasmparser-0.215.0//:wasmparser",
-        "@cu__wasmtime-24.0.0//:build_script_build",
-        "@cu__wasmtime-asm-macros-24.0.0//:wasmtime_asm_macros",
-        "@cu__wasmtime-cranelift-24.0.0//:wasmtime_cranelift",
-        "@cu__wasmtime-environ-24.0.0//:wasmtime_environ",
-        "@cu__wasmtime-jit-icache-coherence-24.0.0//:wasmtime_jit_icache_coherence",
-        "@cu__wasmtime-slab-24.0.0//:wasmtime_slab",
+        "@cu__wasmtime-24.0.6//:build_script_build",
+        "@cu__wasmtime-asm-macros-24.0.6//:wasmtime_asm_macros",
+        "@cu__wasmtime-cranelift-24.0.6//:wasmtime_cranelift",
+        "@cu__wasmtime-environ-24.0.6//:wasmtime_environ",
+        "@cu__wasmtime-jit-icache-coherence-24.0.6//:wasmtime_jit_icache_coherence",
+        "@cu__wasmtime-slab-24.0.6//:wasmtime_slab",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
             "@cu__mach2-0.4.2//:mach2",  # aarch64-apple-darwin
@@ -241,7 +241,7 @@ cargo_build_script(
     edition = "2021",
     pkg_name = "wasmtime",
     proc_macro_deps = [
-        "@cu__wasmtime-versioned-export-macros-24.0.0//:wasmtime_versioned_export_macros",
+        "@cu__wasmtime-versioned-export-macros-24.0.6//:wasmtime_versioned_export_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -256,7 +256,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     visibility = ["//visibility:private"],
     deps = [
         "@cu__cc-1.1.7//:cc",
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-asm-macros-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-asm-macros-24.0.6.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-asm-macros-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-asm-macros-24.0.6.bazel
index 5b883981c..fcaed16ef 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-asm-macros-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-asm-macros-24.0.6.bazel
@@ -49,7 +49,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     deps = [
         "@cu__cfg-if-1.0.0//:cfg_if",
     ],
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-c-api-impl-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-c-api-impl-24.0.0.bazel
new file mode 100644
index 000000000..e69b891d4
--- /dev/null
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-c-api-impl-24.0.0.bazel
@@ -0,0 +1,133 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @//bazel/cargo/wasmtime:crates_vendor
+###############################################################################
+
+load(
+    "@rules_rust//cargo:defs.bzl",
+    "cargo_build_script",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "wasmtime_c_api",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "cranelift",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    proc_macro_deps = [
+        "@cu__wasmtime-c-api-macros-24.0.0//:wasmtime_c_api_macros",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasmtime-c-api-impl",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "24.0.0",
+    deps = [
+        "@cu__anyhow-1.0.86//:anyhow",
+        "@cu__log-0.4.29//:log",
+        "@cu__once_cell-1.19.0//:once_cell",
+        "@cu__tracing-0.1.40//:tracing",
+        "@cu__wasmtime-24.0.6//:wasmtime",
+        "@cu__wasmtime-c-api-impl-24.0.0//:build_script_build",
+    ],
+)
+
+cargo_build_script(
+    name = "_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            "**/*.rs",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_features = [
+        "cranelift",
+    ],
+    crate_name = "build_script_build",
+    crate_root = "build.rs",
+    data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    edition = "2021",
+    links = "wasmtime-c-api",
+    pkg_name = "wasmtime-c-api-impl",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasmtime-c-api-impl",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "24.0.0",
+    visibility = ["//visibility:private"],
+)
+
+alias(
+    name = "build_script_build",
+    actual = ":_bs",
+    tags = ["manual"],
+)
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-macro-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-macro-24.0.6.bazel
similarity index 92%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-macro-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-macro-24.0.6.bazel
index 30add7a43..44424d5ef 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-macro-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-macro-24.0.6.bazel
@@ -53,15 +53,15 @@ rust_proc_macro(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     deps = [
         "@cu__anyhow-1.0.86//:anyhow",
         "@cu__proc-macro2-1.0.86//:proc_macro2",
         "@cu__quote-1.0.36//:quote",
         "@cu__syn-2.0.72//:syn",
-        "@cu__wasmtime-component-macro-24.0.0//:build_script_build",
-        "@cu__wasmtime-component-util-24.0.0//:wasmtime_component_util",
-        "@cu__wasmtime-wit-bindgen-24.0.0//:wasmtime_wit_bindgen",
+        "@cu__wasmtime-component-macro-24.0.6//:build_script_build",
+        "@cu__wasmtime-component-util-24.0.6//:wasmtime_component_util",
+        "@cu__wasmtime-wit-bindgen-24.0.6//:wasmtime_wit_bindgen",
         "@cu__wit-parser-0.215.0//:wit_parser",
     ],
 )
@@ -114,7 +114,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     visibility = ["//visibility:private"],
 )
 
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-util-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-util-24.0.6.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-util-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-util-24.0.6.bazel
index 4730a5c58..11a024a70 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-util-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-component-util-24.0.6.bazel
@@ -49,5 +49,5 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-cranelift-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-cranelift-24.0.6.bazel
similarity index 76%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-cranelift-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-cranelift-24.0.6.bazel
index 35432a774..87b61def1 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-cranelift-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-cranelift-24.0.6.bazel
@@ -40,7 +40,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@cu__wasmtime-versioned-export-macros-24.0.0//:wasmtime_versioned_export_macros",
+        "@cu__wasmtime-versioned-export-macros-24.0.6//:wasmtime_versioned_export_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -55,22 +55,22 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     deps = [
         "@cu__anyhow-1.0.86//:anyhow",
         "@cu__cfg-if-1.0.0//:cfg_if",
-        "@cu__cranelift-codegen-0.111.0//:cranelift_codegen",
-        "@cu__cranelift-control-0.111.0//:cranelift_control",
-        "@cu__cranelift-entity-0.111.0//:cranelift_entity",
-        "@cu__cranelift-frontend-0.111.0//:cranelift_frontend",
-        "@cu__cranelift-native-0.111.0//:cranelift_native",
-        "@cu__cranelift-wasm-0.111.0//:cranelift_wasm",
+        "@cu__cranelift-codegen-0.111.6//:cranelift_codegen",
+        "@cu__cranelift-control-0.111.6//:cranelift_control",
+        "@cu__cranelift-entity-0.111.6//:cranelift_entity",
+        "@cu__cranelift-frontend-0.111.6//:cranelift_frontend",
+        "@cu__cranelift-native-0.111.6//:cranelift_native",
+        "@cu__cranelift-wasm-0.111.6//:cranelift_wasm",
         "@cu__gimli-0.29.0//:gimli",
-        "@cu__log-0.4.22//:log",
+        "@cu__log-0.4.29//:log",
         "@cu__object-0.36.2//:object",
         "@cu__target-lexicon-0.12.16//:target_lexicon",
         "@cu__thiserror-1.0.63//:thiserror",
         "@cu__wasmparser-0.215.0//:wasmparser",
-        "@cu__wasmtime-environ-24.0.0//:wasmtime_environ",
+        "@cu__wasmtime-environ-24.0.6//:wasmtime_environ",
     ],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-environ-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-environ-24.0.6.bazel
similarity index 89%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-environ-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-environ-24.0.6.bazel
index 344f2e2a6..90ebbe25f 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-environ-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-environ-24.0.6.bazel
@@ -57,14 +57,14 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     deps = [
         "@cu__anyhow-1.0.86//:anyhow",
-        "@cu__cranelift-bitset-0.111.0//:cranelift_bitset",
-        "@cu__cranelift-entity-0.111.0//:cranelift_entity",
+        "@cu__cranelift-bitset-0.111.6//:cranelift_bitset",
+        "@cu__cranelift-entity-0.111.6//:cranelift_entity",
         "@cu__gimli-0.29.0//:gimli",
         "@cu__indexmap-2.3.0//:indexmap",
-        "@cu__log-0.4.22//:log",
+        "@cu__log-0.4.29//:log",
         "@cu__object-0.36.2//:object",
         "@cu__postcard-1.0.8//:postcard",
         "@cu__serde-1.0.204//:serde",
@@ -72,6 +72,6 @@ rust_library(
         "@cu__wasm-encoder-0.215.0//:wasm_encoder",
         "@cu__wasmparser-0.215.0//:wasmparser",
         "@cu__wasmprinter-0.215.0//:wasmprinter",
-        "@cu__wasmtime-types-24.0.0//:wasmtime_types",
+        "@cu__wasmtime-types-24.0.6//:wasmtime_types",
     ],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-jit-icache-coherence-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-jit-icache-coherence-24.0.6.bazel
similarity index 79%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-jit-icache-coherence-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-jit-icache-coherence-24.0.6.bazel
index 16c7d86a0..bce80d055 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-jit-icache-coherence-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-jit-icache-coherence-24.0.6.bazel
@@ -49,79 +49,79 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     deps = [
         "@cu__anyhow-1.0.86//:anyhow",
         "@cu__cfg-if-1.0.0//:cfg_if",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:aarch64-linux-android": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
             "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:i686-linux-android": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
             "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-linux-android": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
             "@cu__windows-sys-0.52.0//:windows_sys",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@cu__libc-0.2.155//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
+            "@cu__libc-0.2.182//:libc",  # cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd", target_os = "android"))
         ],
         "//conditions:default": [],
     }),
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-slab-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-slab-24.0.6.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-slab-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-slab-24.0.6.bazel
index 8ac640baf..5c1df496d 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-slab-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-slab-24.0.6.bazel
@@ -49,5 +49,5 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-types-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-types-24.0.6.bazel
similarity index 95%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-types-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-types-24.0.6.bazel
index 290b53136..44c567334 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-types-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-types-24.0.6.bazel
@@ -55,10 +55,10 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     deps = [
         "@cu__anyhow-1.0.86//:anyhow",
-        "@cu__cranelift-entity-0.111.0//:cranelift_entity",
+        "@cu__cranelift-entity-0.111.6//:cranelift_entity",
         "@cu__serde-1.0.204//:serde",
         "@cu__smallvec-1.13.2//:smallvec",
         "@cu__wasmparser-0.215.0//:wasmparser",
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-versioned-export-macros-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-versioned-export-macros-24.0.6.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-versioned-export-macros-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-versioned-export-macros-24.0.6.bazel
index a16e49c78..94e30f1a1 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-versioned-export-macros-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-versioned-export-macros-24.0.6.bazel
@@ -49,7 +49,7 @@ rust_proc_macro(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     deps = [
         "@cu__proc-macro2-1.0.86//:proc_macro2",
         "@cu__quote-1.0.36//:quote",
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-wit-bindgen-24.0.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-wit-bindgen-24.0.6.bazel
similarity index 98%
rename from bazel/cargo/wasmtime/remote/BUILD.wasmtime-wit-bindgen-24.0.0.bazel
rename to bazel/cargo/wasmtime/remote/BUILD.wasmtime-wit-bindgen-24.0.6.bazel
index 50433c3e6..35deea102 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wasmtime-wit-bindgen-24.0.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wasmtime-wit-bindgen-24.0.6.bazel
@@ -49,7 +49,7 @@ rust_library(
         "noclippy",
         "norustfmt",
     ],
-    version = "24.0.0",
+    version = "24.0.6",
     deps = [
         "@cu__anyhow-1.0.86//:anyhow",
         "@cu__heck-0.4.1//:heck",
diff --git a/bazel/cargo/wasmtime/remote/BUILD.wit-parser-0.215.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.wit-parser-0.215.0.bazel
index 8e00d6c82..93c013da4 100644
--- a/bazel/cargo/wasmtime/remote/BUILD.wit-parser-0.215.0.bazel
+++ b/bazel/cargo/wasmtime/remote/BUILD.wit-parser-0.215.0.bazel
@@ -63,7 +63,7 @@ rust_library(
         "@cu__anyhow-1.0.86//:anyhow",
         "@cu__id-arena-2.2.1//:id_arena",
         "@cu__indexmap-2.3.0//:indexmap",
-        "@cu__log-0.4.22//:log",
+        "@cu__log-0.4.29//:log",
         "@cu__semver-1.0.23//:semver",
         "@cu__serde-1.0.204//:serde",
         "@cu__serde_json-1.0.120//:serde_json",
diff --git a/bazel/cargo/wasmtime/remote/defs.bzl b/bazel/cargo/wasmtime/remote/defs.bzl
index 60eac2e7e..9fb948bb4 100644
--- a/bazel/cargo/wasmtime/remote/defs.bzl
+++ b/bazel/cargo/wasmtime/remote/defs.bzl
@@ -16,7 +16,6 @@
 """
 
 load("@bazel_skylib//lib:selects.bzl", "selects")
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
@@ -296,12 +295,8 @@ def aliases(
 _NORMAL_DEPENDENCIES = {
     "bazel/cargo/wasmtime": {
         _COMMON_CONDITION: {
-            "anyhow": Label("@cu//:anyhow-1.0.86"),
-            "env_logger": Label("@cu//:env_logger-0.10.2"),
-            "log": Label("@cu//:log-0.4.22"),
-            "once_cell": Label("@cu//:once_cell-1.19.0"),
-            "tracing": Label("@cu//:tracing-0.1.40"),
-            "wasmtime": Label("@cu//:wasmtime-24.0.0"),
+            "log": Label("@cu//:log-0.4.29"),
+            "wasmtime-c-api-impl": Label("@cu//:wasmtime-c-api-impl-24.0.0"),
         },
     },
 }
@@ -325,9 +320,6 @@ _NORMAL_DEV_ALIASES = {
 
 _PROC_MACRO_DEPENDENCIES = {
     "bazel/cargo/wasmtime": {
-        _COMMON_CONDITION: {
-            "wasmtime-c-api-macros": Label("@cu//:wasmtime-c-api-macros-24.0.0"),
-        },
     },
 }
 
@@ -394,7 +386,6 @@ _CONDITIONS = {
     "cfg(any(target_arch = \"s390x\", target_arch = \"riscv64\"))": ["@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu"],
     "cfg(any(target_os = \"linux\", target_os = \"macos\", target_os = \"freebsd\", target_os = \"android\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
     "cfg(any(target_os = \"macos\", target_os = \"ios\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios"],
-    "cfg(any(unix, target_os = \"wasi\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
     "cfg(not(all(target_arch = \"arm\", target_os = \"none\")))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-apple-ios", "@rules_rust//rust/platform:aarch64-apple-ios-sim", "@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:aarch64-unknown-fuchsia", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu", "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710", "@rules_rust//rust/platform:aarch64-unknown-uefi", "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", "@rules_rust//rust/platform:arm-unknown-linux-musleabi", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi", "@rules_rust//rust/platform:i686-apple-darwin", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:i686-pc-windows-msvc", "@rules_rust//rust/platform:i686-unknown-freebsd", "@rules_rust//rust/platform:i686-unknown-linux-gnu", "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv32imc-unknown-none-elf", "@rules_rust//rust/platform:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:riscv64gc-unknown-none-elf", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none", "@rules_rust//rust/platform:x86_64-unknown-uefi"],
     "cfg(target_os = \"hermit\")": [],
     "cfg(target_os = \"wasi\")": ["@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
@@ -450,16 +441,6 @@ def crate_repositories():
         build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.ahash-0.8.11.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "cu__aho-corasick-1.1.3",
-        sha256 = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/aho-corasick/1.1.3/download"],
-        strip_prefix = "aho-corasick-1.1.3",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.aho-corasick-1.1.3.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "cu__anyhow-1.0.86",
@@ -532,112 +513,112 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "cu__cranelift-bforest-0.111.0",
-        sha256 = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6",
+        name = "cu__cranelift-bforest-0.111.6",
+        sha256 = "bd5d0c30fdfa774bd91e7261f7fd56da9fce457da89a8442b3648a3af46775d5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-bforest/0.111.0/download"],
-        strip_prefix = "cranelift-bforest-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-bforest-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-bforest/0.111.6/download"],
+        strip_prefix = "cranelift-bforest-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-bforest-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-bitset-0.111.0",
-        sha256 = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded",
+        name = "cu__cranelift-bitset-0.111.6",
+        sha256 = "b3eb20c97ecf678a2041846f6093f54eea5dc5ea5752260885f5b8ece95dff42",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-bitset/0.111.0/download"],
-        strip_prefix = "cranelift-bitset-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-bitset-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-bitset/0.111.6/download"],
+        strip_prefix = "cranelift-bitset-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-bitset-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-codegen-0.111.0",
-        sha256 = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397",
+        name = "cu__cranelift-codegen-0.111.6",
+        sha256 = "44e40598708fd3c0a84d4c962330e5db04a30e751a957acbd310a775d05a5f4a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-codegen/0.111.0/download"],
-        strip_prefix = "cranelift-codegen-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-codegen-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-codegen/0.111.6/download"],
+        strip_prefix = "cranelift-codegen-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-codegen-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-codegen-meta-0.111.0",
-        sha256 = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06",
+        name = "cu__cranelift-codegen-meta-0.111.6",
+        sha256 = "71891d06220d3a4fd26e602138027d266a41062991e102614fbde7d9c9a645e5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-codegen-meta/0.111.0/download"],
-        strip_prefix = "cranelift-codegen-meta-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-codegen-meta-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-codegen-meta/0.111.6/download"],
+        strip_prefix = "cranelift-codegen-meta-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-codegen-meta-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-codegen-shared-0.111.0",
-        sha256 = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb",
+        name = "cu__cranelift-codegen-shared-0.111.6",
+        sha256 = "da72d65dba9a51ab9cbb105cf4e4aadd56b1eba68736f68d396a88a53a91cdb9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-codegen-shared/0.111.0/download"],
-        strip_prefix = "cranelift-codegen-shared-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-codegen-shared-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-codegen-shared/0.111.6/download"],
+        strip_prefix = "cranelift-codegen-shared-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-codegen-shared-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-control-0.111.0",
-        sha256 = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b",
+        name = "cu__cranelift-control-0.111.6",
+        sha256 = "485b4e673fd05c0e7bcef201b3ded21c0166e0d64dcdfc5fcf379c03fdce9775",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-control/0.111.0/download"],
-        strip_prefix = "cranelift-control-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-control-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-control/0.111.6/download"],
+        strip_prefix = "cranelift-control-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-control-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-entity-0.111.0",
-        sha256 = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130",
+        name = "cu__cranelift-entity-0.111.6",
+        sha256 = "e6d9e04e7bc3f8006b9b17fe014d98c0e4b65f97c63d536969dfdb7106a1559a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-entity/0.111.0/download"],
-        strip_prefix = "cranelift-entity-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-entity-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-entity/0.111.6/download"],
+        strip_prefix = "cranelift-entity-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-entity-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-frontend-0.111.0",
-        sha256 = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8",
+        name = "cu__cranelift-frontend-0.111.6",
+        sha256 = "5dd834ba2b0d75dbb7fddce9d1c581c9457d4303921025af2653f42ce4c27bcf",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-frontend/0.111.0/download"],
-        strip_prefix = "cranelift-frontend-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-frontend-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-frontend/0.111.6/download"],
+        strip_prefix = "cranelift-frontend-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-frontend-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-isle-0.111.0",
-        sha256 = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9",
+        name = "cu__cranelift-isle-0.111.6",
+        sha256 = "7714844e9223bb002fdb9b708798cfe92ec3fb4401b21ec6cca1ac0387819489",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-isle/0.111.0/download"],
-        strip_prefix = "cranelift-isle-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-isle-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-isle/0.111.6/download"],
+        strip_prefix = "cranelift-isle-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-isle-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-native-0.111.0",
-        sha256 = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b",
+        name = "cu__cranelift-native-0.111.6",
+        sha256 = "1570411d5b06b3252b58033973499142a3c4367888bb070e6b52bfcb1d3e158f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-native/0.111.0/download"],
-        strip_prefix = "cranelift-native-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-native-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-native/0.111.6/download"],
+        strip_prefix = "cranelift-native-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-native-0.111.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__cranelift-wasm-0.111.0",
-        sha256 = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68",
+        name = "cu__cranelift-wasm-0.111.6",
+        sha256 = "7f55d300101c656b79d93b1f4018838d03d9444507f8ddde1f6663b869d199a0",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cranelift-wasm/0.111.0/download"],
-        strip_prefix = "cranelift-wasm-0.111.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-wasm-0.111.0.bazel"),
+        urls = ["https://static.crates.io/crates/cranelift-wasm/0.111.6/download"],
+        strip_prefix = "cranelift-wasm-0.111.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.cranelift-wasm-0.111.6.bazel"),
     )
 
     maybe(
@@ -670,16 +651,6 @@ def crate_repositories():
         build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.embedded-io-0.4.0.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "cu__env_logger-0.10.2",
-        sha256 = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/env_logger/0.10.2/download"],
-        strip_prefix = "env_logger-0.10.2",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.env_logger-0.10.2.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "cu__equivalent-1.0.1",
@@ -692,12 +663,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "cu__errno-0.3.9",
-        sha256 = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba",
+        name = "cu__errno-0.3.14",
+        sha256 = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/errno/0.3.9/download"],
-        strip_prefix = "errno-0.3.9",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.errno-0.3.9.bazel"),
+        urls = ["https://static.crates.io/crates/errno/0.3.14/download"],
+        strip_prefix = "errno-0.3.14",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.errno-0.3.14.bazel"),
     )
 
     maybe(
@@ -750,26 +721,6 @@ def crate_repositories():
         build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.heck-0.4.1.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "cu__hermit-abi-0.3.9",
-        sha256 = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hermit-abi/0.3.9/download"],
-        strip_prefix = "hermit-abi-0.3.9",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.hermit-abi-0.3.9.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "cu__humantime-2.1.0",
-        sha256 = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/humantime/2.1.0/download"],
-        strip_prefix = "humantime-2.1.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.humantime-2.1.0.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "cu__id-arena-2.2.1",
@@ -790,16 +741,6 @@ def crate_repositories():
         build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.indexmap-2.3.0.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "cu__is-terminal-0.4.12",
-        sha256 = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/is-terminal/0.4.12/download"],
-        strip_prefix = "is-terminal-0.4.12",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.is-terminal-0.4.12.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "cu__itertools-0.12.1",
@@ -832,12 +773,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "cu__libc-0.2.155",
-        sha256 = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c",
+        name = "cu__libc-0.2.182",
+        sha256 = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/libc/0.2.155/download"],
-        strip_prefix = "libc-0.2.155",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.libc-0.2.155.bazel"),
+        urls = ["https://static.crates.io/crates/libc/0.2.182/download"],
+        strip_prefix = "libc-0.2.182",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.libc-0.2.182.bazel"),
     )
 
     maybe(
@@ -862,12 +803,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "cu__log-0.4.22",
-        sha256 = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24",
+        name = "cu__log-0.4.29",
+        sha256 = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/log/0.4.22/download"],
-        strip_prefix = "log-0.4.22",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.log-0.4.22.bazel"),
+        urls = ["https://static.crates.io/crates/log/0.4.29/download"],
+        strip_prefix = "log-0.4.29",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.log-0.4.29.bazel"),
     )
 
     maybe(
@@ -990,36 +931,6 @@ def crate_repositories():
         build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.regalloc2-0.9.3.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "cu__regex-1.10.5",
-        sha256 = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex/1.10.5/download"],
-        strip_prefix = "regex-1.10.5",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.regex-1.10.5.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "cu__regex-automata-0.4.7",
-        sha256 = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-automata/0.4.7/download"],
-        strip_prefix = "regex-automata-0.4.7",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.regex-automata-0.4.7.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "cu__regex-syntax-0.8.4",
-        sha256 = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/regex-syntax/0.8.4/download"],
-        strip_prefix = "regex-syntax-0.8.4",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.regex-syntax-0.8.4.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "cu__rustc-hash-1.1.0",
@@ -1272,122 +1183,132 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-24.0.0",
-        sha256 = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7",
+        name = "cu__wasmtime-24.0.6",
+        sha256 = "3548c6db0acd5c77eae418a2d8b05f963ae6f29be65aed64c652d2aa1eba8b9c",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasmtime/24.0.6/download"],
+        strip_prefix = "wasmtime-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-24.0.6.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "cu__wasmtime-asm-macros-24.0.6",
+        sha256 = "b78a28fc6b83b1f805d61a01aa0426f2f17b37110f86029b7d68ab105243d023",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime/24.0.0/download"],
-        strip_prefix = "wasmtime-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-asm-macros/24.0.6/download"],
+        strip_prefix = "wasmtime-asm-macros-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-asm-macros-24.0.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-asm-macros-24.0.0",
-        sha256 = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be",
+        name = "cu__wasmtime-c-api-impl-24.0.0",
+        sha256 = "765e302e7d9125e614aaeec3ad6b6083605393004eca00214106a4ff6b47fc58",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-asm-macros/24.0.0/download"],
-        strip_prefix = "wasmtime-asm-macros-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-asm-macros-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-c-api-impl/24.0.0/download"],
+        strip_prefix = "wasmtime-c-api-impl-24.0.0",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-c-api-impl-24.0.0.bazel"),
     )
 
     maybe(
-        new_git_repository,
+        http_archive,
         name = "cu__wasmtime-c-api-macros-24.0.0",
-        commit = "6fc3d274c7994dad20c816ccc0739bf766b39a11",
-        init_submodules = True,
-        remote = "https://github.com/bytecodealliance/wasmtime",
+        sha256 = "2d09d02eaa84aa2de5babee7b0296557ad6e4903bb10aa8d135e393e753a43d6",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/wasmtime-c-api-macros/24.0.0/download"],
+        strip_prefix = "wasmtime-c-api-macros-24.0.0",
         build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-c-api-macros-24.0.0.bazel"),
-        strip_prefix = "crates/c-api-macros",
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-component-macro-24.0.0",
-        sha256 = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf",
+        name = "cu__wasmtime-component-macro-24.0.6",
+        sha256 = "4d22bdf9af333562df78e1b841a3e5a2e99a1243346db973f1af42b93cb97732",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-component-macro/24.0.0/download"],
-        strip_prefix = "wasmtime-component-macro-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-component-macro-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-component-macro/24.0.6/download"],
+        strip_prefix = "wasmtime-component-macro-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-component-macro-24.0.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-component-util-24.0.0",
-        sha256 = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874",
+        name = "cu__wasmtime-component-util-24.0.6",
+        sha256 = "ace6645ada74c365f94d50f8bd31e383aa5bd419bfaad873f5227768ed33bd99",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-component-util/24.0.0/download"],
-        strip_prefix = "wasmtime-component-util-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-component-util-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-component-util/24.0.6/download"],
+        strip_prefix = "wasmtime-component-util-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-component-util-24.0.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-cranelift-24.0.0",
-        sha256 = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9",
+        name = "cu__wasmtime-cranelift-24.0.6",
+        sha256 = "f29888e14ff69a85bc7ca286f0720dcdc79a6ff01f0fc013a1a1a39697778e54",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-cranelift/24.0.0/download"],
-        strip_prefix = "wasmtime-cranelift-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-cranelift-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-cranelift/24.0.6/download"],
+        strip_prefix = "wasmtime-cranelift-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-cranelift-24.0.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-environ-24.0.0",
-        sha256 = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377",
+        name = "cu__wasmtime-environ-24.0.6",
+        sha256 = "8978792f7fa4c1c8a11c366880e3b52f881f7382203bee971dd7381b86123ee0",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-environ/24.0.0/download"],
-        strip_prefix = "wasmtime-environ-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-environ-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-environ/24.0.6/download"],
+        strip_prefix = "wasmtime-environ-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-environ-24.0.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-jit-icache-coherence-24.0.0",
-        sha256 = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e",
+        name = "cu__wasmtime-jit-icache-coherence-24.0.6",
+        sha256 = "69bb9a6ff1d8f92789cc2a3da13eed4074de65cceb62224cb3d8b306533b7884",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-jit-icache-coherence/24.0.0/download"],
-        strip_prefix = "wasmtime-jit-icache-coherence-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-jit-icache-coherence-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-jit-icache-coherence/24.0.6/download"],
+        strip_prefix = "wasmtime-jit-icache-coherence-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-jit-icache-coherence-24.0.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-slab-24.0.0",
-        sha256 = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1",
+        name = "cu__wasmtime-slab-24.0.6",
+        sha256 = "ec8ac1f5bcfc8038c60b1a0a9116d5fb266ac5ee1529640c1fe763c9bcaa8a9b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-slab/24.0.0/download"],
-        strip_prefix = "wasmtime-slab-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-slab-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-slab/24.0.6/download"],
+        strip_prefix = "wasmtime-slab-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-slab-24.0.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-types-24.0.0",
-        sha256 = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249",
+        name = "cu__wasmtime-types-24.0.6",
+        sha256 = "511ad6ede0cfcb30718b1a378e66022d60d942d42a33fbf5c03c5d8db48d52b9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-types/24.0.0/download"],
-        strip_prefix = "wasmtime-types-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-types-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-types/24.0.6/download"],
+        strip_prefix = "wasmtime-types-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-types-24.0.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-versioned-export-macros-24.0.0",
-        sha256 = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed",
+        name = "cu__wasmtime-versioned-export-macros-24.0.6",
+        sha256 = "10283bdd96381b62e9f527af85459bf4c4824a685a882c8886e2b1cdb2f36198",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-versioned-export-macros/24.0.0/download"],
-        strip_prefix = "wasmtime-versioned-export-macros-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-versioned-export-macros-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-versioned-export-macros/24.0.6/download"],
+        strip_prefix = "wasmtime-versioned-export-macros-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-versioned-export-macros-24.0.6.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "cu__wasmtime-wit-bindgen-24.0.0",
-        sha256 = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f",
+        name = "cu__wasmtime-wit-bindgen-24.0.6",
+        sha256 = "beb8b981b1982ae3aa83567348cbb68598a2a123646e4aa604a3b5c1804f3383",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasmtime-wit-bindgen/24.0.0/download"],
-        strip_prefix = "wasmtime-wit-bindgen-24.0.0",
-        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-wit-bindgen-24.0.0.bazel"),
+        urls = ["https://static.crates.io/crates/wasmtime-wit-bindgen/24.0.6/download"],
+        strip_prefix = "wasmtime-wit-bindgen-24.0.6",
+        build_file = Label("@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:BUILD.wasmtime-wit-bindgen-24.0.6.bazel"),
     )
 
     maybe(
@@ -1531,11 +1452,6 @@ def crate_repositories():
     )
 
     return [
-        struct(repo = "cu__anyhow-1.0.86", is_dev_dep = False),
-        struct(repo = "cu__env_logger-0.10.2", is_dev_dep = False),
-        struct(repo = "cu__log-0.4.22", is_dev_dep = False),
-        struct(repo = "cu__once_cell-1.19.0", is_dev_dep = False),
-        struct(repo = "cu__tracing-0.1.40", is_dev_dep = False),
-        struct(repo = "cu__wasmtime-24.0.0", is_dev_dep = False),
-        struct(repo = "cu__wasmtime-c-api-macros-24.0.0", is_dev_dep = False),
+        struct(repo = "cu__log-0.4.29", is_dev_dep = False),
+        struct(repo = "cu__wasmtime-c-api-impl-24.0.0", is_dev_dep = False),
     ]
diff --git a/bazel/external/prefixed_wasmtime.patch b/bazel/external/prefixed_wasmtime.patch
new file mode 100644
index 000000000..3ce937092
--- /dev/null
+++ b/bazel/external/prefixed_wasmtime.patch
@@ -0,0 +1,7602 @@
+From b60dd9c2a8fe2759d7ce926926ef81bb5abf2bab Mon Sep 17 00:00:00 2001
+From: Matt Leon <mattleon@google.com>
+Date: Thu, 12 Mar 2026 15:43:57 -0400
+Subject: [PATCH] Prefix wasmtime API with wasmtime_
+
+This patch is generated from the following commands:
+
+```bash
+find ./crates/c-api -type f -exec sed -i                          \
+    -e 's/\ wasm_/\ wasmtime_wasm_/g'                             \
+    -e 's/\*wasm_/\*wasmtime_wasm_/g'                             \
+    -e 's/^wasm_/wasmtime_wasm_/g'                                \
+    -e 's/<wasm_/<wasmtime_wasm_/g'                               \
+    -e 's/\.wasm_/\.wasmtime_wasm_/g'                             \
+    -e 's/\&wasm_/\&wasmtime_wasm_/g'                             \
+    -e 's/\[wasm_/\[wasmtime_wasm_/g'                             \
+    -e 's/wasmtime_config_wasm_/wasmtime_config_wasmtime_wasm_/g' \
+    -e 's/(wasm_/(wasmtime_wasm_/g' {} \;
+cat >src/lib.rs <<EOF
+pub use wasmtime_c_api;
+EOF
+```
+
+Signed-off-by: Matt Leon <mattleon@google.com>
+---
+ crates/c-api/doxygen.conf.in                 |   2 +-
+ crates/c-api/include/doc-wasm.h              | 842 +++++++++----------
+ crates/c-api/include/wasi.h                  |   2 +-
+ crates/c-api/include/wasm.h                  | 582 ++++++-------
+ crates/c-api/include/wasmtime.h              |   2 +-
+ crates/c-api/include/wasmtime/async.h        |  12 +-
+ crates/c-api/include/wasmtime/config.h       |  36 +-
+ crates/c-api/include/wasmtime/engine.h       |   4 +-
+ crates/c-api/include/wasmtime/error.h        |   4 +-
+ crates/c-api/include/wasmtime/extern.h       |   2 +-
+ crates/c-api/include/wasmtime/func.h         |  14 +-
+ crates/c-api/include/wasmtime/global.h       |   4 +-
+ crates/c-api/include/wasmtime/instance.h     |   4 +-
+ crates/c-api/include/wasmtime/linker.h       |   8 +-
+ crates/c-api/include/wasmtime/memory.h       |  14 +-
+ crates/c-api/include/wasmtime/module.h       |  18 +-
+ crates/c-api/include/wasmtime/profiling.h    |   6 +-
+ crates/c-api/include/wasmtime/sharedmemory.h |   6 +-
+ crates/c-api/include/wasmtime/store.h        |   2 +-
+ crates/c-api/include/wasmtime/table.h        |   4 +-
+ crates/c-api/include/wasmtime/trap.h         |  14 +-
+ crates/c-api/src/async.rs                    |  32 +-
+ crates/c-api/src/config.rs                   | 112 +--
+ crates/c-api/src/engine.rs                   |  16 +-
+ crates/c-api/src/error.rs                    |   6 +-
+ crates/c-api/src/extern.rs                   |  48 +-
+ crates/c-api/src/func.rs                     | 120 +--
+ crates/c-api/src/global.rs                   |  46 +-
+ crates/c-api/src/instance.rs                 |  46 +-
+ crates/c-api/src/linker.rs                   |  10 +-
+ crates/c-api/src/memory.rs                   |  52 +-
+ crates/c-api/src/module.rs                   |  86 +-
+ crates/c-api/src/profiling.rs                |   8 +-
+ crates/c-api/src/ref.rs                      |  90 +-
+ crates/c-api/src/sharedmemory.rs             |   8 +-
+ crates/c-api/src/store.rs                    |  14 +-
+ crates/c-api/src/table.rs                    |  72 +-
+ crates/c-api/src/trap.rs                     |  78 +-
+ crates/c-api/src/types.rs                    |   4 +-
+ crates/c-api/src/types/export.rs             |  34 +-
+ crates/c-api/src/types/extern.rs             |  88 +-
+ crates/c-api/src/types/func.rs               |  50 +-
+ crates/c-api/src/types/global.rs             |  50 +-
+ crates/c-api/src/types/import.rs             |  42 +-
+ crates/c-api/src/types/memory.rs             |  48 +-
+ crates/c-api/src/types/table.rs              |  44 +-
+ crates/c-api/src/types/val.rs                |  28 +-
+ crates/c-api/src/val.rs                      |  60 +-
+ crates/c-api/src/vec.rs                      | 178 ++--
+ crates/c-api/src/wasi.rs                     |   2 +-
+ crates/c-api/src/wat2wasm.rs                 |   4 +-
+ src/lib.rs                                   |  11 +-
+ 52 files changed, 1530 insertions(+), 1539 deletions(-)
+
+diff --git a/crates/c-api/doxygen.conf.in b/crates/c-api/doxygen.conf.in
+index 6ba0b993b7..ded4083f72 100644
+--- a/crates/c-api/doxygen.conf.in
++++ b/crates/c-api/doxygen.conf.in
+@@ -943,7 +943,7 @@ EXCLUDE_SYMBOLS        = assertions \
+                          WASI_DECLARE_OWN \
+                          WASMTIME_CONFIG_PROP \
+                          own \
+-                         wasm_*_enum
++                         wasmtime_wasm_*_enum
+ 
+ # The EXAMPLE_PATH tag can be used to specify one or more files or directories
+ # that contain example code fragments that are included (see the \include
+diff --git a/crates/c-api/include/doc-wasm.h b/crates/c-api/include/doc-wasm.h
+index 45afbecf91..4a9f1737f3 100644
+--- a/crates/c-api/include/doc-wasm.h
++++ b/crates/c-api/include/doc-wasm.h
+@@ -52,7 +52,7 @@
+  * \typedef byte_t
+  * \brief A type definition for a number that occupies a single byte of data.
+  *
+- * \typedef wasm_byte_t
++ * \typedef wasmtime_wasm_byte_t
+  * \brief A type definition for a number that occupies a single byte of data.
+  *
+  * \typedef float32_t
+@@ -61,15 +61,15 @@
+  * \typedef float64_t
+  * \brief A type definition for a 64-bit float.
+  *
+- * \typedef wasm_name_t
++ * \typedef wasmtime_wasm_name_t
+  * \brief Convenience for hinting that an argument only accepts utf-8 input.
+  */
+ 
+ /**
+- * \typedef wasm_config_t
++ * \typedef wasmtime_wasm_config_t
+  * \brief Convenience alias for #wasm_config_t
+  *
+- * \struct wasm_config_t
++ * \struct wasmtime_wasm_config_t
+  * \brief Global engine configuration
+  *
+  * This structure represents global configuration used when constructing a
+@@ -87,22 +87,22 @@
+  * at
+  * https://bytecodealliance.github.io/wasmtime/api/wasmtime/struct.Config.html.
+  *
+- * \fn wasm_config_t *wasm_config_new(void);
++ * \fn wasmtime_wasm_config_t *wasmtime_wasm_config_new(void);
+  * \brief Creates a new empty configuration object.
+  *
+  * The object returned is owned by the caller and will need to be deleted with
+  * #wasm_config_delete. May return `NULL` if a configuration object could not be
+  * allocated.
+  *
+- * \fn void wasm_config_delete(wasm_config_t*);
++ * \fn void wasmtime_wasm_config_delete(wasmtime_wasm_config_t*);
+  * \brief Deletes a configuration object.
+  */
+ 
+ /**
+- * \typedef wasm_engine_t
++ * \typedef wasmtime_wasm_engine_t
+  * \brief Convenience alias for #wasm_engine_t
+  *
+- * \struct wasm_engine_t
++ * \struct wasmtime_wasm_engine_t
+  * \brief Compilation environment and configuration.
+  *
+  * An engine is typically global in a program and contains all the configuration
+@@ -117,14 +117,14 @@
+  * Engines are reference counted internally so #wasm_engine_delete can be called
+  * at any time after a #wasmtime_store_t has been created from one.
+  *
+- * \fn wasm_engine_t *wasm_engine_new(void);
++ * \fn wasmtime_wasm_engine_t *wasmtime_wasm_engine_new(void);
+  * \brief Creates a new engine with the default configuration.
+  *
+  * The object returned is owned by the caller and will need to be deleted with
+  * #wasm_engine_delete. This may return `NULL` if the engine could not be
+  * allocated.
+  *
+- * \fn wasm_engine_t *wasm_engine_new_with_config(wasm_config_t *);
++ * \fn wasmtime_wasm_engine_t *wasmtime_wasm_engine_new_with_config(wasmtime_wasm_config_t *);
+  * \brief Creates a new engine with the specified configuration.
+  *
+  * This function will take ownership of the configuration specified regardless
+@@ -133,79 +133,79 @@
+  * be deleted with #wasm_engine_delete. This may return `NULL` if the engine
+  * could not be allocated.
+  *
+- * \fn void wasm_engine_delete(wasm_engine_t*);
++ * \fn void wasmtime_wasm_engine_delete(wasmtime_wasm_engine_t*);
+  * \brief Deletes an engine.
+  */
+ 
+ /**
+- * \typedef wasm_store_t
++ * \typedef wasmtime_wasm_store_t
+  * \brief Convenience alias for #wasm_store_t
+  *
+- * \struct wasm_store_t
++ * \struct wasmtime_wasm_store_t
+  * \brief A collection of instances and wasm global items.
+  *
+  * A #wasm_store_t corresponds to the concept of an [embedding
+  * store](https://webassembly.github.io/spec/core/exec/runtime.html#store)
+  *
+- * \fn wasm_store_t *wasm_store_new(wasm_engine_t *);
++ * \fn wasmtime_wasm_store_t *wasmtime_wasm_store_new(wasmtime_wasm_engine_t *);
+  * \brief Creates a new store within the specified engine.
+  *
+  * The object returned is owned by the caller and will need to be deleted with
+  * #wasm_store_delete. This may return `NULL` if the store could not be
+  * allocated.
+  *
+- * \fn void wasm_store_delete(wasm_store_t *);
++ * \fn void wasmtime_wasm_store_delete(wasmtime_wasm_store_t *);
+  * \brief Deletes the specified store.
+  */
+ 
+ /**
+- * \struct wasm_byte_vec_t
++ * \struct wasmtime_wasm_byte_vec_t
+  * \brief A list of bytes
+  *
+  * Used to pass data in or pass data out of various functions.  The meaning and
+  * ownership of the bytes is defined by each API that operates on this
+  * datatype.
+  *
+- * \var wasm_byte_vec_t::size
++ * \var wasmtime_wasm_byte_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_byte_vec_t::data
++ * \var wasmtime_wasm_byte_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_byte_vec_t
++ * \typedef wasmtime_wasm_byte_vec_t
+  * \brief Convenience alias for #wasm_byte_vec_t
+  *
+- * \typedef wasm_message_t
++ * \typedef wasmtime_wasm_message_t
+  * \brief Alias of #wasm_byte_vec_t which always has a trailing 0-byte.
+  *
+- * \fn wasm_name
++ * \fn wasmtime_wasm_name
+  * \brief Unused by Wasmtime
+  *
+- * \fn wasm_name_new
++ * \fn wasmtime_wasm_name_new
+  * \brief Convenience alias
+  *
+- * \fn wasm_name_new_empty
++ * \fn wasmtime_wasm_name_new_empty
+  * \brief Convenience alias
+  *
+- * \fn wasm_name_new_new_uninitialized
++ * \fn wasmtime_wasm_name_new_new_uninitialized
+  * \brief Convenience alias
+  *
+- * \fn wasm_name_new_from_string
++ * \fn wasmtime_wasm_name_new_from_string
+  * \brief Create a new name from a C string.
+  *
+- * \fn wasm_name_new_from_string_nt
++ * \fn wasmtime_wasm_name_new_from_string_nt
+  * \brief Create a new name from a C string with null terminator.
+  *
+- * \fn wasm_name_copy
++ * \fn wasmtime_wasm_name_copy
+  * \brief Convenience alias
+  *
+- * \fn wasm_name_delete
++ * \fn wasmtime_wasm_name_delete
+  * \brief Convenience alias
+  *
+- * \fn void wasm_byte_vec_new_empty(wasm_byte_vec_t *out);
++ * \fn void wasmtime_wasm_byte_vec_new_empty(wasmtime_wasm_byte_vec_t *out);
+  * \brief Initializes an empty byte vector.
+  *
+- * \fn void wasm_byte_vec_new_uninitialized(wasm_byte_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_byte_vec_new_uninitialized(wasmtime_wasm_byte_vec_t *out, size_t);
+  * \brief Initializes an byte vector with the specified capacity.
+  *
+  * This function will initialize the provided vector with capacity to hold the
+@@ -213,7 +213,7 @@
+  * initialized and after this function is called you are then responsible for
+  * ensuring #wasm_byte_vec_delete is called.
+  *
+- * \fn void wasm_byte_vec_new(wasm_byte_vec_t *out, size_t, wasm_byte_t const[]);
++ * \fn void wasmtime_wasm_byte_vec_new(wasmtime_wasm_byte_vec_t *out, size_t, wasmtime_wasm_byte_t const[]);
+  * \brief Copies the specified data into a new byte vector.
+  *
+  * This function will copy the provided data into this byte vector. The byte
+@@ -224,14 +224,14 @@
+  * must be managed externally. This function will copy the contents to the
+  * output vector, but it's up to the caller to properly deallocate the memory.
+  *
+- * \fn void wasm_byte_vec_copy(wasm_byte_vec_t *out, const wasm_byte_vec_t *);
++ * \fn void wasmtime_wasm_byte_vec_copy(wasmtime_wasm_byte_vec_t *out, const wasmtime_wasm_byte_vec_t *);
+  * \brief Copies one vector into a new vector.
+  *
+  * Copies the second argument's data into the first argument. The `out` vector
+  * should not be previously initialized and after this function returns you're
+  * responsible for calling #wasm_byte_vec_delete.
+  *
+- * \fn void wasm_byte_vec_delete(wasm_byte_vec_t *);
++ * \fn void wasmtime_wasm_byte_vec_delete(wasmtime_wasm_byte_vec_t *);
+  * \brief Deletes a byte vector.
+  *
+  * This function will deallocate the data referenced by the argument provided.
+@@ -240,124 +240,124 @@
+  */
+ 
+ /**
+- * \struct wasm_valtype_t
++ * \struct wasmtime_wasm_valtype_t
+  * \brief An object representing the type of a value.
+  *
+- * \typedef wasm_valtype_t
++ * \typedef wasmtime_wasm_valtype_t
+  * \brief Convenience alias for #wasm_valtype_t
+  *
+- * \struct wasm_valtype_vec_t
++ * \struct wasmtime_wasm_valtype_vec_t
+  * \brief A list of #wasm_valtype_t values.
+  *
+- * \var wasm_valtype_vec_t::size
++ * \var wasmtime_wasm_valtype_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_valtype_vec_t::data
++ * \var wasmtime_wasm_valtype_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_valtype_vec_t
++ * \typedef wasmtime_wasm_valtype_vec_t
+  * \brief Convenience alias for #wasm_valtype_vec_t
+  *
+- * \fn void wasm_valtype_delete(wasm_valtype_t *);
++ * \fn void wasmtime_wasm_valtype_delete(wasmtime_wasm_valtype_t *);
+  * \brief Deletes a type.
+  *
+- * \fn void wasm_valtype_vec_new_empty(wasm_valtype_vec_t *out);
++ * \fn void wasmtime_wasm_valtype_vec_new_empty(wasmtime_wasm_valtype_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_valtype_vec_new_uninitialized(wasm_valtype_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_valtype_vec_new_uninitialized(wasmtime_wasm_valtype_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_valtype_vec_new(wasm_valtype_vec_t *out, size_t, wasm_valtype_t *const[]);
++ * \fn void wasmtime_wasm_valtype_vec_new(wasmtime_wasm_valtype_vec_t *out, size_t, wasmtime_wasm_valtype_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_valtype_vec_copy(wasm_valtype_vec_t *out, const wasm_valtype_vec_t *)
++ * \fn void wasmtime_wasm_valtype_vec_copy(wasmtime_wasm_valtype_vec_t *out, const wasmtime_wasm_valtype_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_valtype_vec_delete(wasm_valtype_vec_t *out)
++ * \fn void wasmtime_wasm_valtype_vec_delete(wasmtime_wasm_valtype_vec_t *out)
+  * \brief Deallocates memory for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_valtype_t* wasm_valtype_copy(const wasm_valtype_t *)
++ * \fn wasmtime_wasm_valtype_t* wasmtime_wasm_valtype_copy(const wasmtime_wasm_valtype_t *)
+  * \brief Creates a new value which matches the provided one.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn wasm_valtype_t* wasm_valtype_new(wasm_valkind_t);
++ * \fn wasmtime_wasm_valtype_t* wasmtime_wasm_valtype_new(wasmtime_wasm_valkind_t);
+  * \brief Creates a new value type from the specified kind.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn wasm_valkind_t wasm_valtype_kind(const wasm_valtype_t *);
++ * \fn wasmtime_wasm_valkind_t wasmtime_wasm_valtype_kind(const wasmtime_wasm_valtype_t *);
+  * \brief Returns the associated kind for this value type.
+  */
+ 
+ /**
+- * \typedef wasm_valkind_t
++ * \typedef wasmtime_wasm_valkind_t
+  * \brief Different kinds of types supported in wasm.
+  */
+ 
+ /**
+- * \struct wasm_functype_t
++ * \struct wasmtime_wasm_functype_t
+  * \brief An opaque object representing the type of a function.
+  *
+- * \typedef wasm_functype_t
++ * \typedef wasmtime_wasm_functype_t
+  * \brief Convenience alias for #wasm_functype_t
+  *
+- * \struct wasm_functype_vec_t
++ * \struct wasmtime_wasm_functype_vec_t
+  * \brief A list of #wasm_functype_t values.
+  *
+- * \var wasm_functype_vec_t::size
++ * \var wasmtime_wasm_functype_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_functype_vec_t::data
++ * \var wasmtime_wasm_functype_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_functype_vec_t
++ * \typedef wasmtime_wasm_functype_vec_t
+  * \brief Convenience alias for #wasm_functype_vec_t
+  *
+- * \fn void wasm_functype_delete(wasm_functype_t *);
++ * \fn void wasmtime_wasm_functype_delete(wasmtime_wasm_functype_t *);
+  * \brief Deletes a type.
+  *
+- * \fn void wasm_functype_vec_new_empty(wasm_functype_vec_t *out);
++ * \fn void wasmtime_wasm_functype_vec_new_empty(wasmtime_wasm_functype_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_functype_vec_new_uninitialized(wasm_functype_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_functype_vec_new_uninitialized(wasmtime_wasm_functype_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_functype_vec_new(wasm_functype_vec_t *out, size_t, wasm_functype_t *const[]);
++ * \fn void wasmtime_wasm_functype_vec_new(wasmtime_wasm_functype_vec_t *out, size_t, wasmtime_wasm_functype_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_functype_vec_copy(wasm_functype_vec_t *out, const wasm_functype_vec_t *)
++ * \fn void wasmtime_wasm_functype_vec_copy(wasmtime_wasm_functype_vec_t *out, const wasmtime_wasm_functype_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_functype_vec_delete(wasm_functype_vec_t *out)
++ * \fn void wasmtime_wasm_functype_vec_delete(wasmtime_wasm_functype_vec_t *out)
+  * \brief Deallocates memory for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_functype_t* wasm_functype_copy(const wasm_functype_t *)
++ * \fn wasmtime_wasm_functype_t* wasmtime_wasm_functype_copy(const wasmtime_wasm_functype_t *)
+  * \brief Creates a new value which matches the provided one.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn wasm_functype_t* wasm_functype_new(wasm_valtype_vec_t *params, wasm_valtype_vec_t *results);
++ * \fn wasmtime_wasm_functype_t* wasmtime_wasm_functype_new(wasmtime_wasm_valtype_vec_t *params, wasmtime_wasm_valtype_vec_t *results);
+  * \brief Creates a new function type with the provided parameter and result
+  * types.
+  *
+@@ -365,13 +365,13 @@
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn const wasm_valtype_vec_t* wasm_functype_params(const wasm_functype_t *);
++ * \fn const wasmtime_wasm_valtype_vec_t* wasmtime_wasm_functype_params(const wasmtime_wasm_functype_t *);
+  * \brief Returns the list of parameters of this function type.
+  *
+  * The returned memory is owned by the #wasm_functype_t argument, the caller
+  * should not deallocate it.
+  *
+- * \fn const wasm_valtype_vec_t* wasm_functype_results(const wasm_functype_t *);
++ * \fn const wasmtime_wasm_valtype_vec_t* wasmtime_wasm_functype_results(const wasmtime_wasm_functype_t *);
+  * \brief Returns the list of results of this function type.
+  *
+  * The returned memory is owned by the #wasm_functype_t argument, the caller
+@@ -379,132 +379,132 @@
+  */
+ 
+ /**
+- * \struct wasm_globaltype_t
++ * \struct wasmtime_wasm_globaltype_t
+  * \brief An opaque object representing the type of a global.
+  *
+- * \typedef wasm_globaltype_t
++ * \typedef wasmtime_wasm_globaltype_t
+  * \brief Convenience alias for #wasm_globaltype_t
+  *
+- * \struct wasm_globaltype_vec_t
++ * \struct wasmtime_wasm_globaltype_vec_t
+  * \brief A list of #wasm_globaltype_t values.
+  *
+- * \var wasm_globaltype_vec_t::size
++ * \var wasmtime_wasm_globaltype_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_globaltype_vec_t::data
++ * \var wasmtime_wasm_globaltype_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_globaltype_vec_t
++ * \typedef wasmtime_wasm_globaltype_vec_t
+  * \brief Convenience alias for #wasm_globaltype_vec_t
+  *
+- * \fn void wasm_globaltype_delete(wasm_globaltype_t *);
++ * \fn void wasmtime_wasm_globaltype_delete(wasmtime_wasm_globaltype_t *);
+  * \brief Deletes a type.
+  *
+- * \fn void wasm_globaltype_vec_new_empty(wasm_globaltype_vec_t *out);
++ * \fn void wasmtime_wasm_globaltype_vec_new_empty(wasmtime_wasm_globaltype_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_globaltype_vec_new_uninitialized(wasm_globaltype_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_globaltype_vec_new_uninitialized(wasmtime_wasm_globaltype_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_globaltype_vec_new(wasm_globaltype_vec_t *out, size_t, wasm_globaltype_t *const[]);
++ * \fn void wasmtime_wasm_globaltype_vec_new(wasmtime_wasm_globaltype_vec_t *out, size_t, wasmtime_wasm_globaltype_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_globaltype_vec_copy(wasm_globaltype_vec_t *out, const wasm_globaltype_vec_t *)
++ * \fn void wasmtime_wasm_globaltype_vec_copy(wasmtime_wasm_globaltype_vec_t *out, const wasmtime_wasm_globaltype_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_globaltype_vec_delete(wasm_globaltype_vec_t *out)
++ * \fn void wasmtime_wasm_globaltype_vec_delete(wasmtime_wasm_globaltype_vec_t *out)
+  * \brief Deallocates memory for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_globaltype_t* wasm_globaltype_copy(const wasm_globaltype_t *)
++ * \fn wasmtime_wasm_globaltype_t* wasmtime_wasm_globaltype_copy(const wasmtime_wasm_globaltype_t *)
+  * \brief Creates a new value which matches the provided one.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn wasm_globaltype_t* wasm_globaltype_new(wasm_valtype_t *, wasm_mutability_t)
++ * \fn wasmtime_wasm_globaltype_t* wasmtime_wasm_globaltype_new(wasmtime_wasm_valtype_t *, wasmtime_wasm_mutability_t)
+  * \brief Creates a new global type.
+  *
+  * This function takes ownership of the #wasm_valtype_t argument.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn const wasm_valtype_t* wasm_globaltype_content(const wasm_globaltype_t *);
++ * \fn const wasmtime_wasm_valtype_t* wasmtime_wasm_globaltype_content(const wasmtime_wasm_globaltype_t *);
+  * \brief Returns the type of value contained in a global.
+  *
+  * The returned memory is owned by the provided #wasm_globaltype_t, the caller
+  * should not deallocate it.
+  *
+- * \fn wasm_mutability_t wasm_globaltype_mutability(const wasm_globaltype_t *);
++ * \fn wasmtime_wasm_mutability_t wasmtime_wasm_globaltype_mutability(const wasmtime_wasm_globaltype_t *);
+  * \brief Returns whether or not a global is mutable.
+  */
+ 
+ /**
+- * \typedef wasm_mutability_t
++ * \typedef wasmtime_wasm_mutability_t
+  * \brief Boolean flag for whether a global is mutable or not.
+  */
+ 
+ /**
+- * \struct wasm_tabletype_t
++ * \struct wasmtime_wasm_tabletype_t
+  * \brief An opaque object representing the type of a table.
+  *
+- * \typedef wasm_tabletype_t
++ * \typedef wasmtime_wasm_tabletype_t
+  * \brief Convenience alias for #wasm_tabletype_t
+  *
+- * \struct wasm_tabletype_vec_t
++ * \struct wasmtime_wasm_tabletype_vec_t
+  * \brief A list of #wasm_tabletype_t values.
+  *
+- * \var wasm_tabletype_vec_t::size
++ * \var wasmtime_wasm_tabletype_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_tabletype_vec_t::data
++ * \var wasmtime_wasm_tabletype_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_tabletype_vec_t
++ * \typedef wasmtime_wasm_tabletype_vec_t
+  * \brief Convenience alias for #wasm_tabletype_vec_t
+  *
+- * \fn void wasm_tabletype_delete(wasm_tabletype_t *);
++ * \fn void wasmtime_wasm_tabletype_delete(wasmtime_wasm_tabletype_t *);
+  * \brief Deletes a type.
+  *
+- * \fn void wasm_tabletype_vec_new_empty(wasm_tabletype_vec_t *out);
++ * \fn void wasmtime_wasm_tabletype_vec_new_empty(wasmtime_wasm_tabletype_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_tabletype_vec_new_uninitialized(wasm_tabletype_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_tabletype_vec_new_uninitialized(wasmtime_wasm_tabletype_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_tabletype_vec_new(wasm_tabletype_vec_t *out, size_t, wasm_tabletype_t *const[]);
++ * \fn void wasmtime_wasm_tabletype_vec_new(wasmtime_wasm_tabletype_vec_t *out, size_t, wasmtime_wasm_tabletype_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_tabletype_vec_copy(wasm_tabletype_vec_t *out, const wasm_tabletype_vec_t *)
++ * \fn void wasmtime_wasm_tabletype_vec_copy(wasmtime_wasm_tabletype_vec_t *out, const wasmtime_wasm_tabletype_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_tabletype_vec_delete(wasm_tabletype_vec_t *out)
++ * \fn void wasmtime_wasm_tabletype_vec_delete(wasmtime_wasm_tabletype_vec_t *out)
+  * \brief Deallocates memory for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_tabletype_t* wasm_tabletype_copy(const wasm_tabletype_t *)
++ * \fn wasmtime_wasm_tabletype_t* wasmtime_wasm_tabletype_copy(const wasmtime_wasm_tabletype_t *)
+  * \brief Creates a new value which matches the provided one.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn wasm_tabletype_t* wasm_tabletype_new(wasm_valtype_t *, const wasm_limits_t *)h
++ * \fn wasmtime_wasm_tabletype_t* wasmtime_wasm_tabletype_new(wasmtime_wasm_valtype_t *, const wasmtime_wasm_limits_t *)h
+  * \brief Creates a new table type.
+  *
+  * This function takes ownership of the #wasm_valtype_t argument, but does not
+@@ -512,13 +512,13 @@
+  *
+  * The caller is responsible for deallocating the returned type.
+  *
+- * \fn const wasm_valtype_t* wasm_tabletype_element(const wasm_tabletype_t *);
++ * \fn const wasmtime_wasm_valtype_t* wasmtime_wasm_tabletype_element(const wasmtime_wasm_tabletype_t *);
+  * \brief Returns the element type of this table.
+  *
+  * The returned #wasm_valtype_t is owned by the #wasm_tabletype_t parameter, the
+  * caller should not deallocate it.
+  *
+- * \fn const wasm_limits_t* wasm_tabletype_limits(const wasm_tabletype_t *);
++ * \fn const wasmtime_wasm_limits_t* wasmtime_wasm_tabletype_limits(const wasmtime_wasm_tabletype_t *);
+  * \brief Returns the limits of this table.
+  *
+  * The returned #wasm_limits_t is owned by the #wasm_tabletype_t parameter, the
+@@ -526,71 +526,71 @@
+  */
+ 
+ /**
+- * \struct wasm_limits_t
++ * \struct wasmtime_wasm_limits_t
+  * \brief Limits for tables/memories in wasm modules
+- * \var wasm_limits_t::min
++ * \var wasmtime_wasm_limits_t::min
+  * The minimum value required.
+- * \var wasm_limits_t::max
++ * \var wasmtime_wasm_limits_t::max
+  * The maximum value required, or `wasm_limits_max_default` if no maximum is
+  * specified.
+  *
+- * \typedef wasm_limits_t
++ * \typedef wasmtime_wasm_limits_t
+  * \brief A convenience typedef to #wasm_limits_t
+  */
+ 
+ /**
+- * \struct wasm_memorytype_t
++ * \struct wasmtime_wasm_memorytype_t
+  * \brief An opaque object representing the type of a memory.
+  *
+- * \typedef wasm_memorytype_t
++ * \typedef wasmtime_wasm_memorytype_t
+  * \brief Convenience alias for #wasm_memorytype_t
+  *
+- * \struct wasm_memorytype_vec_t
++ * \struct wasmtime_wasm_memorytype_vec_t
+  * \brief A list of #wasm_memorytype_t values.
+  *
+- * \var wasm_memorytype_vec_t::size
++ * \var wasmtime_wasm_memorytype_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_memorytype_vec_t::data
++ * \var wasmtime_wasm_memorytype_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_memorytype_vec_t
++ * \typedef wasmtime_wasm_memorytype_vec_t
+  * \brief Convenience alias for #wasm_memorytype_vec_t
+  *
+- * \fn void wasm_memorytype_delete(wasm_memorytype_t *);
++ * \fn void wasmtime_wasm_memorytype_delete(wasmtime_wasm_memorytype_t *);
+  * \brief Deletes a type.
+  *
+- * \fn void wasm_memorytype_vec_new_empty(wasm_memorytype_vec_t *out);
++ * \fn void wasmtime_wasm_memorytype_vec_new_empty(wasmtime_wasm_memorytype_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_memorytype_vec_new_uninitialized(wasm_memorytype_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_memorytype_vec_new_uninitialized(wasmtime_wasm_memorytype_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_memorytype_vec_new(wasm_memorytype_vec_t *out, size_t, wasm_memorytype_t *const[]);
++ * \fn void wasmtime_wasm_memorytype_vec_new(wasmtime_wasm_memorytype_vec_t *out, size_t, wasmtime_wasm_memorytype_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_memorytype_vec_copy(wasm_memorytype_vec_t *out, const wasm_memorytype_vec_t *)
++ * \fn void wasmtime_wasm_memorytype_vec_copy(wasmtime_wasm_memorytype_vec_t *out, const wasmtime_wasm_memorytype_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_memorytype_vec_delete(wasm_memorytype_vec_t *out)
++ * \fn void wasmtime_wasm_memorytype_vec_delete(wasmtime_wasm_memorytype_vec_t *out)
+  * \brief Deallocates memory for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_memorytype_t* wasm_memorytype_copy(const wasm_memorytype_t *)
++ * \fn wasmtime_wasm_memorytype_t* wasmtime_wasm_memorytype_copy(const wasmtime_wasm_memorytype_t *)
+  * \brief Creates a new value which matches the provided one.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn wasm_memorytype_t* wasm_memorytype_new(const wasm_limits_t *)h
++ * \fn wasmtime_wasm_memorytype_t* wasmtime_wasm_memorytype_new(const wasmtime_wasm_limits_t *)h
+  * \brief Creates a new memory type.
+  *
+  * This function takes ownership of the #wasm_valtype_t argument, but does not
+@@ -601,7 +601,7 @@
+  * For compatibility with memory64 it's recommended to use
+  * #wasmtime_memorytype_new instead.
+  *
+- * \fn const wasm_limits_t* wasm_memorytype_limits(const wasm_memorytype_t *);
++ * \fn const wasmtime_wasm_limits_t* wasmtime_wasm_memorytype_limits(const wasmtime_wasm_memorytype_t *);
+  * \brief Returns the limits of this memory.
+  *
+  * The returned #wasm_limits_t is owned by the #wasm_memorytype_t parameter, the
+@@ -612,65 +612,65 @@
+  */
+ 
+ /**
+- * \struct wasm_externtype_t
++ * \struct wasmtime_wasm_externtype_t
+  * \brief An opaque object representing the type of a external value. Can be
+  * seen as a superclass of #wasm_functype_t, #wasm_tabletype_t,
+  * #wasm_globaltype_t, and #wasm_memorytype_t.
+  *
+- * \typedef wasm_externtype_t
++ * \typedef wasmtime_wasm_externtype_t
+  * \brief Convenience alias for #wasm_externtype_t
+  *
+- * \struct wasm_externtype_vec_t
++ * \struct wasmtime_wasm_externtype_vec_t
+  * \brief A list of #wasm_externtype_t values.
+  *
+- * \var wasm_externtype_vec_t::size
++ * \var wasmtime_wasm_externtype_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_externtype_vec_t::data
++ * \var wasmtime_wasm_externtype_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_externtype_vec_t
++ * \typedef wasmtime_wasm_externtype_vec_t
+  * \brief Convenience alias for #wasm_externtype_vec_t
+  *
+- * \fn void wasm_externtype_delete(wasm_externtype_t *);
++ * \fn void wasmtime_wasm_externtype_delete(wasmtime_wasm_externtype_t *);
+  * \brief Deletes a type.
+  *
+- * \fn void wasm_externtype_vec_new_empty(wasm_externtype_vec_t *out);
++ * \fn void wasmtime_wasm_externtype_vec_new_empty(wasmtime_wasm_externtype_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_externtype_vec_new_uninitialized(wasm_externtype_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_externtype_vec_new_uninitialized(wasmtime_wasm_externtype_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_externtype_vec_new(wasm_externtype_vec_t *out, size_t, wasm_externtype_t *const[]);
++ * \fn void wasmtime_wasm_externtype_vec_new(wasmtime_wasm_externtype_vec_t *out, size_t, wasmtime_wasm_externtype_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_externtype_vec_copy(wasm_externtype_vec_t *out, const wasm_externtype_vec_t *)
++ * \fn void wasmtime_wasm_externtype_vec_copy(wasmtime_wasm_externtype_vec_t *out, const wasmtime_wasm_externtype_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_externtype_vec_delete(wasm_externtype_vec_t *out)
++ * \fn void wasmtime_wasm_externtype_vec_delete(wasmtime_wasm_externtype_vec_t *out)
+  * \brief Deallocates extern for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_externtype_t* wasm_externtype_copy(const wasm_externtype_t *)
++ * \fn wasmtime_wasm_externtype_t* wasmtime_wasm_externtype_copy(const wasmtime_wasm_externtype_t *)
+  * \brief Creates a new value which matches the provided one.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn wasm_externkind_t wasm_externtype_kind(const wasm_externtype_t *)
++ * \fn wasmtime_wasm_externkind_t wasmtime_wasm_externtype_kind(const wasmtime_wasm_externtype_t *)
+  * \brief Returns the kind of external item this type represents.
+  */
+ 
+ /**
+- * \typedef wasm_externkind_t
++ * \typedef wasmtime_wasm_externkind_t
+  * \brief Classifier for #wasm_externtype_t
+  *
+  * This is returned from #wasm_extern_kind and #wasm_externtype_kind to
+@@ -678,104 +678,104 @@
+  */
+ 
+ /**
+- * \fn wasm_externtype_t* wasm_functype_as_externtype(wasm_functype_t *)
++ * \fn wasmtime_wasm_externtype_t* wasmtime_wasm_functype_as_externtype(wasmtime_wasm_functype_t *)
+  * \brief Converts a #wasm_functype_t to a #wasm_externtype_t
+  *
+  * The returned value is owned by the #wasm_functype_t argument and should not
+  * be deleted.
+  *
+- * \fn wasm_externtype_t* wasm_tabletype_as_externtype(wasm_tabletype_t *)
++ * \fn wasmtime_wasm_externtype_t* wasmtime_wasm_tabletype_as_externtype(wasmtime_wasm_tabletype_t *)
+  * \brief Converts a #wasm_tabletype_t to a #wasm_externtype_t
+  *
+  * The returned value is owned by the #wasm_tabletype_t argument and should not
+  * be deleted.
+  *
+- * \fn wasm_externtype_t* wasm_globaltype_as_externtype(wasm_globaltype_t *)
++ * \fn wasmtime_wasm_externtype_t* wasmtime_wasm_globaltype_as_externtype(wasmtime_wasm_globaltype_t *)
+  * \brief Converts a #wasm_globaltype_t to a #wasm_externtype_t
+  *
+  * The returned value is owned by the #wasm_globaltype_t argument and should not
+  * be deleted.
+  *
+- * \fn wasm_externtype_t* wasm_memorytype_as_externtype(wasm_memorytype_t *)
++ * \fn wasmtime_wasm_externtype_t* wasmtime_wasm_memorytype_as_externtype(wasmtime_wasm_memorytype_t *)
+  * \brief Converts a #wasm_memorytype_t to a #wasm_externtype_t
+  *
+  * The returned value is owned by the #wasm_memorytype_t argument and should not
+  * be deleted.
+  *
+- * \fn const wasm_externtype_t* wasm_functype_as_externtype_const(const wasm_functype_t *)
++ * \fn const wasmtime_wasm_externtype_t* wasmtime_wasm_functype_as_externtype_const(const wasmtime_wasm_functype_t *)
+  * \brief Converts a #wasm_functype_t to a #wasm_externtype_t
+  *
+  * The returned value is owned by the #wasm_functype_t argument and should not
+  * be deleted.
+  *
+- * \fn const wasm_externtype_t* wasm_tabletype_as_externtype_const(const wasm_tabletype_t *)
++ * \fn const wasmtime_wasm_externtype_t* wasmtime_wasm_tabletype_as_externtype_const(const wasmtime_wasm_tabletype_t *)
+  * \brief Converts a #wasm_tabletype_t to a #wasm_externtype_t
+  *
+  * The returned value is owned by the #wasm_tabletype_t argument and should not
+  * be deleted.
+  *
+- * \fn const wasm_externtype_t* wasm_globaltype_as_externtype_const(const wasm_globaltype_t *)
++ * \fn const wasmtime_wasm_externtype_t* wasmtime_wasm_globaltype_as_externtype_const(const wasmtime_wasm_globaltype_t *)
+  * \brief Converts a #wasm_globaltype_t to a #wasm_externtype_t
+  *
+  * The returned value is owned by the #wasm_globaltype_t argument and should not
+  * be deleted.
+  *
+- * \fn const wasm_externtype_t* wasm_memorytype_as_externtype_const(const wasm_memorytype_t *)
++ * \fn const wasmtime_wasm_externtype_t* wasmtime_wasm_memorytype_as_externtype_const(const wasmtime_wasm_memorytype_t *)
+  * \brief Converts a #wasm_memorytype_t to a #wasm_externtype_t
+  *
+  * The returned value is owned by the #wasm_memorytype_t argument and should not
+  * be deleted.
+  *
+- * \fn wasm_functype_t* wasm_externtype_as_functype(wasm_externtype_t *)
++ * \fn wasmtime_wasm_functype_t* wasmtime_wasm_externtype_as_functype(wasmtime_wasm_externtype_t *)
+  * \brief Attempts to convert a #wasm_externtype_t to a #wasm_functype_t
+  *
+  * The returned value is owned by the #wasm_functype_t argument and should not
+  * be deleted. Returns `NULL` if the provided argument is not a
+  * #wasm_functype_t.
+  *
+- * \fn wasm_tabletype_t* wasm_externtype_as_tabletype(wasm_externtype_t *)
++ * \fn wasmtime_wasm_tabletype_t* wasmtime_wasm_externtype_as_tabletype(wasmtime_wasm_externtype_t *)
+  * \brief Attempts to convert a #wasm_externtype_t to a #wasm_tabletype_t
+  *
+  * The returned value is owned by the #wasm_tabletype_t argument and should not
+  * be deleted. Returns `NULL` if the provided argument is not a
+  * #wasm_tabletype_t.
+  *
+- * \fn wasm_memorytype_t* wasm_externtype_as_memorytype(wasm_externtype_t *)
++ * \fn wasmtime_wasm_memorytype_t* wasmtime_wasm_externtype_as_memorytype(wasmtime_wasm_externtype_t *)
+  * \brief Attempts to convert a #wasm_externtype_t to a #wasm_memorytype_t
+  *
+  * The returned value is owned by the #wasm_memorytype_t argument and should not
+  * be deleted. Returns `NULL` if the provided argument is not a
+  * #wasm_memorytype_t.
+  *
+- * \fn wasm_globaltype_t* wasm_externtype_as_globaltype(wasm_externtype_t *)
++ * \fn wasmtime_wasm_globaltype_t* wasmtime_wasm_externtype_as_globaltype(wasmtime_wasm_externtype_t *)
+  * \brief Attempts to convert a #wasm_externtype_t to a #wasm_globaltype_t
+  *
+  * The returned value is owned by the #wasm_globaltype_t argument and should not
+  * be deleted. Returns `NULL` if the provided argument is not a
+  * #wasm_globaltype_t.
+  *
+- * \fn const wasm_functype_t* wasm_externtype_as_functype_const(const wasm_externtype_t *)
++ * \fn const wasmtime_wasm_functype_t* wasmtime_wasm_externtype_as_functype_const(const wasmtime_wasm_externtype_t *)
+  * \brief Attempts to convert a #wasm_externtype_t to a #wasm_functype_t
+  *
+  * The returned value is owned by the #wasm_functype_t argument and should not
+  * be deleted. Returns `NULL` if the provided argument is not a
+  * #wasm_functype_t.
+  *
+- * \fn const wasm_tabletype_t* wasm_externtype_as_tabletype_const(const wasm_externtype_t *)
++ * \fn const wasmtime_wasm_tabletype_t* wasmtime_wasm_externtype_as_tabletype_const(const wasmtime_wasm_externtype_t *)
+  * \brief Attempts to convert a #wasm_externtype_t to a #wasm_tabletype_t
+  *
+  * The returned value is owned by the #wasm_tabletype_t argument and should not
+  * be deleted. Returns `NULL` if the provided argument is not a
+  * #wasm_tabletype_t.
+  *
+- * \fn const wasm_memorytype_t* wasm_externtype_as_memorytype_const(const wasm_externtype_t *)
++ * \fn const wasmtime_wasm_memorytype_t* wasmtime_wasm_externtype_as_memorytype_const(const wasmtime_wasm_externtype_t *)
+  * \brief Attempts to convert a #wasm_externtype_t to a #wasm_memorytype_t
+  *
+  * The returned value is owned by the #wasm_memorytype_t argument and should not
+  * be deleted. Returns `NULL` if the provided argument is not a
+  * #wasm_memorytype_t.
+  *
+- * \fn const wasm_globaltype_t* wasm_externtype_as_globaltype_const(const wasm_externtype_t *)
++ * \fn const wasmtime_wasm_globaltype_t* wasmtime_wasm_externtype_as_globaltype_const(const wasmtime_wasm_externtype_t *)
+  * \brief Attempts to convert a #wasm_externtype_t to a #wasm_globaltype_t
+  *
+  * The returned value is owned by the #wasm_globaltype_t argument and should not
+@@ -784,58 +784,58 @@
+  */
+ 
+ /**
+- * \struct wasm_importtype_t
++ * \struct wasmtime_wasm_importtype_t
+  * \brief An opaque object representing the type of an import.
+  *
+- * \typedef wasm_importtype_t
++ * \typedef wasmtime_wasm_importtype_t
+  * \brief Convenience alias for #wasm_importtype_t
+  *
+- * \struct wasm_importtype_vec_t
++ * \struct wasmtime_wasm_importtype_vec_t
+  * \brief A list of #wasm_importtype_t values.
+  *
+- * \var wasm_importtype_vec_t::size
++ * \var wasmtime_wasm_importtype_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_importtype_vec_t::data
++ * \var wasmtime_wasm_importtype_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_importtype_vec_t
++ * \typedef wasmtime_wasm_importtype_vec_t
+  * \brief Convenience alias for #wasm_importtype_vec_t
+  *
+- * \fn void wasm_importtype_delete(wasm_importtype_t *);
++ * \fn void wasmtime_wasm_importtype_delete(wasmtime_wasm_importtype_t *);
+  * \brief Deletes a type.
+  *
+- * \fn void wasm_importtype_vec_new_empty(wasm_importtype_vec_t *out);
++ * \fn void wasmtime_wasm_importtype_vec_new_empty(wasmtime_wasm_importtype_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_importtype_vec_new_uninitialized(wasm_importtype_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_importtype_vec_new_uninitialized(wasmtime_wasm_importtype_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_importtype_vec_new(wasm_importtype_vec_t *out, size_t, wasm_importtype_t *const[]);
++ * \fn void wasmtime_wasm_importtype_vec_new(wasmtime_wasm_importtype_vec_t *out, size_t, wasmtime_wasm_importtype_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_importtype_vec_copy(wasm_importtype_vec_t *out, const wasm_importtype_vec_t *)
++ * \fn void wasmtime_wasm_importtype_vec_copy(wasmtime_wasm_importtype_vec_t *out, const wasmtime_wasm_importtype_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_importtype_vec_delete(wasm_importtype_vec_t *out)
++ * \fn void wasmtime_wasm_importtype_vec_delete(wasmtime_wasm_importtype_vec_t *out)
+  * \brief Deallocates import for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_importtype_t* wasm_importtype_copy(const wasm_importtype_t *)
++ * \fn wasmtime_wasm_importtype_t* wasmtime_wasm_importtype_copy(const wasmtime_wasm_importtype_t *)
+  * \brief Creates a new value which matches the provided one.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn wasm_importtype_t* wasm_importtype_new(wasm_name_t *module, wasm_name_t *name, wasm_externtype_t *)
++ * \fn wasmtime_wasm_importtype_t* wasmtime_wasm_importtype_new(wasmtime_wasm_name_t *module, wasmtime_wasm_name_t *name, wasmtime_wasm_externtype_t *)
+  * \brief Creates a new import type.
+  *
+  * This function takes ownership of the `module`, `name`, and
+@@ -843,13 +843,13 @@
+  * returned value. Note that `name` can be `NULL` where in the module linking
+  * proposal the import name can be omitted.
+  *
+- * \fn const wasm_name_t* wasm_importtype_module(const wasm_importtype_t *);
++ * \fn const wasmtime_wasm_name_t* wasmtime_wasm_importtype_module(const wasmtime_wasm_importtype_t *);
+  * \brief Returns the module this import is importing from.
+  *
+  * The returned memory is owned by the #wasm_importtype_t argument, the caller
+  * should not deallocate it.
+  *
+- * \fn const wasm_name_t* wasm_importtype_name(const wasm_importtype_t *);
++ * \fn const wasmtime_wasm_name_t* wasmtime_wasm_importtype_name(const wasmtime_wasm_importtype_t *);
+  * \brief Returns the name this import is importing from.
+  *
+  * The returned memory is owned by the #wasm_importtype_t argument, the caller
+@@ -857,7 +857,7 @@
+  * that the import name is not provided. This is for imports with the module
+  * linking proposal that only have the module specified.
+  *
+- * \fn const wasm_externtype_t* wasm_importtype_type(const wasm_importtype_t *);
++ * \fn const wasmtime_wasm_externtype_t* wasmtime_wasm_importtype_type(const wasmtime_wasm_importtype_t *);
+  * \brief Returns the type of item this import is importing.
+  *
+  * The returned memory is owned by the #wasm_importtype_t argument, the caller
+@@ -865,71 +865,71 @@
+  */
+ 
+ /**
+- * \struct wasm_exporttype_t
++ * \struct wasmtime_wasm_exporttype_t
+  * \brief An opaque object representing the type of an export.
+  *
+- * \typedef wasm_exporttype_t
++ * \typedef wasmtime_wasm_exporttype_t
+  * \brief Convenience alias for #wasm_exporttype_t
+  *
+- * \struct wasm_exporttype_vec_t
++ * \struct wasmtime_wasm_exporttype_vec_t
+  * \brief A list of #wasm_exporttype_t values.
+  *
+- * \var wasm_exporttype_vec_t::size
++ * \var wasmtime_wasm_exporttype_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_exporttype_vec_t::data
++ * \var wasmtime_wasm_exporttype_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_exporttype_vec_t
++ * \typedef wasmtime_wasm_exporttype_vec_t
+  * \brief Convenience alias for #wasm_exporttype_vec_t
+  *
+- * \fn void wasm_exporttype_delete(wasm_exporttype_t *);
++ * \fn void wasmtime_wasm_exporttype_delete(wasmtime_wasm_exporttype_t *);
+  * \brief Deletes a type.
+  *
+- * \fn void wasm_exporttype_vec_new_empty(wasm_exporttype_vec_t *out);
++ * \fn void wasmtime_wasm_exporttype_vec_new_empty(wasmtime_wasm_exporttype_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_exporttype_vec_new_uninitialized(wasm_exporttype_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_exporttype_vec_new_uninitialized(wasmtime_wasm_exporttype_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_exporttype_vec_new(wasm_exporttype_vec_t *out, size_t, wasm_exporttype_t *const[]);
++ * \fn void wasmtime_wasm_exporttype_vec_new(wasmtime_wasm_exporttype_vec_t *out, size_t, wasmtime_wasm_exporttype_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_exporttype_vec_copy(wasm_exporttype_vec_t *out, const wasm_exporttype_vec_t *)
++ * \fn void wasmtime_wasm_exporttype_vec_copy(wasmtime_wasm_exporttype_vec_t *out, const wasmtime_wasm_exporttype_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_exporttype_vec_delete(wasm_exporttype_vec_t *out)
++ * \fn void wasmtime_wasm_exporttype_vec_delete(wasmtime_wasm_exporttype_vec_t *out)
+  * \brief Deallocates export for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_exporttype_t* wasm_exporttype_copy(const wasm_exporttype_t *)
++ * \fn wasmtime_wasm_exporttype_t* wasmtime_wasm_exporttype_copy(const wasmtime_wasm_exporttype_t *)
+  * \brief Creates a new value which matches the provided one.
+  *
+  * The caller is responsible for deleting the returned value.
+  *
+- * \fn wasm_exporttype_t* wasm_exporttype_new(wasm_name_t *name, wasm_externtype_t *)
++ * \fn wasmtime_wasm_exporttype_t* wasmtime_wasm_exporttype_new(wasmtime_wasm_name_t *name, wasmtime_wasm_externtype_t *)
+  * \brief Creates a new export type.
+  *
+  * This function takes ownership of the `name` and
+  * #wasm_externtype_t arguments. The caller is responsible for deleting the
+  * returned value.
+  *
+- * \fn const wasm_name_t* wasm_exporttype_name(const wasm_exporttype_t *);
++ * \fn const wasmtime_wasm_name_t* wasmtime_wasm_exporttype_name(const wasmtime_wasm_exporttype_t *);
+  * \brief Returns the name of this export.
+  *
+  * The returned memory is owned by the #wasm_exporttype_t argument, the caller
+  * should not deallocate it.
+  *
+- * \fn const wasm_externtype_t* wasm_exporttype_type(const wasm_exporttype_t *);
++ * \fn const wasmtime_wasm_externtype_t* wasmtime_wasm_exporttype_type(const wasmtime_wasm_exporttype_t *);
+  * \brief Returns the type of this export.
+  *
+  * The returned memory is owned by the #wasm_exporttype_t argument, the caller
+@@ -937,7 +937,7 @@
+  */
+ 
+ /**
+- * \struct wasm_val_t
++ * \struct wasmtime_wasm_val_t
+  * \brief Representation of a WebAssembly value.
+  *
+  * Note that this structure is intended to represent the way to communicate
+@@ -948,78 +948,78 @@
+  * #wasm_val_delete function does not delete the memory holding the #wasm_val_t
+  * itself, but only the memory pointed to by #wasm_val_t.
+  *
+- * \var wasm_val_t::kind
++ * \var wasmtime_wasm_val_t::kind
+  * \brief The kind of this value, or which of the fields in the `of` payload
+  * contains the actual value.
+  *
+- * \var wasm_val_t::of
++ * \var wasmtime_wasm_val_t::of
+  * \brief The actual value of this #wasm_val_t. Only one field of this
+  * anonymous union is valid, and which field is valid is defined by the `kind`
+  * field.
+  *
+- * \var wasm_val_t::@0::i32
++ * \var wasmtime_wasm_val_t::@0::i32
+  * \brief value for the `WASM_I32` type
+  *
+- * \var wasm_val_t::@0::i64
++ * \var wasmtime_wasm_val_t::@0::i64
+  * \brief value for the `WASM_I64` type
+  *
+- * \var wasm_val_t::@0::f32
++ * \var wasmtime_wasm_val_t::@0::f32
+  * \brief value for the `WASM_F32` type
+  *
+- * \var wasm_val_t::@0::f64
++ * \var wasmtime_wasm_val_t::@0::f64
+  * \brief value for the `WASM_F64` type
+  *
+- * \var wasm_val_t::@0::ref
++ * \var wasmtime_wasm_val_t::@0::ref
+  * \brief Unused by Wasmtime.
+  *
+- * \typedef wasm_val_t
++ * \typedef wasmtime_wasm_val_t
+  * \brief Convenience alias for #wasm_val_t
+  *
+- * \struct wasm_val_vec_t
++ * \struct wasmtime_wasm_val_vec_t
+  * \brief A list of #wasm_val_t values.
+  *
+- * \var wasm_val_vec_t::size
++ * \var wasmtime_wasm_val_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_val_vec_t::data
++ * \var wasmtime_wasm_val_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_val_vec_t
++ * \typedef wasmtime_wasm_val_vec_t
+  * \brief Convenience alias for #wasm_val_vec_t
+  *
+- * \fn void wasm_val_delete(wasm_val_t *v);
++ * \fn void wasmtime_wasm_val_delete(wasmtime_wasm_val_t *v);
+  * \brief Deletes a type.
+  *
+  * This does not delete the memory pointed to by `v`, so it's safe for `v` to
+  * reside on the stack. Instead this only deletes the memory referenced by `v`,
+  * such as the `ref` variant of #wasm_val_t.
+  *
+- * \fn void wasm_val_vec_new_empty(wasm_val_vec_t *out);
++ * \fn void wasmtime_wasm_val_vec_new_empty(wasmtime_wasm_val_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_val_vec_new_uninitialized(wasm_val_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_val_vec_new_uninitialized(wasmtime_wasm_val_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_val_vec_new(wasm_val_vec_t *out, size_t, wasm_val_t const[]);
++ * \fn void wasmtime_wasm_val_vec_new(wasmtime_wasm_val_vec_t *out, size_t, wasmtime_wasm_val_t const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_val_vec_copy(wasm_val_vec_t *out, const wasm_val_vec_t *)
++ * \fn void wasmtime_wasm_val_vec_copy(wasmtime_wasm_val_vec_t *out, const wasmtime_wasm_val_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_val_vec_delete(wasm_val_vec_t *out)
++ * \fn void wasmtime_wasm_val_vec_delete(wasmtime_wasm_val_vec_t *out)
+  * \brief Deallocates export for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn void wasm_val_copy(wasm_val_t *out, const wasm_val_t *)
++ * \fn void wasmtime_wasm_val_copy(wasmtime_wasm_val_t *out, const wasmtime_wasm_val_t *)
+  * \brief Copies a #wasm_val_t to a new one.
+  *
+  * The second argument to this function is copied to the first. The caller is
+@@ -1029,142 +1029,142 @@
+  */
+ 
+ /**
+- * \struct wasm_ref_t
++ * \struct wasmtime_wasm_ref_t
+  * \brief A reference type: either a funcref or an externref.
+  *
+- * \typedef wasm_ref_t
++ * \typedef wasmtime_wasm_ref_t
+  * \brief Convenience alias for #wasm_ref_t
+  *
+- * \fn void wasm_ref_delete(wasm_ref_t *v);
++ * \fn void wasmtime_wasm_ref_delete(wasmtime_wasm_ref_t *v);
+  * \brief Delete a reference.
+  *
+- * \fn wasm_ref_t *wasm_ref_copy(const wasm_ref_t *)
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_ref_copy(const wasmtime_wasm_ref_t *)
+  * \brief Copy a reference.
+  *
+- * \fn bool wasm_ref_same(const wasm_ref_t *, const wasm_ref_t *)
++ * \fn bool wasmtime_wasm_ref_same(const wasmtime_wasm_ref_t *, const wasmtime_wasm_ref_t *)
+  * \brief Are the given references pointing to the same externref?
+  *
+  * > Note: Wasmtime does not support checking funcrefs for equality, and this
+  * > function will always return false for funcrefs.
+  *
+- * \fn void* wasm_ref_get_host_info(const wasm_ref_t *);
++ * \fn void* wasmtime_wasm_ref_get_host_info(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_ref_set_host_info(wasm_ref_t *, void *);
++ * \fn void wasmtime_wasm_ref_set_host_info(wasmtime_wasm_ref_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_ref_set_host_info_with_finalizer(wasm_ref_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_ref_set_host_info_with_finalizer(wasmtime_wasm_ref_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  */
+ 
+ /**
+- * \struct wasm_frame_t
++ * \struct wasmtime_wasm_frame_t
+  * \brief Opaque struct representing a frame of a wasm stack trace.
+  *
+- * \typedef wasm_frame_t
++ * \typedef wasmtime_wasm_frame_t
+  * \brief Convenience alias for #wasm_frame_t
+  *
+- * \struct wasm_frame_vec_t
++ * \struct wasmtime_wasm_frame_vec_t
+  * \brief A list of #wasm_frame_t frameues.
+  *
+- * \var wasm_frame_vec_t::size
++ * \var wasmtime_wasm_frame_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_frame_vec_t::data
++ * \var wasmtime_wasm_frame_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_frame_vec_t
++ * \typedef wasmtime_wasm_frame_vec_t
+  * \brief Convenience alias for #wasm_frame_vec_t
+  *
+- * \fn void wasm_frame_delete(wasm_frame_t *v);
++ * \fn void wasmtime_wasm_frame_delete(wasmtime_wasm_frame_t *v);
+  * \brief Deletes a frame.
+  *
+- * \fn void wasm_frame_vec_new_empty(wasm_frame_vec_t *out);
++ * \fn void wasmtime_wasm_frame_vec_new_empty(wasmtime_wasm_frame_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_frame_vec_new_uninitialized(wasm_frame_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_frame_vec_new_uninitialized(wasmtime_wasm_frame_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_frame_vec_new(wasm_frame_vec_t *out, size_t, wasm_frame_t *const[]);
++ * \fn void wasmtime_wasm_frame_vec_new(wasmtime_wasm_frame_vec_t *out, size_t, wasmtime_wasm_frame_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_frame_vec_copy(wasm_frame_vec_t *out, const wasm_frame_vec_t *)
++ * \fn void wasmtime_wasm_frame_vec_copy(wasmtime_wasm_frame_vec_t *out, const wasmtime_wasm_frame_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_frame_vec_delete(wasm_frame_vec_t *out)
++ * \fn void wasmtime_wasm_frame_vec_delete(wasmtime_wasm_frame_vec_t *out)
+  * \brief Deallocates export for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_frame_t *wasm_frame_copy(const wasm_frame_t *)
++ * \fn wasmtime_wasm_frame_t *wasmtime_wasm_frame_copy(const wasmtime_wasm_frame_t *)
+  * \brief Returns a copy of the provided frame.
+  *
+  * The caller is expected to call #wasm_frame_delete on the returned frame.
+  *
+- * \fn wasm_instance_t *wasm_frame_instance(const wasm_frame_t *);
++ * \fn wasmtime_wasm_instance_t *wasmtime_wasm_frame_instance(const wasmtime_wasm_frame_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn uint32_t wasm_frame_func_index(const wasm_frame_t *);
++ * \fn uint32_t wasmtime_wasm_frame_func_index(const wasmtime_wasm_frame_t *);
+  * \brief Returns the function index in the original wasm module that this frame
+  * corresponds to.
+  *
+- * \fn uint32_t wasm_frame_func_offset(const wasm_frame_t *);
++ * \fn uint32_t wasmtime_wasm_frame_func_offset(const wasmtime_wasm_frame_t *);
+  * \brief Returns the byte offset from the beginning of the function in the
+  * original wasm file to the instruction this frame points to.
+  *
+- * \fn uint32_t wasm_frame_module_offset(const wasm_frame_t *);
++ * \fn uint32_t wasmtime_wasm_frame_module_offset(const wasmtime_wasm_frame_t *);
+  * \brief Returns the byte offset from the beginning of the original wasm file
+  * to the instruction this frame points to.
+  */
+ 
+ /**
+- * \struct wasm_trap_t
++ * \struct wasmtime_wasm_trap_t
+  * \brief Opaque struct representing a wasm trap.
+  *
+- * \typedef wasm_trap_t
++ * \typedef wasmtime_wasm_trap_t
+  * \brief Convenience alias for #wasm_trap_t
+  *
+- * \fn void wasm_trap_delete(wasm_trap_t *v);
++ * \fn void wasmtime_wasm_trap_delete(wasmtime_wasm_trap_t *v);
+  * \brief Deletes a trap.
+  *
+- * \fn wasm_trap_t *wasm_trap_copy(const wasm_trap_t *)
++ * \fn wasmtime_wasm_trap_t *wasmtime_wasm_trap_copy(const wasmtime_wasm_trap_t *)
+  * \brief Copies a #wasm_trap_t to a new one.
+  *
+  * The caller is responsible for deleting the returned #wasm_trap_t.
+  *
+- * \fn void wasm_trap_same(const wasm_trap_t *, const wasm_trap_t *)
++ * \fn void wasmtime_wasm_trap_same(const wasmtime_wasm_trap_t *, const wasmtime_wasm_trap_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void* wasm_trap_get_host_info(const wasm_trap_t *);
++ * \fn void* wasmtime_wasm_trap_get_host_info(const wasmtime_wasm_trap_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_trap_set_host_info(wasm_trap_t *, void *);
++ * \fn void wasmtime_wasm_trap_set_host_info(wasmtime_wasm_trap_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_trap_set_host_info_with_finalizer(wasm_trap_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_trap_set_host_info_with_finalizer(wasmtime_wasm_trap_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_t *wasm_trap_as_ref(wasm_trap_t *);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_trap_as_ref(wasmtime_wasm_trap_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_trap_t *wasm_ref_as_trap(wasm_ref_t *);
++ * \fn wasmtime_wasm_trap_t *wasmtime_wasm_ref_as_trap(wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_ref_t *wasm_trap_as_ref_const(const wasm_trap_t *);
++ * \fn const wasmtime_wasm_ref_t *wasmtime_wasm_trap_as_ref_const(const wasmtime_wasm_trap_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_trap_t *wasm_ref_as_trap_const(const wasm_ref_t *);
++ * \fn const wasmtime_wasm_trap_t *wasmtime_wasm_ref_as_trap_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_trap_t *wasm_trap_new(wasm_store_t *store, const wasm_message_t *);
++ * \fn wasmtime_wasm_trap_t *wasmtime_wasm_trap_new(wasmtime_wasm_store_t *store, const wasmtime_wasm_message_t *);
+  * \brief Creates a new #wasm_trap_t with the provided message.
+  *
+  * This function will create a new trap within the given #wasm_store_t with the
+@@ -1178,20 +1178,20 @@
+  *
+  * The caller is responsible for deallocating the trap returned.
+  *
+- * \fn void wasm_trap_message(const wasm_trap_t *, wasm_message_t *out);
++ * \fn void wasmtime_wasm_trap_message(const wasmtime_wasm_trap_t *, wasmtime_wasm_message_t *out);
+  * \brief Retrieves the message associated with this trap.
+  *
+  * The caller takes ownership of the returned `out` value and is responsible for
+  * calling #wasm_byte_vec_delete on it.
+  *
+- * \fn wasm_frame_t* wasm_trap_origin(const wasm_trap_t *);
++ * \fn wasmtime_wasm_frame_t* wasmtime_wasm_trap_origin(const wasmtime_wasm_trap_t *);
+  * \brief Returns the top frame of the wasm stack responsible for this trap.
+  *
+  * The caller is responsible for deallocating the returned frame. This function
+  * may return `NULL`, for example, for traps created when there wasn't anything
+  * on the wasm stack.
+  *
+- * \fn void wasm_trap_trace(const wasm_trap_t *, wasm_frame_vec_t *out);
++ * \fn void wasmtime_wasm_trap_trace(const wasmtime_wasm_trap_t *, wasmtime_wasm_frame_vec_t *out);
+  * \brief Returns the trace of wasm frames for this trap.
+  *
+  * The caller is responsible for deallocating the returned list of frames.
+@@ -1201,103 +1201,103 @@
+  */
+ 
+ /**
+- * \struct wasm_foreign_t
++ * \struct wasmtime_wasm_foreign_t
+  * \brief Unimplemented in Wasmtime
+  *
+- * \typedef wasm_foreign_t
++ * \typedef wasmtime_wasm_foreign_t
+  * \brief Convenience alias for #wasm_foreign_t
+  *
+- * \fn void wasm_foreign_delete(wasm_foreign_t *v);
++ * \fn void wasmtime_wasm_foreign_delete(wasmtime_wasm_foreign_t *v);
+  * \brief Unimplemented in Wasmtime, aborts the process if called
+  *
+- * \fn wasm_foreign_t *wasm_foreign_copy(const wasm_foreign_t *)
++ * \fn wasmtime_wasm_foreign_t *wasmtime_wasm_foreign_copy(const wasmtime_wasm_foreign_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called
+  *
+- * \fn void wasm_foreign_same(const wasm_foreign_t *, const wasm_foreign_t *)
++ * \fn void wasmtime_wasm_foreign_same(const wasmtime_wasm_foreign_t *, const wasmtime_wasm_foreign_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void* wasm_foreign_get_host_info(const wasm_foreign_t *);
++ * \fn void* wasmtime_wasm_foreign_get_host_info(const wasmtime_wasm_foreign_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_foreign_set_host_info(wasm_foreign_t *, void *);
++ * \fn void wasmtime_wasm_foreign_set_host_info(wasmtime_wasm_foreign_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_foreign_set_host_info_with_finalizer(wasm_foreign_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_foreign_set_host_info_with_finalizer(wasmtime_wasm_foreign_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_t *wasm_foreign_as_ref(wasm_foreign_t *);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_foreign_as_ref(wasmtime_wasm_foreign_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_foreign_t *wasm_ref_as_foreign(wasm_ref_t *);
++ * \fn wasmtime_wasm_foreign_t *wasmtime_wasm_ref_as_foreign(wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_ref_t *wasm_foreign_as_ref_const(const wasm_foreign_t *);
++ * \fn const wasmtime_wasm_ref_t *wasmtime_wasm_foreign_as_ref_const(const wasmtime_wasm_foreign_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_foreign_t *wasm_ref_as_foreign_const(const wasm_ref_t *);
++ * \fn const wasmtime_wasm_foreign_t *wasmtime_wasm_ref_as_foreign_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_foreign_t *wasm_foreign_new(wasm_store_t *store);
++ * \fn wasmtime_wasm_foreign_t *wasmtime_wasm_foreign_new(wasmtime_wasm_store_t *store);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  */
+ 
+ /**
+- * \struct wasm_module_t
++ * \struct wasmtime_wasm_module_t
+  * \brief Opaque struct representing a compiled wasm module.
+  *
+  * This structure is safe to send across threads in Wasmtime.
+  *
+- * \typedef wasm_module_t
++ * \typedef wasmtime_wasm_module_t
+  * \brief Convenience alias for #wasm_module_t
+  *
+- * \struct wasm_shared_module_t
++ * \struct wasmtime_wasm_shared_module_t
+  * \brief Opaque struct representing module that can be sent between threads.
+  *
+  * This structure is safe to send across threads in Wasmtime. Note that in
+  * Wasmtime #wasm_module_t is also safe to share across threads.
+  *
+- * \typedef wasm_shared_module_t
++ * \typedef wasmtime_wasm_shared_module_t
+  * \brief Convenience alias for #wasm_shared_module_t
+  *
+- * \fn void wasm_module_delete(wasm_module_t *v);
++ * \fn void wasmtime_wasm_module_delete(wasmtime_wasm_module_t *v);
+  * \brief Deletes a module.
+  *
+- * \fn wasm_module_t *wasm_module_copy(const wasm_module_t *)
++ * \fn wasmtime_wasm_module_t *wasmtime_wasm_module_copy(const wasmtime_wasm_module_t *)
+  * \brief Copies a #wasm_module_t to a new one.
+  *
+  * The caller is responsible for deleting the returned #wasm_module_t.
+  *
+- * \fn void wasm_module_same(const wasm_module_t *, const wasm_module_t *)
++ * \fn void wasmtime_wasm_module_same(const wasmtime_wasm_module_t *, const wasmtime_wasm_module_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void* wasm_module_get_host_info(const wasm_module_t *);
++ * \fn void* wasmtime_wasm_module_get_host_info(const wasmtime_wasm_module_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_module_set_host_info(wasm_module_t *, void *);
++ * \fn void wasmtime_wasm_module_set_host_info(wasmtime_wasm_module_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_module_set_host_info_with_finalizer(wasm_module_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_module_set_host_info_with_finalizer(wasmtime_wasm_module_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_t *wasm_module_as_ref(wasm_module_t *);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_module_as_ref(wasmtime_wasm_module_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_module_t *wasm_ref_as_module(wasm_ref_t *);
++ * \fn wasmtime_wasm_module_t *wasmtime_wasm_ref_as_module(wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_ref_t *wasm_module_as_ref_const(const wasm_module_t *);
++ * \fn const wasmtime_wasm_ref_t *wasmtime_wasm_module_as_ref_const(const wasmtime_wasm_module_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_module_t *wasm_ref_as_module_const(const wasm_ref_t *);
++ * \fn const wasmtime_wasm_module_t *wasmtime_wasm_ref_as_module_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_as_module_const(const wasm_ref_t *);
++ * \fn wasmtime_wasm_ref_as_module_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_shared_module_delete(wasm_shared_module_t *);
++ * \fn void wasmtime_wasm_shared_module_delete(wasmtime_wasm_shared_module_t *);
+  * \brief Deletes the provided module.
+  *
+- * \fn wasm_shared_module_t *wasm_module_share(const wasm_module_t *);
++ * \fn wasmtime_wasm_shared_module_t *wasmtime_wasm_module_share(const wasmtime_wasm_module_t *);
+  * \brief Creates a shareable module from the provided module.
+  *
+  * > Note that this API is not necessary in Wasmtime because #wasm_module_t can
+@@ -1306,7 +1306,7 @@
+  * This function does not take ownership of the argument, but the caller is
+  * expected to deallocate the returned #wasm_shared_module_t.
+  *
+- * \fn wasm_module_t *wasm_module_obtain(wasm_store_t *, const wasm_shared_module_t *);
++ * \fn wasmtime_wasm_module_t *wasmtime_wasm_module_obtain(wasmtime_wasm_store_t *, const wasmtime_wasm_shared_module_t *);
+  * \brief Attempts to create a #wasm_module_t from the shareable module.
+  *
+  * > Note that this API is not necessary in Wasmtime because #wasm_module_t can
+@@ -1318,7 +1318,7 @@
+  * This function may fail if the engines associated with the #wasm_store_t or
+  * #wasm_shared_module_t are different.
+  *
+- * \fn wasm_module_t *wasm_module_new(wasm_store_t *, const wasm_byte_vec_t *binary)
++ * \fn wasmtime_wasm_module_t *wasmtime_wasm_module_new(wasmtime_wasm_store_t *, const wasmtime_wasm_byte_vec_t *binary)
+  * \brief Compiles a raw WebAssembly binary to a #wasm_module_t.
+  *
+  * This function will validate and compile the provided binary. The returned
+@@ -1330,14 +1330,14 @@
+  * This function may fail if the provided binary is not a WebAssembly binary or
+  * if it does not pass validation. In these cases this function returns `NULL`.
+  *
+- * \fn bool wasm_module_validate(wasm_store_t *, const wasm_byte_vec_t *binary);
++ * \fn bool wasmtime_wasm_module_validate(wasmtime_wasm_store_t *, const wasmtime_wasm_byte_vec_t *binary);
+  * \brief Validates whether a provided byte sequence is a valid wasm binary.
+  *
+  * This function will perform any internal validation necessary to determine if
+  * `binary` is a valid WebAssembly binary according to the configuration of the
+  * #wasm_store_t provided.
+  *
+- * \fn void wasm_module_imports(const wasm_module_t *, wasm_importtype_vec_t *out);
++ * \fn void wasmtime_wasm_module_imports(const wasmtime_wasm_module_t *, wasmtime_wasm_importtype_vec_t *out);
+  * \brief Returns the list of imports that this module expects.
+  *
+  * The list of imports returned are the types of items expected to be passed to
+@@ -1348,7 +1348,7 @@
+  * `out` is passed to the caller. Note that `out` is treated as uninitialized
+  * when passed to this function.
+  *
+- * \fn void wasm_module_exports(const wasm_module_t *, wasm_exporttype_vec_t *out);
++ * \fn void wasmtime_wasm_module_exports(const wasmtime_wasm_module_t *, wasmtime_wasm_exporttype_vec_t *out);
+  * \brief Returns the list of exports that this module provides.
+  *
+  * The list of exports returned are in the same order as the items returned by
+@@ -1358,14 +1358,14 @@
+  * of `out` is passed to the caller. Note that `out` is treated as
+  * uninitialized when passed to this function.
+  *
+- * \fn void wasm_module_serialize(const wasm_module_t *, wasm_byte_vec_t *out);
++ * \fn void wasmtime_wasm_module_serialize(const wasmtime_wasm_module_t *, wasmtime_wasm_byte_vec_t *out);
+  * \brief Serializes the provided module to a byte vector.
+  *
+  * Does not take ownership of the input module but expects the caller will
+  * deallocate the `out` vector. The byte vector can later be deserialized
+  * through #wasm_module_deserialize.
+  *
+- * \fn wasm_module_t *wasm_module_deserialize(wasm_store_t *, const wasm_byte_vec_t *);
++ * \fn wasmtime_wasm_module_t *wasmtime_wasm_module_deserialize(wasmtime_wasm_store_t *, const wasmtime_wasm_byte_vec_t *);
+  * \brief Deserializes a previously-serialized module.
+  *
+  * The input bytes must have been created from a previous call to
+@@ -1373,13 +1373,13 @@
+  */
+ 
+ /**
+- * \struct wasm_func_t
++ * \struct wasmtime_wasm_func_t
+  * \brief Opaque struct representing a compiled wasm function.
+  *
+- * \typedef wasm_func_t
++ * \typedef wasmtime_wasm_func_t
+  * \brief Convenience alias for #wasm_func_t
+  *
+- * \typedef wasm_func_callback_t
++ * \typedef wasmtime_wasm_func_callback_t
+  * \brief Type definition for functions passed to #wasm_func_new.
+  *
+  * This is the type signature of a host function created with #wasm_func_new.
+@@ -1397,49 +1397,49 @@
+  * Ownership of the results and the trap returned, if any, is passed to the
+  * caller of this function.
+  *
+- * \typedef wasm_func_callback_with_env_t
++ * \typedef wasmtime_wasm_func_callback_with_env_t
+  * \brief Type definition for functions passed to #wasm_func_new_with_env
+  *
+  * The semantics of this function are the same as those of
+  * #wasm_func_callback_t, except the first argument is the same `void*` argument
+  * passed to #wasm_func_new_with_env.
+  *
+- * \fn void wasm_func_delete(wasm_func_t *v);
++ * \fn void wasmtime_wasm_func_delete(wasmtime_wasm_func_t *v);
+  * \brief Deletes a func.
+  *
+- * \fn wasm_func_t *wasm_func_copy(const wasm_func_t *)
++ * \fn wasmtime_wasm_func_t *wasmtime_wasm_func_copy(const wasmtime_wasm_func_t *)
+  * \brief Copies a #wasm_func_t to a new one.
+  *
+  * The caller is responsible for deleting the returned #wasm_func_t.
+  *
+- * \fn void wasm_func_same(const wasm_func_t *, const wasm_func_t *)
++ * \fn void wasmtime_wasm_func_same(const wasmtime_wasm_func_t *, const wasmtime_wasm_func_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void* wasm_func_get_host_info(const wasm_func_t *);
++ * \fn void* wasmtime_wasm_func_get_host_info(const wasmtime_wasm_func_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_func_set_host_info(wasm_func_t *, void *);
++ * \fn void wasmtime_wasm_func_set_host_info(wasmtime_wasm_func_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_func_set_host_info_with_finalizer(wasm_func_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_func_set_host_info_with_finalizer(wasmtime_wasm_func_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_t *wasm_func_as_ref(wasm_func_t *);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_func_as_ref(wasmtime_wasm_func_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_func_t *wasm_ref_as_func(wasm_ref_t *);
++ * \fn wasmtime_wasm_func_t *wasmtime_wasm_ref_as_func(wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_ref_t *wasm_func_as_ref_const(const wasm_func_t *);
++ * \fn const wasmtime_wasm_ref_t *wasmtime_wasm_func_as_ref_const(const wasmtime_wasm_func_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_func_t *wasm_ref_as_func_const(const wasm_ref_t *);
++ * \fn const wasmtime_wasm_func_t *wasmtime_wasm_ref_as_func_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_as_func_const(const wasm_ref_t *);
++ * \fn wasmtime_wasm_ref_as_func_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_func_t *wasm_func_new(wasm_store_t *, const wasm_functype_t *, wasm_func_callback_t);
++ * \fn wasmtime_wasm_func_t *wasmtime_wasm_func_new(wasmtime_wasm_store_t *, const wasmtime_wasm_functype_t *, wasmtime_wasm_func_callback_t);
+  * \brief Creates a new WebAssembly function with host functionality.
+  *
+  * This function creates a new #wasm_func_t from a host-provided function. The
+@@ -1449,10 +1449,10 @@
+  * The returned #wasm_func_t is expected to be deleted by the caller. This
+  * function does not take ownership of its arguments.
+  *
+- * \fn wasm_func_t *wasm_func_new_with_env(
+- *    wasm_store_t *,
+- *    const wasm_functype_t *type,
+- *    wasm_func_callback_with_env_t,
++ * \fn wasmtime_wasm_func_t *wasmtime_wasm_func_new_with_env(
++ *    wasmtime_wasm_store_t *,
++ *    const wasmtime_wasm_functype_t *type,
++ *    wasmtime_wasm_func_callback_with_env_t,
+  *    void *env,
+  *    void (*finalizer)(void *));
+  * \brief Creates a new WebAssembly function with host functionality.
+@@ -1469,18 +1469,18 @@
+  * deallocated automatically by calling `finalizer`). This function yields
+  * ownership of the returned #wasm_func_t to the caller.
+  *
+- * \fn wasm_functype_t *wasm_func_type(const wasm_func_t *);
++ * \fn wasmtime_wasm_functype_t *wasmtime_wasm_func_type(const wasmtime_wasm_func_t *);
+  * \brief Returns the type of this function.
+  *
+  * The returned #wasm_functype_t is expected to be deallocated by the caller.
+  *
+- * \fn size_t wasm_func_param_arity(const wasm_func_t *);
++ * \fn size_t wasmtime_wasm_func_param_arity(const wasmtime_wasm_func_t *);
+  * \brief Returns the number of arguments expected by this function.
+  *
+- * \fn size_t wasm_func_result_arity(const wasm_func_t *);
++ * \fn size_t wasmtime_wasm_func_result_arity(const wasmtime_wasm_func_t *);
+  * \brief Returns the number of results returned by this function.
+  *
+-* \fn wasm_trap_t *wasm_func_call(const wasm_func_t *, const wasm_val_vec_t *args, wasm_val_vec_t *results);
++* \fn wasmtime_wasm_trap_t *wasmtime_wasm_func_call(const wasmtime_wasm_func_t *, const wasmtime_wasm_val_vec_t *args, wasmtime_wasm_val_vec_t *results);
+  * \brief Calls the provided function with the arguments given.
+  *
+  * This function is used to call WebAssembly from the host. The parameter array
+@@ -1504,48 +1504,48 @@
+  */
+ 
+ /**
+- * \struct wasm_global_t
++ * \struct wasmtime_wasm_global_t
+  * \brief Opaque struct representing a wasm global.
+  *
+- * \typedef wasm_global_t
++ * \typedef wasmtime_wasm_global_t
+  * \brief Convenience alias for #wasm_global_t
+  *
+- * \fn void wasm_global_delete(wasm_global_t *v);
++ * \fn void wasmtime_wasm_global_delete(wasmtime_wasm_global_t *v);
+  * \brief Deletes a global.
+  *
+- * \fn wasm_global_t *wasm_global_copy(const wasm_global_t *)
++ * \fn wasmtime_wasm_global_t *wasmtime_wasm_global_copy(const wasmtime_wasm_global_t *)
+  * \brief Copies a #wasm_global_t to a new one.
+  *
+  * The caller is responsible for deleting the returned #wasm_global_t.
+  *
+- * \fn void wasm_global_same(const wasm_global_t *, const wasm_global_t *)
++ * \fn void wasmtime_wasm_global_same(const wasmtime_wasm_global_t *, const wasmtime_wasm_global_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void* wasm_global_get_host_info(const wasm_global_t *);
++ * \fn void* wasmtime_wasm_global_get_host_info(const wasmtime_wasm_global_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_global_set_host_info(wasm_global_t *, void *);
++ * \fn void wasmtime_wasm_global_set_host_info(wasmtime_wasm_global_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_global_set_host_info_with_finalizer(wasm_global_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_global_set_host_info_with_finalizer(wasmtime_wasm_global_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_t *wasm_global_as_ref(wasm_global_t *);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_global_as_ref(wasmtime_wasm_global_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_global_t *wasm_ref_as_global(wasm_ref_t *);
++ * \fn wasmtime_wasm_global_t *wasmtime_wasm_ref_as_global(wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_ref_t *wasm_global_as_ref_const(const wasm_global_t *);
++ * \fn const wasmtime_wasm_ref_t *wasmtime_wasm_global_as_ref_const(const wasmtime_wasm_global_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_global_t *wasm_ref_as_global_const(const wasm_ref_t *);
++ * \fn const wasmtime_wasm_global_t *wasmtime_wasm_ref_as_global_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_as_global_const(const wasm_ref_t *);
++ * \fn wasmtime_wasm_ref_as_global_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_global_t *wasm_global_new(wasm_store_t *, const wasm_globaltype_t *, const wasm_val_t *);
++ * \fn wasmtime_wasm_global_t *wasmtime_wasm_global_new(wasmtime_wasm_store_t *, const wasmtime_wasm_globaltype_t *, const wasmtime_wasm_val_t *);
+  * \brief Creates a new WebAssembly global.
+  *
+  * This function is used to create a wasm global from the host, typically to
+@@ -1560,18 +1560,18 @@
+  * This function does not take ownership of any of its arguments. The caller is
+  * expected to deallocate the returned value.
+  *
+- * \fn wasm_globaltype_t *wasm_global_type(const wasm_global_t *);
++ * \fn wasmtime_wasm_globaltype_t *wasmtime_wasm_global_type(const wasmtime_wasm_global_t *);
+  * \brief Returns the type of this global.
+  *
+  * The caller is expected to deallocate the returned #wasm_globaltype_t.
+  *
+- * \fn void wasm_global_get(const wasm_global_t *, wasm_val_t *out);
++ * \fn void wasmtime_wasm_global_get(const wasmtime_wasm_global_t *, wasmtime_wasm_val_t *out);
+  * \brief Gets the value of this global.
+  *
+  * The caller is expected to deallocate the returned #wasm_val_t. The provided
+  * `out` argument is treated as uninitialized on input.
+  *
+- * \fn void wasm_global_set(wasm_global_t *, const wasm_val_t *);
++ * \fn void wasmtime_wasm_global_set(wasmtime_wasm_global_t *, const wasmtime_wasm_val_t *);
+  * \brief Sets the value of this global.
+  *
+  * This function will set the value of a global to a new value. This function
+@@ -1583,51 +1583,51 @@
+  */
+ 
+ /**
+- * \struct wasm_table_t
++ * \struct wasmtime_wasm_table_t
+  * \brief Opaque struct representing a wasm table.
+  *
+- * \typedef wasm_table_t
++ * \typedef wasmtime_wasm_table_t
+  * \brief Convenience alias for #wasm_table_t
+  *
+- * \typedef wasm_table_size_t
++ * \typedef wasmtime_wasm_table_size_t
+  * \brief Typedef for indices and sizes of wasm tables.
+  *
+- * \fn void wasm_table_delete(wasm_table_t *v);
++ * \fn void wasmtime_wasm_table_delete(wasmtime_wasm_table_t *v);
+  * \brief Deletes a table.
+  *
+- * \fn wasm_table_t *wasm_table_copy(const wasm_table_t *)
++ * \fn wasmtime_wasm_table_t *wasmtime_wasm_table_copy(const wasmtime_wasm_table_t *)
+  * \brief Copies a #wasm_table_t to a new one.
+  *
+  * The caller is responsible for deleting the returned #wasm_table_t.
+  *
+- * \fn void wasm_table_same(const wasm_table_t *, const wasm_table_t *)
++ * \fn void wasmtime_wasm_table_same(const wasmtime_wasm_table_t *, const wasmtime_wasm_table_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void* wasm_table_get_host_info(const wasm_table_t *);
++ * \fn void* wasmtime_wasm_table_get_host_info(const wasmtime_wasm_table_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_table_set_host_info(wasm_table_t *, void *);
++ * \fn void wasmtime_wasm_table_set_host_info(wasmtime_wasm_table_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_table_set_host_info_with_finalizer(wasm_table_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_table_set_host_info_with_finalizer(wasmtime_wasm_table_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_t *wasm_table_as_ref(wasm_table_t *);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_table_as_ref(wasmtime_wasm_table_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_table_t *wasm_ref_as_table(wasm_ref_t *);
++ * \fn wasmtime_wasm_table_t *wasmtime_wasm_ref_as_table(wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_ref_t *wasm_table_as_ref_const(const wasm_table_t *);
++ * \fn const wasmtime_wasm_ref_t *wasmtime_wasm_table_as_ref_const(const wasmtime_wasm_table_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_table_t *wasm_ref_as_table_const(const wasm_ref_t *);
++ * \fn const wasmtime_wasm_table_t *wasmtime_wasm_ref_as_table_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_as_table_const(const wasm_ref_t *);
++ * \fn wasmtime_wasm_ref_as_table_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_table_t *wasm_table_new(wasm_store_t *, const wasm_tabletype_t *, wasm_ref_t *init);
++ * \fn wasmtime_wasm_table_t *wasmtime_wasm_table_new(wasmtime_wasm_store_t *, const wasmtime_wasm_tabletype_t *, wasmtime_wasm_ref_t *init);
+  * \brief Creates a new WebAssembly table.
+  *
+  * Creates a new host-defined table of values. This table has the type provided
+@@ -1638,12 +1638,12 @@
+  *
+  * Does not take ownship of the `init` value.
+  *
+- * \fn wasm_tabletype_t *wasm_table_type(const wasm_table_t *);
++ * \fn wasmtime_wasm_tabletype_t *wasmtime_wasm_table_type(const wasmtime_wasm_table_t *);
+  * \brief Returns the type of this table.
+  *
+  * The caller is expected to deallocate the returned #wasm_tabletype_t.
+  *
+- * \fn wasm_ref_t *wasm_table_get(const wasm_table_t *, wasm_table_size_t index);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_table_get(const wasmtime_wasm_table_t *, wasmtime_wasm_table_size_t index);
+  * \brief Gets an element from this table.
+  *
+  * Attempts to get a value at an index in this table. This function returns
+@@ -1651,7 +1651,7 @@
+  *
+  * Gives ownership of the resulting `wasm_ref_t*`.
+  *
+- * \fn void wasm_table_set(wasm_table_t *, wasm_table_size_t index, wasm_ref_t *);
++ * \fn void wasmtime_wasm_table_set(wasmtime_wasm_table_t *, wasmtime_wasm_table_size_t index, wasmtime_wasm_ref_t *);
+  * \brief Sets an element in this table.
+  *
+  * Attempts to set a value at an index in this table. This function does nothing
+@@ -1663,10 +1663,10 @@
+  *
+  * Does not take ownership of the given `wasm_ref_t*`.
+  *
+- * \fn wasm_table_size_t wasm_table_size(const wasm_table_t *);
++ * \fn wasmtime_wasm_table_size_t wasmtime_wasm_table_size(const wasmtime_wasm_table_t *);
+  * \brief Gets the current size, in elements, of this table.
+  *
+- * \fn bool wasm_table_grow(wasm_table_t *, wasm_table_size_t delta, wasm_ref_t *init);
++ * \fn bool wasmtime_wasm_table_grow(wasmtime_wasm_table_t *, wasmtime_wasm_table_size_t delta, wasmtime_wasm_ref_t *init);
+  * \brief Attempts to grow this table by `delta` elements.
+  *
+  * This function will grow the table by `delta` elements, initializing all new
+@@ -1683,72 +1683,72 @@
+  */
+ 
+ /**
+- * \struct wasm_memory_t
++ * \struct wasmtime_wasm_memory_t
+  * \brief Opaque struct representing a wasm memory.
+  *
+- * \typedef wasm_memory_t
++ * \typedef wasmtime_wasm_memory_t
+  * \brief Convenience alias for #wasm_memory_t
+  *
+- * \typedef wasm_memory_pages_t
++ * \typedef wasmtime_wasm_memory_pages_t
+  * \brief Unsigned integer to hold the number of pages a memory has.
+  *
+- * \fn void wasm_memory_delete(wasm_memory_t *v);
++ * \fn void wasmtime_wasm_memory_delete(wasmtime_wasm_memory_t *v);
+  * \brief Deletes a memory.
+  *
+- * \fn wasm_memory_t *wasm_memory_copy(const wasm_memory_t *)
++ * \fn wasmtime_wasm_memory_t *wasmtime_wasm_memory_copy(const wasmtime_wasm_memory_t *)
+  * \brief Copies a #wasm_memory_t to a new one.
+  *
+  * The caller is responsible for deleting the returned #wasm_memory_t.
+  *
+- * \fn void wasm_memory_same(const wasm_memory_t *, const wasm_memory_t *)
++ * \fn void wasmtime_wasm_memory_same(const wasmtime_wasm_memory_t *, const wasmtime_wasm_memory_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void* wasm_memory_get_host_info(const wasm_memory_t *);
++ * \fn void* wasmtime_wasm_memory_get_host_info(const wasmtime_wasm_memory_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_memory_set_host_info(wasm_memory_t *, void *);
++ * \fn void wasmtime_wasm_memory_set_host_info(wasmtime_wasm_memory_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_memory_set_host_info_with_finalizer(wasm_memory_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_memory_set_host_info_with_finalizer(wasmtime_wasm_memory_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_t *wasm_memory_as_ref(wasm_memory_t *);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_memory_as_ref(wasmtime_wasm_memory_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_memory_t *wasm_ref_as_memory(wasm_ref_t *);
++ * \fn wasmtime_wasm_memory_t *wasmtime_wasm_ref_as_memory(wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_ref_t *wasm_memory_as_ref_const(const wasm_memory_t *);
++ * \fn const wasmtime_wasm_ref_t *wasmtime_wasm_memory_as_ref_const(const wasmtime_wasm_memory_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_memory_t *wasm_ref_as_memory_const(const wasm_ref_t *);
++ * \fn const wasmtime_wasm_memory_t *wasmtime_wasm_ref_as_memory_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_as_memory_const(const wasm_ref_t *);
++ * \fn wasmtime_wasm_ref_as_memory_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_memory_t *wasm_memory_new(wasm_store_t *, const wasm_memorytype_t *);
++ * \fn wasmtime_wasm_memory_t *wasmtime_wasm_memory_new(wasmtime_wasm_store_t *, const wasmtime_wasm_memorytype_t *);
+  * \brief Creates a new WebAssembly memory.
+  *
+- * \fn wasm_memorytype_t *wasm_memory_type(const wasm_memory_t *);
++ * \fn wasmtime_wasm_memorytype_t *wasmtime_wasm_memory_type(const wasmtime_wasm_memory_t *);
+  * \brief Returns the type of this memory.
+  *
+  * The caller is expected to deallocate the returned #wasm_memorytype_t.
+  *
+- * \fn byte_t *wasm_memory_data(wasm_memory_t *);
++ * \fn byte_t *wasmtime_wasm_memory_data(wasmtime_wasm_memory_t *);
+  * \brief Returns the base address, in memory, where this memory is located.
+  *
+  * Note that the returned address may change over time when growth happens. The
+  * returned pointer is only valid until the memory is next grown (which could
+  * happen in wasm itself).
+  *
+- * \fn size_t wasm_memory_data_size(const wasm_memory_t *);
++ * \fn size_t wasmtime_wasm_memory_data_size(const wasmtime_wasm_memory_t *);
+  * \brief Returns the size, in bytes, of this memory.
+  *
+- * \fn wasm_memory_pages_t wasm_memory_size(const wasm_memory_t *);
++ * \fn wasmtime_wasm_memory_pages_t wasmtime_wasm_memory_size(const wasmtime_wasm_memory_t *);
+  * \brief Returns the size, in wasm pages, of this memory.
+  *
+- * \fn bool wasm_memory_grow(wasm_memory_t *, wasm_memory_pages_t delta);
++ * \fn bool wasmtime_wasm_memory_grow(wasmtime_wasm_memory_t *, wasmtime_wasm_memory_pages_t delta);
+  * \brief Attempts to grow this memory by `delta` wasm pages.
+  *
+  * This function is similar to the `memory.grow` instruction in wasm itself. It
+@@ -1757,151 +1757,151 @@
+  */
+ 
+ /**
+- * \struct wasm_extern_t
++ * \struct wasmtime_wasm_extern_t
+  * \brief Opaque struct representing a wasm external value.
+  *
+- * \typedef wasm_extern_t
++ * \typedef wasmtime_wasm_extern_t
+  * \brief Convenience alias for #wasm_extern_t
+  *
+- * \struct wasm_extern_vec_t
++ * \struct wasmtime_wasm_extern_vec_t
+  * \brief A list of #wasm_extern_t values.
+  *
+- * \var wasm_extern_vec_t::size
++ * \var wasmtime_wasm_extern_vec_t::size
+  * \brief Length of this vector.
+  *
+- * \var wasm_extern_vec_t::data
++ * \var wasmtime_wasm_extern_vec_t::data
+  * \brief Pointer to the base of this vector
+  *
+- * \typedef wasm_extern_vec_t
++ * \typedef wasmtime_wasm_extern_vec_t
+  * \brief Convenience alias for #wasm_extern_vec_t
+  *
+- * \fn void wasm_extern_delete(wasm_extern_t *v);
++ * \fn void wasmtime_wasm_extern_delete(wasmtime_wasm_extern_t *v);
+  * \brief Deletes a extern.
+  *
+- * \fn void wasm_extern_vec_new_empty(wasm_extern_vec_t *out);
++ * \fn void wasmtime_wasm_extern_vec_new_empty(wasmtime_wasm_extern_vec_t *out);
+  * \brief Creates an empty vector.
+  *
+  * See #wasm_byte_vec_new_empty for more information.
+  *
+- * \fn void wasm_extern_vec_new_uninitialized(wasm_extern_vec_t *out, size_t);
++ * \fn void wasmtime_wasm_extern_vec_new_uninitialized(wasmtime_wasm_extern_vec_t *out, size_t);
+  * \brief Creates a vector with the given capacity.
+  *
+  * See #wasm_byte_vec_new_uninitialized for more information.
+  *
+- * \fn void wasm_extern_vec_new(wasm_extern_vec_t *out, size_t, wasm_extern_t *const[]);
++ * \fn void wasmtime_wasm_extern_vec_new(wasmtime_wasm_extern_vec_t *out, size_t, wasmtime_wasm_extern_t *const[]);
+  * \brief Creates a vector with the provided contents.
+  *
+  * See #wasm_byte_vec_new for more information.
+  *
+- * \fn void wasm_extern_vec_copy(wasm_extern_vec_t *out, const wasm_extern_vec_t *)
++ * \fn void wasmtime_wasm_extern_vec_copy(wasmtime_wasm_extern_vec_t *out, const wasmtime_wasm_extern_vec_t *)
+  * \brief Copies one vector to another
+  *
+  * See #wasm_byte_vec_copy for more information.
+  *
+- * \fn void wasm_extern_vec_delete(wasm_extern_vec_t *out)
++ * \fn void wasmtime_wasm_extern_vec_delete(wasmtime_wasm_extern_vec_t *out)
+  * \brief Deallocates import for a vector.
+  *
+  * See #wasm_byte_vec_delete for more information.
+  *
+- * \fn wasm_extern_t *wasm_extern_copy(const wasm_extern_t *)
++ * \fn wasmtime_wasm_extern_t *wasmtime_wasm_extern_copy(const wasmtime_wasm_extern_t *)
+  * \brief Copies a #wasm_extern_t to a new one.
+  *
+  * The caller is responsible for deleting the returned #wasm_extern_t.
+  *
+- * \fn void wasm_extern_same(const wasm_extern_t *, const wasm_extern_t *)
++ * \fn void wasmtime_wasm_extern_same(const wasmtime_wasm_extern_t *, const wasmtime_wasm_extern_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void* wasm_extern_get_host_info(const wasm_extern_t *);
++ * \fn void* wasmtime_wasm_extern_get_host_info(const wasmtime_wasm_extern_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_extern_set_host_info(wasm_extern_t *, void *);
++ * \fn void wasmtime_wasm_extern_set_host_info(wasmtime_wasm_extern_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_extern_set_host_info_with_finalizer(wasm_extern_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_extern_set_host_info_with_finalizer(wasmtime_wasm_extern_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_t *wasm_extern_as_ref(wasm_extern_t *);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_extern_as_ref(wasmtime_wasm_extern_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_extern_t *wasm_ref_as_extern(wasm_ref_t *);
++ * \fn wasmtime_wasm_extern_t *wasmtime_wasm_ref_as_extern(wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_ref_t *wasm_extern_as_ref_const(const wasm_extern_t *);
++ * \fn const wasmtime_wasm_ref_t *wasmtime_wasm_extern_as_ref_const(const wasmtime_wasm_extern_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_extern_t *wasm_ref_as_extern_const(const wasm_ref_t *);
++ * \fn const wasmtime_wasm_extern_t *wasmtime_wasm_ref_as_extern_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_as_extern_const(const wasm_ref_t *);
++ * \fn wasmtime_wasm_ref_as_extern_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_externkind_t *wasm_extern_kind(const wasm_extern_t *);
++ * \fn wasmtime_wasm_externkind_t *wasmtime_wasm_extern_kind(const wasmtime_wasm_extern_t *);
+  * \brief Returns the kind of this extern, indicating what it will downcast as.
+  *
+- * \fn wasm_externtype_t *wasm_extern_type(const wasm_extern_t *);
++ * \fn wasmtime_wasm_externtype_t *wasmtime_wasm_extern_type(const wasmtime_wasm_extern_t *);
+  * \brief Returns the type of this extern.
+  *
+  * The caller is expected to deallocate the returned #wasm_externtype_t.
+  */
+ 
+ /**
+- * \fn wasm_extern_t *wasm_func_as_extern(wasm_func_t *f);
++ * \fn wasmtime_wasm_extern_t *wasmtime_wasm_func_as_extern(wasmtime_wasm_func_t *f);
+  * \brief Converts a #wasm_func_t to #wasm_extern_t.
+  *
+  * The returned #wasm_extern_t is owned by the #wasm_func_t argument. Callers
+  * should not delete the returned value, and it only lives as long as the
+  * #wasm_func_t argument.
+  *
+- * \fn wasm_extern_t *wasm_global_as_extern(wasm_global_t *f);
++ * \fn wasmtime_wasm_extern_t *wasmtime_wasm_global_as_extern(wasmtime_wasm_global_t *f);
+  * \brief Converts a #wasm_global_t to #wasm_extern_t.
+  *
+  * The returned #wasm_extern_t is owned by the #wasm_global_t argument. Callers
+  * should not delete the returned value, and it only lives as long as the
+  * #wasm_global_t argument.
+  *
+- * \fn wasm_extern_t *wasm_memory_as_extern(wasm_memory_t *f);
++ * \fn wasmtime_wasm_extern_t *wasmtime_wasm_memory_as_extern(wasmtime_wasm_memory_t *f);
+  * \brief Converts a #wasm_memory_t to #wasm_extern_t.
+  *
+  * The returned #wasm_extern_t is owned by the #wasm_memory_t argument. Callers
+  * should not delete the returned value, and it only lives as long as the
+  * #wasm_memory_t argument.
+  *
+- * \fn wasm_extern_t *wasm_table_as_extern(wasm_table_t *f);
++ * \fn wasmtime_wasm_extern_t *wasmtime_wasm_table_as_extern(wasmtime_wasm_table_t *f);
+  * \brief Converts a #wasm_table_t to #wasm_extern_t.
+  *
+  * The returned #wasm_extern_t is owned by the #wasm_table_t argument. Callers
+  * should not delete the returned value, and it only lives as long as the
+  * #wasm_table_t argument.
+  *
+- * \fn const wasm_extern_t *wasm_func_as_extern_const(const wasm_func_t *f);
++ * \fn const wasmtime_wasm_extern_t *wasmtime_wasm_func_as_extern_const(const wasmtime_wasm_func_t *f);
+  * \brief Converts a #wasm_func_t to #wasm_extern_t.
+  *
+  * The returned #wasm_extern_t is owned by the #wasm_func_t argument. Callers
+  * should not delete the returned value, and it only lives as long as the
+  * #wasm_func_t argument.
+  *
+- * \fn const wasm_extern_t *wasm_global_as_extern_const(const wasm_global_t *f);
++ * \fn const wasmtime_wasm_extern_t *wasmtime_wasm_global_as_extern_const(const wasmtime_wasm_global_t *f);
+  * \brief Converts a #wasm_global_t to #wasm_extern_t.
+  *
+  * The returned #wasm_extern_t is owned by the #wasm_global_t argument. Callers
+  * should not delete the returned value, and it only lives as long as the
+  * #wasm_global_t argument.
+  *
+- * \fn const wasm_extern_t *wasm_memory_as_extern_const(const wasm_memory_t *f);
++ * \fn const wasmtime_wasm_extern_t *wasmtime_wasm_memory_as_extern_const(const wasmtime_wasm_memory_t *f);
+  * \brief Converts a #wasm_memory_t to #wasm_extern_t.
+  *
+  * The returned #wasm_extern_t is owned by the #wasm_memory_t argument. Callers
+  * should not delete the returned value, and it only lives as long as the
+  * #wasm_memory_t argument.
+  *
+- * \fn const wasm_extern_t *wasm_table_as_extern_const(const wasm_table_t *f);
++ * \fn const wasmtime_wasm_extern_t *wasmtime_wasm_table_as_extern_const(const wasmtime_wasm_table_t *f);
+  * \brief Converts a #wasm_table_t to #wasm_extern_t.
+  *
+  * The returned #wasm_extern_t is owned by the #wasm_table_t argument. Callers
+  * should not delete the returned value, and it only lives as long as the
+  * #wasm_table_t argument.
+  *
+- * \fn wasm_func_t *wasm_extern_as_func(wasm_extern_t *);
++ * \fn wasmtime_wasm_func_t *wasmtime_wasm_extern_as_func(wasmtime_wasm_extern_t *);
+  * \brief Converts a #wasm_extern_t to #wasm_func_t.
+  *
+  * The returned #wasm_func_t is owned by the #wasm_extern_t argument. Callers
+@@ -1910,7 +1910,7 @@
+  *
+  * If the #wasm_extern_t argument isn't a #wasm_func_t then `NULL` is returned.
+  *
+- * \fn wasm_table_t *wasm_extern_as_table(wasm_extern_t *);
++ * \fn wasmtime_wasm_table_t *wasmtime_wasm_extern_as_table(wasmtime_wasm_extern_t *);
+  * \brief Converts a #wasm_extern_t to #wasm_table_t.
+  *
+  * The returned #wasm_table_t is owned by the #wasm_extern_t argument. Callers
+@@ -1919,7 +1919,7 @@
+  *
+  * If the #wasm_extern_t argument isn't a #wasm_table_t then `NULL` is returned.
+  *
+- * \fn wasm_memory_t *wasm_extern_as_memory(wasm_extern_t *);
++ * \fn wasmtime_wasm_memory_t *wasmtime_wasm_extern_as_memory(wasmtime_wasm_extern_t *);
+  * \brief Converts a #wasm_extern_t to #wasm_memory_t.
+  *
+  * The returned #wasm_memory_t is owned by the #wasm_extern_t argument. Callers
+@@ -1928,7 +1928,7 @@
+  *
+  * If the #wasm_extern_t argument isn't a #wasm_memory_t then `NULL` is returned.
+  *
+- * \fn wasm_global_t *wasm_extern_as_global(wasm_extern_t *);
++ * \fn wasmtime_wasm_global_t *wasmtime_wasm_extern_as_global(wasmtime_wasm_extern_t *);
+  * \brief Converts a #wasm_extern_t to #wasm_global_t.
+  *
+  * The returned #wasm_global_t is owned by the #wasm_extern_t argument. Callers
+@@ -1937,7 +1937,7 @@
+  *
+  * If the #wasm_extern_t argument isn't a #wasm_global_t then `NULL` is returned.
+  *
+- * \fn const wasm_func_t *wasm_extern_as_func_const(const wasm_extern_t *);
++ * \fn const wasmtime_wasm_func_t *wasmtime_wasm_extern_as_func_const(const wasmtime_wasm_extern_t *);
+  * \brief Converts a #wasm_extern_t to #wasm_func_t.
+  *
+  * The returned #wasm_func_t is owned by the #wasm_extern_t argument. Callers
+@@ -1946,7 +1946,7 @@
+  *
+  * If the #wasm_extern_t argument isn't a #wasm_func_t then `NULL` is returned.
+  *
+- * \fn const wasm_table_t *wasm_extern_as_table_const(const wasm_extern_t *);
++ * \fn const wasmtime_wasm_table_t *wasmtime_wasm_extern_as_table_const(const wasmtime_wasm_extern_t *);
+  * \brief Converts a #wasm_extern_t to #wasm_table_t.
+  *
+  * The returned #wasm_table_t is owned by the #wasm_extern_t argument. Callers
+@@ -1955,7 +1955,7 @@
+  *
+  * If the #wasm_extern_t argument isn't a #wasm_table_t then `NULL` is returned.
+  *
+- * \fn const wasm_memory_t *wasm_extern_as_memory_const(const wasm_extern_t *);
++ * \fn const wasmtime_wasm_memory_t *wasmtime_wasm_extern_as_memory_const(const wasmtime_wasm_extern_t *);
+  * \brief Converts a #wasm_extern_t to #wasm_memory_t.
+  *
+  * The returned #wasm_memory_t is owned by the #wasm_extern_t argument. Callers
+@@ -1964,7 +1964,7 @@
+  *
+  * If the #wasm_extern_t argument isn't a #wasm_memory_t then `NULL` is returned.
+  *
+- * \fn const wasm_global_t *wasm_extern_as_global_const(const wasm_extern_t *);
++ * \fn const wasmtime_wasm_global_t *wasmtime_wasm_extern_as_global_const(const wasmtime_wasm_extern_t *);
+  * \brief Converts a #wasm_extern_t to #wasm_global_t.
+  *
+  * The returned #wasm_global_t is owned by the #wasm_extern_t argument. Callers
+@@ -1975,48 +1975,48 @@
+  */
+ 
+ /**
+- * \struct wasm_instance_t
++ * \struct wasmtime_wasm_instance_t
+  * \brief Opaque struct representing a wasm instance.
+  *
+- * \typedef wasm_instance_t
++ * \typedef wasmtime_wasm_instance_t
+  * \brief Convenience alias for #wasm_instance_t
+  *
+- * \fn void wasm_instance_delete(wasm_instance_t *v);
++ * \fn void wasmtime_wasm_instance_delete(wasmtime_wasm_instance_t *v);
+  * \brief Deletes a instance.
+  *
+- * \fn wasm_instance_t *wasm_instance_copy(const wasm_instance_t *)
++ * \fn wasmtime_wasm_instance_t *wasmtime_wasm_instance_copy(const wasmtime_wasm_instance_t *)
+  * \brief Copies a #wasm_instance_t to a new one.
+  *
+  * The caller is responsible for deleting the returned #wasm_instance_t.
+  *
+- * \fn void wasm_instance_same(const wasm_instance_t *, const wasm_instance_t *)
++ * \fn void wasmtime_wasm_instance_same(const wasmtime_wasm_instance_t *, const wasmtime_wasm_instance_t *)
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void* wasm_instance_get_host_info(const wasm_instance_t *);
++ * \fn void* wasmtime_wasm_instance_get_host_info(const wasmtime_wasm_instance_t *);
+  * \brief Unimplemented in Wasmtime, always returns `NULL`.
+  *
+- * \fn void wasm_instance_set_host_info(wasm_instance_t *, void *);
++ * \fn void wasmtime_wasm_instance_set_host_info(wasmtime_wasm_instance_t *, void *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn void wasm_instance_set_host_info_with_finalizer(wasm_instance_t *, void *, void(*)(void*));
++ * \fn void wasmtime_wasm_instance_set_host_info_with_finalizer(wasmtime_wasm_instance_t *, void *, void(*)(void*));
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_t *wasm_instance_as_ref(wasm_instance_t *);
++ * \fn wasmtime_wasm_ref_t *wasmtime_wasm_instance_as_ref(wasmtime_wasm_instance_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_instance_t *wasm_ref_as_instance(wasm_ref_t *);
++ * \fn wasmtime_wasm_instance_t *wasmtime_wasm_ref_as_instance(wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_ref_t *wasm_instance_as_ref_const(const wasm_instance_t *);
++ * \fn const wasmtime_wasm_ref_t *wasmtime_wasm_instance_as_ref_const(const wasmtime_wasm_instance_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn const wasm_instance_t *wasm_ref_as_instance_const(const wasm_ref_t *);
++ * \fn const wasmtime_wasm_instance_t *wasmtime_wasm_ref_as_instance_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_ref_as_instance_const(const wasm_ref_t *);
++ * \fn wasmtime_wasm_ref_as_instance_const(const wasmtime_wasm_ref_t *);
+  * \brief Unimplemented in Wasmtime, aborts the process if called.
+  *
+- * \fn wasm_instance_t *wasm_instance_new(wasm_store_t *, const wasm_module_t *, const wasm_extern_vec_t *, wasm_trap_t **);
++ * \fn wasmtime_wasm_instance_t *wasmtime_wasm_instance_new(wasmtime_wasm_store_t *, const wasmtime_wasm_module_t *, const wasmtime_wasm_extern_vec_t *, wasmtime_wasm_trap_t **);
+  * \brief Instantiates a module with the provided imports.
+  *
+  * This function will instantiate the provided #wasm_module_t into the provided
+@@ -2035,7 +2035,7 @@
+  * This function does not take ownership of any of its arguments, and the
+  * returned #wasm_instance_t and #wasm_trap_t are owned by the caller.
+  *
+- * \fn void wasm_instance_exports(const wasm_instance_t *, wasm_extern_vec_t *out);
++ * \fn void wasmtime_wasm_instance_exports(const wasmtime_wasm_instance_t *, wasmtime_wasm_extern_vec_t *out);
+  * \brief Returns the exports of an instance.
+  *
+  * This function returns a list of #wasm_extern_t values, which will be owned by
+@@ -2052,20 +2052,20 @@
+  * \brief Used to initialize a vector type from a C array.
+  *
+  * \def WASM_I32_VAL
+- * \brief Used to initialize a 32-bit integer wasm_val_t value.
++ * \brief Used to initialize a 32-bit integer wasmtime_wasm_val_t value.
+  *
+  * \def WASM_I64_VAL
+- * \brief Used to initialize a 64-bit integer wasm_val_t value.
++ * \brief Used to initialize a 64-bit integer wasmtime_wasm_val_t value.
+  *
+  * \def WASM_F32_VAL
+- * \brief Used to initialize a 32-bit floating point wasm_val_t value.
++ * \brief Used to initialize a 32-bit floating point wasmtime_wasm_val_t value.
+  *
+  * \def WASM_F64_VAL
+- * \brief Used to initialize a 64-bit floating point wasm_val_t value.
++ * \brief Used to initialize a 64-bit floating point wasmtime_wasm_val_t value.
+  *
+  * \def WASM_REF_VAL
+- * \brief Used to initialize an externref wasm_val_t value.
++ * \brief Used to initialize an externref wasmtime_wasm_val_t value.
+  *
+  * \def WASM_INIT_VAL
+- * \brief Used to initialize a null externref wasm_val_t value.
++ * \brief Used to initialize a null externref wasmtime_wasm_val_t value.
+  */
+diff --git a/crates/c-api/include/wasi.h b/crates/c-api/include/wasi.h
+index b7d6d0623f..a6371885fc 100644
+--- a/crates/c-api/include/wasi.h
++++ b/crates/c-api/include/wasi.h
+@@ -119,7 +119,7 @@ WASI_API_EXTERN bool wasi_config_set_stdin_file(wasi_config_t *config,
+  * This function takes ownership of the `binary` argument.
+  */
+ WASI_API_EXTERN void wasi_config_set_stdin_bytes(wasi_config_t *config,
+-                                                 wasm_byte_vec_t *binary);
++                                                 wasmtime_wasm_byte_vec_t *binary);
+ 
+ /**
+  * \brief Configures this process's own stdin stream to be used as stdin for
+diff --git a/crates/c-api/include/wasm.h b/crates/c-api/include/wasm.h
+index c8b3cb7d31..11941904f6 100644
+--- a/crates/c-api/include/wasm.h
++++ b/crates/c-api/include/wasm.h
+@@ -52,9 +52,9 @@ typedef double float64_t;
+ // The qualifier `own` is used to indicate ownership of data in this API.
+ // It is intended to be interpreted similar to a `const` qualifier:
+ //
+-// - `own wasm_xxx_t*` owns the pointed-to data
+-// - `own wasm_xxx_t` distributes to all fields of a struct or union `xxx`
+-// - `own wasm_xxx_vec_t` owns the vector as well as its elements(!)
++// - `own wasmtime_wasm_xxx_t*` owns the pointed-to data
++// - `own wasmtime_wasm_xxx_t` distributes to all fields of a struct or union `xxx`
++// - `own wasmtime_wasm_xxx_vec_t` owns the vector as well as its elements(!)
+ // - an `own` function parameter passes ownership from caller to callee
+ // - an `own` function result passes ownership from callee to caller
+ // - an exception are `own` pointer parameters named `out`, which are copy-back
+@@ -66,60 +66,60 @@ typedef double float64_t;
+ // Deleting a reference does not necessarily delete the underlying object,
+ // it merely indicates that this owner no longer uses it.
+ //
+-// For vectors, `const wasm_xxx_vec_t` is used informally to indicate that
++// For vectors, `const wasmtime_wasm_xxx_vec_t` is used informally to indicate that
+ // neither the vector nor its elements should be modified.
+ // TODO: introduce proper `wasm_xxx_const_vec_t`?
+ 
+ 
+ #define WASM_DECLARE_OWN(name) \
+-  typedef struct wasm_##name##_t wasm_##name##_t; \
++  typedef struct wasmtime_wasm_##name##_t wasmtime_wasm_##name##_t; \
+   \
+-  WASM_API_EXTERN void wasm_##name##_delete(own wasm_##name##_t*);
++  WASM_API_EXTERN void wasmtime_wasm_##name##_delete(own wasmtime_wasm_##name##_t*);
+ 
+ 
+ // Vectors
+ 
+ #define WASM_DECLARE_VEC(name, ptr_or_none) \
+-  typedef struct wasm_##name##_vec_t { \
++  typedef struct wasmtime_wasm_##name##_vec_t { \
+     size_t size; \
+-    wasm_##name##_t ptr_or_none* data; \
+-  } wasm_##name##_vec_t; \
++    wasmtime_wasm_##name##_t ptr_or_none* data; \
++  } wasmtime_wasm_##name##_vec_t; \
+   \
+-  WASM_API_EXTERN void wasm_##name##_vec_new_empty(own wasm_##name##_vec_t* out); \
+-  WASM_API_EXTERN void wasm_##name##_vec_new_uninitialized( \
+-    own wasm_##name##_vec_t* out, size_t); \
+-  WASM_API_EXTERN void wasm_##name##_vec_new( \
+-    own wasm_##name##_vec_t* out, \
+-    size_t, own wasm_##name##_t ptr_or_none const[]); \
+-  WASM_API_EXTERN void wasm_##name##_vec_copy( \
+-    own wasm_##name##_vec_t* out, const wasm_##name##_vec_t*); \
+-  WASM_API_EXTERN void wasm_##name##_vec_delete(own wasm_##name##_vec_t*);
++  WASM_API_EXTERN void wasmtime_wasm_##name##_vec_new_empty(own wasmtime_wasm_##name##_vec_t* out); \
++  WASM_API_EXTERN void wasmtime_wasm_##name##_vec_new_uninitialized( \
++    own wasmtime_wasm_##name##_vec_t* out, size_t); \
++  WASM_API_EXTERN void wasmtime_wasm_##name##_vec_new( \
++    own wasmtime_wasm_##name##_vec_t* out, \
++    size_t, own wasmtime_wasm_##name##_t ptr_or_none const[]); \
++  WASM_API_EXTERN void wasmtime_wasm_##name##_vec_copy( \
++    own wasmtime_wasm_##name##_vec_t* out, const wasmtime_wasm_##name##_vec_t*); \
++  WASM_API_EXTERN void wasmtime_wasm_##name##_vec_delete(own wasmtime_wasm_##name##_vec_t*);
+ 
+ 
+ // Byte vectors
+ 
+-typedef byte_t wasm_byte_t;
++typedef byte_t wasmtime_wasm_byte_t;
+ WASM_DECLARE_VEC(byte, )
+ 
+-typedef wasm_byte_vec_t wasm_name_t;
++typedef wasmtime_wasm_byte_vec_t wasmtime_wasm_name_t;
+ 
+-#define wasm_name wasm_byte_vec
+-#define wasm_name_new wasm_byte_vec_new
+-#define wasm_name_new_empty wasm_byte_vec_new_empty
+-#define wasm_name_new_new_uninitialized wasm_byte_vec_new_uninitialized
+-#define wasm_name_copy wasm_byte_vec_copy
+-#define wasm_name_delete wasm_byte_vec_delete
++#define wasmtime_wasm_name wasmtime_wasm_byte_vec
++#define wasmtime_wasm_name_new wasmtime_wasm_byte_vec_new
++#define wasmtime_wasm_name_new_empty wasmtime_wasm_byte_vec_new_empty
++#define wasmtime_wasm_name_new_new_uninitialized wasmtime_wasm_byte_vec_new_uninitialized
++#define wasmtime_wasm_name_copy wasmtime_wasm_byte_vec_copy
++#define wasmtime_wasm_name_delete wasmtime_wasm_byte_vec_delete
+ 
+-static inline void wasm_name_new_from_string(
+-  own wasm_name_t* out, const char* s
++static inline void wasmtime_wasm_name_new_from_string(
++  own wasmtime_wasm_name_t* out, const char* s
+ ) {
+-  wasm_name_new(out, strlen(s), s);
++  wasmtime_wasm_name_new(out, strlen(s), s);
+ }
+ 
+-static inline void wasm_name_new_from_string_nt(
+-  own wasm_name_t* out, const char* s
++static inline void wasmtime_wasm_name_new_from_string_nt(
++  own wasmtime_wasm_name_t* out, const char* s
+ ) {
+-  wasm_name_new(out, strlen(s) + 1, s);
++  wasmtime_wasm_name_new(out, strlen(s) + 1, s);
+ }
+ 
+ 
+@@ -130,7 +130,7 @@ static inline void wasm_name_new_from_string_nt(
+ 
+ WASM_DECLARE_OWN(config)
+ 
+-WASM_API_EXTERN own wasm_config_t* wasm_config_new(void);
++WASM_API_EXTERN own wasmtime_wasm_config_t* wasmtime_wasm_config_new(void);
+ 
+ // Embedders may provide custom functions for manipulating configs.
+ 
+@@ -139,15 +139,15 @@ WASM_API_EXTERN own wasm_config_t* wasm_config_new(void);
+ 
+ WASM_DECLARE_OWN(engine)
+ 
+-WASM_API_EXTERN own wasm_engine_t* wasm_engine_new(void);
+-WASM_API_EXTERN own wasm_engine_t* wasm_engine_new_with_config(own wasm_config_t*);
++WASM_API_EXTERN own wasmtime_wasm_engine_t* wasmtime_wasm_engine_new(void);
++WASM_API_EXTERN own wasmtime_wasm_engine_t* wasmtime_wasm_engine_new_with_config(own wasmtime_wasm_config_t*);
+ 
+ 
+ // Store
+ 
+ WASM_DECLARE_OWN(store)
+ 
+-WASM_API_EXTERN own wasm_store_t* wasm_store_new(wasm_engine_t*);
++WASM_API_EXTERN own wasmtime_wasm_store_t* wasmtime_wasm_store_new(wasmtime_wasm_engine_t*);
+ 
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+@@ -155,18 +155,18 @@ WASM_API_EXTERN own wasm_store_t* wasm_store_new(wasm_engine_t*);
+ 
+ // Type attributes
+ 
+-typedef uint8_t wasm_mutability_t;
+-enum wasm_mutability_enum {
++typedef uint8_t wasmtime_wasm_mutability_t;
++enum wasmtime_wasm_mutability_enum {
+   WASM_CONST,
+   WASM_VAR,
+ };
+ 
+-typedef struct wasm_limits_t {
++typedef struct wasmtime_wasm_limits_t {
+   uint32_t min;
+   uint32_t max;
+-} wasm_limits_t;
++} wasmtime_wasm_limits_t;
+ 
+-static const uint32_t wasm_limits_max_default = 0xffffffff;
++static const uint32_t wasmtime_wasm_limits_max_default = 0xffffffff;
+ 
+ 
+ // Generic
+@@ -175,15 +175,15 @@ static const uint32_t wasm_limits_max_default = 0xffffffff;
+   WASM_DECLARE_OWN(name) \
+   WASM_DECLARE_VEC(name, *) \
+   \
+-  WASM_API_EXTERN own wasm_##name##_t* wasm_##name##_copy(const wasm_##name##_t*);
++  WASM_API_EXTERN own wasmtime_wasm_##name##_t* wasmtime_wasm_##name##_copy(const wasmtime_wasm_##name##_t*);
+ 
+ 
+ // Value Types
+ 
+ WASM_DECLARE_TYPE(valtype)
+ 
+-typedef uint8_t wasm_valkind_t;
+-enum wasm_valkind_enum {
++typedef uint8_t wasmtime_wasm_valkind_t;
++enum wasmtime_wasm_valkind_enum {
+   WASM_I32,
+   WASM_I64,
+   WASM_F32,
+@@ -192,22 +192,22 @@ enum wasm_valkind_enum {
+   WASM_FUNCREF,
+ };
+ 
+-WASM_API_EXTERN own wasm_valtype_t* wasm_valtype_new(wasm_valkind_t);
++WASM_API_EXTERN own wasmtime_wasm_valtype_t* wasmtime_wasm_valtype_new(wasmtime_wasm_valkind_t);
+ 
+-WASM_API_EXTERN wasm_valkind_t wasm_valtype_kind(const wasm_valtype_t*);
++WASM_API_EXTERN wasmtime_wasm_valkind_t wasmtime_wasm_valtype_kind(const wasmtime_wasm_valtype_t*);
+ 
+-static inline bool wasm_valkind_is_num(wasm_valkind_t k) {
++static inline bool wasmtime_wasm_valkind_is_num(wasmtime_wasm_valkind_t k) {
+   return k < WASM_EXTERNREF;
+ }
+-static inline bool wasm_valkind_is_ref(wasm_valkind_t k) {
++static inline bool wasmtime_wasm_valkind_is_ref(wasmtime_wasm_valkind_t k) {
+   return k >= WASM_EXTERNREF;
+ }
+ 
+-static inline bool wasm_valtype_is_num(const wasm_valtype_t* t) {
+-  return wasm_valkind_is_num(wasm_valtype_kind(t));
++static inline bool wasmtime_wasm_valtype_is_num(const wasmtime_wasm_valtype_t* t) {
++  return wasmtime_wasm_valkind_is_num(wasmtime_wasm_valtype_kind(t));
+ }
+-static inline bool wasm_valtype_is_ref(const wasm_valtype_t* t) {
+-  return wasm_valkind_is_ref(wasm_valtype_kind(t));
++static inline bool wasmtime_wasm_valtype_is_ref(const wasmtime_wasm_valtype_t* t) {
++  return wasmtime_wasm_valkind_is_ref(wasmtime_wasm_valtype_kind(t));
+ }
+ 
+ 
+@@ -215,100 +215,100 @@ static inline bool wasm_valtype_is_ref(const wasm_valtype_t* t) {
+ 
+ WASM_DECLARE_TYPE(functype)
+ 
+-WASM_API_EXTERN own wasm_functype_t* wasm_functype_new(
+-  own wasm_valtype_vec_t* params, own wasm_valtype_vec_t* results);
++WASM_API_EXTERN own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new(
++  own wasmtime_wasm_valtype_vec_t* params, own wasmtime_wasm_valtype_vec_t* results);
+ 
+-WASM_API_EXTERN const wasm_valtype_vec_t* wasm_functype_params(const wasm_functype_t*);
+-WASM_API_EXTERN const wasm_valtype_vec_t* wasm_functype_results(const wasm_functype_t*);
++WASM_API_EXTERN const wasmtime_wasm_valtype_vec_t* wasmtime_wasm_functype_params(const wasmtime_wasm_functype_t*);
++WASM_API_EXTERN const wasmtime_wasm_valtype_vec_t* wasmtime_wasm_functype_results(const wasmtime_wasm_functype_t*);
+ 
+ 
+ // Global Types
+ 
+ WASM_DECLARE_TYPE(globaltype)
+ 
+-WASM_API_EXTERN own wasm_globaltype_t* wasm_globaltype_new(
+-  own wasm_valtype_t*, wasm_mutability_t);
++WASM_API_EXTERN own wasmtime_wasm_globaltype_t* wasmtime_wasm_globaltype_new(
++  own wasmtime_wasm_valtype_t*, wasmtime_wasm_mutability_t);
+ 
+-WASM_API_EXTERN const wasm_valtype_t* wasm_globaltype_content(const wasm_globaltype_t*);
+-WASM_API_EXTERN wasm_mutability_t wasm_globaltype_mutability(const wasm_globaltype_t*);
++WASM_API_EXTERN const wasmtime_wasm_valtype_t* wasmtime_wasm_globaltype_content(const wasmtime_wasm_globaltype_t*);
++WASM_API_EXTERN wasmtime_wasm_mutability_t wasmtime_wasm_globaltype_mutability(const wasmtime_wasm_globaltype_t*);
+ 
+ 
+ // Table Types
+ 
+ WASM_DECLARE_TYPE(tabletype)
+ 
+-WASM_API_EXTERN own wasm_tabletype_t* wasm_tabletype_new(
+-  own wasm_valtype_t*, const wasm_limits_t*);
++WASM_API_EXTERN own wasmtime_wasm_tabletype_t* wasmtime_wasm_tabletype_new(
++  own wasmtime_wasm_valtype_t*, const wasmtime_wasm_limits_t*);
+ 
+-WASM_API_EXTERN const wasm_valtype_t* wasm_tabletype_element(const wasm_tabletype_t*);
+-WASM_API_EXTERN const wasm_limits_t* wasm_tabletype_limits(const wasm_tabletype_t*);
++WASM_API_EXTERN const wasmtime_wasm_valtype_t* wasmtime_wasm_tabletype_element(const wasmtime_wasm_tabletype_t*);
++WASM_API_EXTERN const wasmtime_wasm_limits_t* wasmtime_wasm_tabletype_limits(const wasmtime_wasm_tabletype_t*);
+ 
+ 
+ // Memory Types
+ 
+ WASM_DECLARE_TYPE(memorytype)
+ 
+-WASM_API_EXTERN own wasm_memorytype_t* wasm_memorytype_new(const wasm_limits_t*);
++WASM_API_EXTERN own wasmtime_wasm_memorytype_t* wasmtime_wasm_memorytype_new(const wasmtime_wasm_limits_t*);
+ 
+-WASM_API_EXTERN const wasm_limits_t* wasm_memorytype_limits(const wasm_memorytype_t*);
++WASM_API_EXTERN const wasmtime_wasm_limits_t* wasmtime_wasm_memorytype_limits(const wasmtime_wasm_memorytype_t*);
+ 
+ 
+ // Extern Types
+ 
+ WASM_DECLARE_TYPE(externtype)
+ 
+-typedef uint8_t wasm_externkind_t;
+-enum wasm_externkind_enum {
++typedef uint8_t wasmtime_wasm_externkind_t;
++enum wasmtime_wasm_externkind_enum {
+   WASM_EXTERN_FUNC,
+   WASM_EXTERN_GLOBAL,
+   WASM_EXTERN_TABLE,
+   WASM_EXTERN_MEMORY,
+ };
+ 
+-WASM_API_EXTERN wasm_externkind_t wasm_externtype_kind(const wasm_externtype_t*);
++WASM_API_EXTERN wasmtime_wasm_externkind_t wasmtime_wasm_externtype_kind(const wasmtime_wasm_externtype_t*);
+ 
+-WASM_API_EXTERN wasm_externtype_t* wasm_functype_as_externtype(wasm_functype_t*);
+-WASM_API_EXTERN wasm_externtype_t* wasm_globaltype_as_externtype(wasm_globaltype_t*);
+-WASM_API_EXTERN wasm_externtype_t* wasm_tabletype_as_externtype(wasm_tabletype_t*);
+-WASM_API_EXTERN wasm_externtype_t* wasm_memorytype_as_externtype(wasm_memorytype_t*);
++WASM_API_EXTERN wasmtime_wasm_externtype_t* wasmtime_wasm_functype_as_externtype(wasmtime_wasm_functype_t*);
++WASM_API_EXTERN wasmtime_wasm_externtype_t* wasmtime_wasm_globaltype_as_externtype(wasmtime_wasm_globaltype_t*);
++WASM_API_EXTERN wasmtime_wasm_externtype_t* wasmtime_wasm_tabletype_as_externtype(wasmtime_wasm_tabletype_t*);
++WASM_API_EXTERN wasmtime_wasm_externtype_t* wasmtime_wasm_memorytype_as_externtype(wasmtime_wasm_memorytype_t*);
+ 
+-WASM_API_EXTERN wasm_functype_t* wasm_externtype_as_functype(wasm_externtype_t*);
+-WASM_API_EXTERN wasm_globaltype_t* wasm_externtype_as_globaltype(wasm_externtype_t*);
+-WASM_API_EXTERN wasm_tabletype_t* wasm_externtype_as_tabletype(wasm_externtype_t*);
+-WASM_API_EXTERN wasm_memorytype_t* wasm_externtype_as_memorytype(wasm_externtype_t*);
++WASM_API_EXTERN wasmtime_wasm_functype_t* wasmtime_wasm_externtype_as_functype(wasmtime_wasm_externtype_t*);
++WASM_API_EXTERN wasmtime_wasm_globaltype_t* wasmtime_wasm_externtype_as_globaltype(wasmtime_wasm_externtype_t*);
++WASM_API_EXTERN wasmtime_wasm_tabletype_t* wasmtime_wasm_externtype_as_tabletype(wasmtime_wasm_externtype_t*);
++WASM_API_EXTERN wasmtime_wasm_memorytype_t* wasmtime_wasm_externtype_as_memorytype(wasmtime_wasm_externtype_t*);
+ 
+-WASM_API_EXTERN const wasm_externtype_t* wasm_functype_as_externtype_const(const wasm_functype_t*);
+-WASM_API_EXTERN const wasm_externtype_t* wasm_globaltype_as_externtype_const(const wasm_globaltype_t*);
+-WASM_API_EXTERN const wasm_externtype_t* wasm_tabletype_as_externtype_const(const wasm_tabletype_t*);
+-WASM_API_EXTERN const wasm_externtype_t* wasm_memorytype_as_externtype_const(const wasm_memorytype_t*);
++WASM_API_EXTERN const wasmtime_wasm_externtype_t* wasmtime_wasm_functype_as_externtype_const(const wasmtime_wasm_functype_t*);
++WASM_API_EXTERN const wasmtime_wasm_externtype_t* wasmtime_wasm_globaltype_as_externtype_const(const wasmtime_wasm_globaltype_t*);
++WASM_API_EXTERN const wasmtime_wasm_externtype_t* wasmtime_wasm_tabletype_as_externtype_const(const wasmtime_wasm_tabletype_t*);
++WASM_API_EXTERN const wasmtime_wasm_externtype_t* wasmtime_wasm_memorytype_as_externtype_const(const wasmtime_wasm_memorytype_t*);
+ 
+-WASM_API_EXTERN const wasm_functype_t* wasm_externtype_as_functype_const(const wasm_externtype_t*);
+-WASM_API_EXTERN const wasm_globaltype_t* wasm_externtype_as_globaltype_const(const wasm_externtype_t*);
+-WASM_API_EXTERN const wasm_tabletype_t* wasm_externtype_as_tabletype_const(const wasm_externtype_t*);
+-WASM_API_EXTERN const wasm_memorytype_t* wasm_externtype_as_memorytype_const(const wasm_externtype_t*);
++WASM_API_EXTERN const wasmtime_wasm_functype_t* wasmtime_wasm_externtype_as_functype_const(const wasmtime_wasm_externtype_t*);
++WASM_API_EXTERN const wasmtime_wasm_globaltype_t* wasmtime_wasm_externtype_as_globaltype_const(const wasmtime_wasm_externtype_t*);
++WASM_API_EXTERN const wasmtime_wasm_tabletype_t* wasmtime_wasm_externtype_as_tabletype_const(const wasmtime_wasm_externtype_t*);
++WASM_API_EXTERN const wasmtime_wasm_memorytype_t* wasmtime_wasm_externtype_as_memorytype_const(const wasmtime_wasm_externtype_t*);
+ 
+ 
+ // Import Types
+ 
+ WASM_DECLARE_TYPE(importtype)
+ 
+-WASM_API_EXTERN own wasm_importtype_t* wasm_importtype_new(
+-  own wasm_name_t* module, own wasm_name_t* name, own wasm_externtype_t*);
++WASM_API_EXTERN own wasmtime_wasm_importtype_t* wasmtime_wasm_importtype_new(
++  own wasmtime_wasm_name_t* module, own wasmtime_wasm_name_t* name, own wasmtime_wasm_externtype_t*);
+ 
+-WASM_API_EXTERN const wasm_name_t* wasm_importtype_module(const wasm_importtype_t*);
+-WASM_API_EXTERN const wasm_name_t* wasm_importtype_name(const wasm_importtype_t*);
+-WASM_API_EXTERN const wasm_externtype_t* wasm_importtype_type(const wasm_importtype_t*);
++WASM_API_EXTERN const wasmtime_wasm_name_t* wasmtime_wasm_importtype_module(const wasmtime_wasm_importtype_t*);
++WASM_API_EXTERN const wasmtime_wasm_name_t* wasmtime_wasm_importtype_name(const wasmtime_wasm_importtype_t*);
++WASM_API_EXTERN const wasmtime_wasm_externtype_t* wasmtime_wasm_importtype_type(const wasmtime_wasm_importtype_t*);
+ 
+ 
+ // Export Types
+ 
+ WASM_DECLARE_TYPE(exporttype)
+ 
+-WASM_API_EXTERN own wasm_exporttype_t* wasm_exporttype_new(
+-  own wasm_name_t*, own wasm_externtype_t*);
++WASM_API_EXTERN own wasmtime_wasm_exporttype_t* wasmtime_wasm_exporttype_new(
++  own wasmtime_wasm_name_t*, own wasmtime_wasm_externtype_t*);
+ 
+-WASM_API_EXTERN const wasm_name_t* wasm_exporttype_name(const wasm_exporttype_t*);
+-WASM_API_EXTERN const wasm_externtype_t* wasm_exporttype_type(const wasm_exporttype_t*);
++WASM_API_EXTERN const wasmtime_wasm_name_t* wasmtime_wasm_exporttype_name(const wasmtime_wasm_exporttype_t*);
++WASM_API_EXTERN const wasmtime_wasm_externtype_t* wasmtime_wasm_exporttype_type(const wasmtime_wasm_exporttype_t*);
+ 
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+@@ -316,21 +316,21 @@ WASM_API_EXTERN const wasm_externtype_t* wasm_exporttype_type(const wasm_exportt
+ 
+ // Values
+ 
+-struct wasm_ref_t;
++struct wasmtime_wasm_ref_t;
+ 
+-typedef struct wasm_val_t {
+-  wasm_valkind_t kind;
++typedef struct wasmtime_wasm_val_t {
++  wasmtime_wasm_valkind_t kind;
+   union {
+     int32_t i32;
+     int64_t i64;
+     float32_t f32;
+     float64_t f64;
+-    struct wasm_ref_t* ref;
++    struct wasmtime_wasm_ref_t* ref;
+   } of;
+-} wasm_val_t;
++} wasmtime_wasm_val_t;
+ 
+-WASM_API_EXTERN void wasm_val_delete(own wasm_val_t* v);
+-WASM_API_EXTERN void wasm_val_copy(own wasm_val_t* out, const wasm_val_t*);
++WASM_API_EXTERN void wasmtime_wasm_val_delete(own wasmtime_wasm_val_t* v);
++WASM_API_EXTERN void wasmtime_wasm_val_copy(own wasmtime_wasm_val_t* out, const wasmtime_wasm_val_t*);
+ 
+ WASM_DECLARE_VEC(val, )
+ 
+@@ -340,28 +340,28 @@ WASM_DECLARE_VEC(val, )
+ #define WASM_DECLARE_REF_BASE(name) \
+   WASM_DECLARE_OWN(name) \
+   \
+-  WASM_API_EXTERN own wasm_##name##_t* wasm_##name##_copy(const wasm_##name##_t*); \
+-  WASM_API_EXTERN bool wasm_##name##_same(const wasm_##name##_t*, const wasm_##name##_t*); \
++  WASM_API_EXTERN own wasmtime_wasm_##name##_t* wasmtime_wasm_##name##_copy(const wasmtime_wasm_##name##_t*); \
++  WASM_API_EXTERN bool wasmtime_wasm_##name##_same(const wasmtime_wasm_##name##_t*, const wasmtime_wasm_##name##_t*); \
+   \
+-  WASM_API_EXTERN void* wasm_##name##_get_host_info(const wasm_##name##_t*); \
+-  WASM_API_EXTERN void wasm_##name##_set_host_info(wasm_##name##_t*, void*); \
+-  WASM_API_EXTERN void wasm_##name##_set_host_info_with_finalizer( \
+-    wasm_##name##_t*, void*, void (*)(void*));
++  WASM_API_EXTERN void* wasmtime_wasm_##name##_get_host_info(const wasmtime_wasm_##name##_t*); \
++  WASM_API_EXTERN void wasmtime_wasm_##name##_set_host_info(wasmtime_wasm_##name##_t*, void*); \
++  WASM_API_EXTERN void wasmtime_wasm_##name##_set_host_info_with_finalizer( \
++    wasmtime_wasm_##name##_t*, void*, void (*)(void*));
+ 
+ #define WASM_DECLARE_REF(name) \
+   WASM_DECLARE_REF_BASE(name) \
+   \
+-  WASM_API_EXTERN wasm_ref_t* wasm_##name##_as_ref(wasm_##name##_t*); \
+-  WASM_API_EXTERN wasm_##name##_t* wasm_ref_as_##name(wasm_ref_t*); \
+-  WASM_API_EXTERN const wasm_ref_t* wasm_##name##_as_ref_const(const wasm_##name##_t*); \
+-  WASM_API_EXTERN const wasm_##name##_t* wasm_ref_as_##name##_const(const wasm_ref_t*);
++  WASM_API_EXTERN wasmtime_wasm_ref_t* wasmtime_wasm_##name##_as_ref(wasmtime_wasm_##name##_t*); \
++  WASM_API_EXTERN wasmtime_wasm_##name##_t* wasmtime_wasm_ref_as_##name(wasmtime_wasm_ref_t*); \
++  WASM_API_EXTERN const wasmtime_wasm_ref_t* wasmtime_wasm_##name##_as_ref_const(const wasmtime_wasm_##name##_t*); \
++  WASM_API_EXTERN const wasmtime_wasm_##name##_t* wasmtime_wasm_ref_as_##name##_const(const wasmtime_wasm_ref_t*);
+ 
+ #define WASM_DECLARE_SHARABLE_REF(name) \
+   WASM_DECLARE_REF(name) \
+   WASM_DECLARE_OWN(shared_##name) \
+   \
+-  WASM_API_EXTERN own wasm_shared_##name##_t* wasm_##name##_share(const wasm_##name##_t*); \
+-  WASM_API_EXTERN own wasm_##name##_t* wasm_##name##_obtain(wasm_store_t*, const wasm_shared_##name##_t*);
++  WASM_API_EXTERN own wasmtime_wasm_shared_##name##_t* wasmtime_wasm_##name##_share(const wasmtime_wasm_##name##_t*); \
++  WASM_API_EXTERN own wasmtime_wasm_##name##_t* wasmtime_wasm_##name##_obtain(wasmtime_wasm_store_t*, const wasmtime_wasm_shared_##name##_t*);
+ 
+ 
+ WASM_DECLARE_REF_BASE(ref)
+@@ -371,121 +371,121 @@ WASM_DECLARE_REF_BASE(ref)
+ 
+ WASM_DECLARE_OWN(frame)
+ WASM_DECLARE_VEC(frame, *)
+-WASM_API_EXTERN own wasm_frame_t* wasm_frame_copy(const wasm_frame_t*);
++WASM_API_EXTERN own wasmtime_wasm_frame_t* wasmtime_wasm_frame_copy(const wasmtime_wasm_frame_t*);
+ 
+-WASM_API_EXTERN struct wasm_instance_t* wasm_frame_instance(const wasm_frame_t*);
+-WASM_API_EXTERN uint32_t wasm_frame_func_index(const wasm_frame_t*);
+-WASM_API_EXTERN size_t wasm_frame_func_offset(const wasm_frame_t*);
+-WASM_API_EXTERN size_t wasm_frame_module_offset(const wasm_frame_t*);
++WASM_API_EXTERN struct wasmtime_wasm_instance_t* wasmtime_wasm_frame_instance(const wasmtime_wasm_frame_t*);
++WASM_API_EXTERN uint32_t wasmtime_wasm_frame_func_index(const wasmtime_wasm_frame_t*);
++WASM_API_EXTERN size_t wasmtime_wasm_frame_func_offset(const wasmtime_wasm_frame_t*);
++WASM_API_EXTERN size_t wasmtime_wasm_frame_module_offset(const wasmtime_wasm_frame_t*);
+ 
+ 
+ // Traps
+ 
+-typedef wasm_name_t wasm_message_t;  // null terminated
++typedef wasmtime_wasm_name_t wasmtime_wasm_message_t;  // null terminated
+ 
+ WASM_DECLARE_REF(trap)
+ 
+-WASM_API_EXTERN own wasm_trap_t* wasm_trap_new(wasm_store_t* store, const wasm_message_t*);
++WASM_API_EXTERN own wasmtime_wasm_trap_t* wasmtime_wasm_trap_new(wasmtime_wasm_store_t* store, const wasmtime_wasm_message_t*);
+ 
+-WASM_API_EXTERN void wasm_trap_message(const wasm_trap_t*, own wasm_message_t* out);
+-WASM_API_EXTERN own wasm_frame_t* wasm_trap_origin(const wasm_trap_t*);
+-WASM_API_EXTERN void wasm_trap_trace(const wasm_trap_t*, own wasm_frame_vec_t* out);
++WASM_API_EXTERN void wasmtime_wasm_trap_message(const wasmtime_wasm_trap_t*, own wasmtime_wasm_message_t* out);
++WASM_API_EXTERN own wasmtime_wasm_frame_t* wasmtime_wasm_trap_origin(const wasmtime_wasm_trap_t*);
++WASM_API_EXTERN void wasmtime_wasm_trap_trace(const wasmtime_wasm_trap_t*, own wasmtime_wasm_frame_vec_t* out);
+ 
+ 
+ // Foreign Objects
+ 
+ WASM_DECLARE_REF(foreign)
+ 
+-WASM_API_EXTERN own wasm_foreign_t* wasm_foreign_new(wasm_store_t*);
++WASM_API_EXTERN own wasmtime_wasm_foreign_t* wasmtime_wasm_foreign_new(wasmtime_wasm_store_t*);
+ 
+ 
+ // Modules
+ 
+ WASM_DECLARE_SHARABLE_REF(module)
+ 
+-WASM_API_EXTERN own wasm_module_t* wasm_module_new(
+-  wasm_store_t*, const wasm_byte_vec_t* binary);
++WASM_API_EXTERN own wasmtime_wasm_module_t* wasmtime_wasm_module_new(
++  wasmtime_wasm_store_t*, const wasmtime_wasm_byte_vec_t* binary);
+ 
+-WASM_API_EXTERN bool wasm_module_validate(wasm_store_t*, const wasm_byte_vec_t* binary);
++WASM_API_EXTERN bool wasmtime_wasm_module_validate(wasmtime_wasm_store_t*, const wasmtime_wasm_byte_vec_t* binary);
+ 
+-WASM_API_EXTERN void wasm_module_imports(const wasm_module_t*, own wasm_importtype_vec_t* out);
+-WASM_API_EXTERN void wasm_module_exports(const wasm_module_t*, own wasm_exporttype_vec_t* out);
++WASM_API_EXTERN void wasmtime_wasm_module_imports(const wasmtime_wasm_module_t*, own wasmtime_wasm_importtype_vec_t* out);
++WASM_API_EXTERN void wasmtime_wasm_module_exports(const wasmtime_wasm_module_t*, own wasmtime_wasm_exporttype_vec_t* out);
+ 
+-WASM_API_EXTERN void wasm_module_serialize(const wasm_module_t*, own wasm_byte_vec_t* out);
+-WASM_API_EXTERN own wasm_module_t* wasm_module_deserialize(wasm_store_t*, const wasm_byte_vec_t*);
++WASM_API_EXTERN void wasmtime_wasm_module_serialize(const wasmtime_wasm_module_t*, own wasmtime_wasm_byte_vec_t* out);
++WASM_API_EXTERN own wasmtime_wasm_module_t* wasmtime_wasm_module_deserialize(wasmtime_wasm_store_t*, const wasmtime_wasm_byte_vec_t*);
+ 
+ 
+ // Function Instances
+ 
+ WASM_DECLARE_REF(func)
+ 
+-typedef own wasm_trap_t* (*wasm_func_callback_t)(
+-  const wasm_val_vec_t* args, own wasm_val_vec_t* results);
+-typedef own wasm_trap_t* (*wasm_func_callback_with_env_t)(
+-  void* env, const wasm_val_vec_t* args, wasm_val_vec_t* results);
++typedef own wasmtime_wasm_trap_t* (*wasmtime_wasm_func_callback_t)(
++  const wasmtime_wasm_val_vec_t* args, own wasmtime_wasm_val_vec_t* results);
++typedef own wasmtime_wasm_trap_t* (*wasmtime_wasm_func_callback_with_env_t)(
++  void* env, const wasmtime_wasm_val_vec_t* args, wasmtime_wasm_val_vec_t* results);
+ 
+-WASM_API_EXTERN own wasm_func_t* wasm_func_new(
+-  wasm_store_t*, const wasm_functype_t*, wasm_func_callback_t);
+-WASM_API_EXTERN own wasm_func_t* wasm_func_new_with_env(
+-  wasm_store_t*, const wasm_functype_t* type, wasm_func_callback_with_env_t,
++WASM_API_EXTERN own wasmtime_wasm_func_t* wasmtime_wasm_func_new(
++  wasmtime_wasm_store_t*, const wasmtime_wasm_functype_t*, wasmtime_wasm_func_callback_t);
++WASM_API_EXTERN own wasmtime_wasm_func_t* wasmtime_wasm_func_new_with_env(
++  wasmtime_wasm_store_t*, const wasmtime_wasm_functype_t* type, wasmtime_wasm_func_callback_with_env_t,
+   void* env, void (*finalizer)(void*));
+ 
+-WASM_API_EXTERN own wasm_functype_t* wasm_func_type(const wasm_func_t*);
+-WASM_API_EXTERN size_t wasm_func_param_arity(const wasm_func_t*);
+-WASM_API_EXTERN size_t wasm_func_result_arity(const wasm_func_t*);
++WASM_API_EXTERN own wasmtime_wasm_functype_t* wasmtime_wasm_func_type(const wasmtime_wasm_func_t*);
++WASM_API_EXTERN size_t wasmtime_wasm_func_param_arity(const wasmtime_wasm_func_t*);
++WASM_API_EXTERN size_t wasmtime_wasm_func_result_arity(const wasmtime_wasm_func_t*);
+ 
+-WASM_API_EXTERN own wasm_trap_t* wasm_func_call(
+-  const wasm_func_t*, const wasm_val_vec_t* args, wasm_val_vec_t* results);
++WASM_API_EXTERN own wasmtime_wasm_trap_t* wasmtime_wasm_func_call(
++  const wasmtime_wasm_func_t*, const wasmtime_wasm_val_vec_t* args, wasmtime_wasm_val_vec_t* results);
+ 
+ 
+ // Global Instances
+ 
+ WASM_DECLARE_REF(global)
+ 
+-WASM_API_EXTERN own wasm_global_t* wasm_global_new(
+-  wasm_store_t*, const wasm_globaltype_t*, const wasm_val_t*);
++WASM_API_EXTERN own wasmtime_wasm_global_t* wasmtime_wasm_global_new(
++  wasmtime_wasm_store_t*, const wasmtime_wasm_globaltype_t*, const wasmtime_wasm_val_t*);
+ 
+-WASM_API_EXTERN own wasm_globaltype_t* wasm_global_type(const wasm_global_t*);
++WASM_API_EXTERN own wasmtime_wasm_globaltype_t* wasmtime_wasm_global_type(const wasmtime_wasm_global_t*);
+ 
+-WASM_API_EXTERN void wasm_global_get(const wasm_global_t*, own wasm_val_t* out);
+-WASM_API_EXTERN void wasm_global_set(wasm_global_t*, const wasm_val_t*);
++WASM_API_EXTERN void wasmtime_wasm_global_get(const wasmtime_wasm_global_t*, own wasmtime_wasm_val_t* out);
++WASM_API_EXTERN void wasmtime_wasm_global_set(wasmtime_wasm_global_t*, const wasmtime_wasm_val_t*);
+ 
+ 
+ // Table Instances
+ 
+ WASM_DECLARE_REF(table)
+ 
+-typedef uint32_t wasm_table_size_t;
++typedef uint32_t wasmtime_wasm_table_size_t;
+ 
+-WASM_API_EXTERN own wasm_table_t* wasm_table_new(
+-  wasm_store_t*, const wasm_tabletype_t*, wasm_ref_t* init);
++WASM_API_EXTERN own wasmtime_wasm_table_t* wasmtime_wasm_table_new(
++  wasmtime_wasm_store_t*, const wasmtime_wasm_tabletype_t*, wasmtime_wasm_ref_t* init);
+ 
+-WASM_API_EXTERN own wasm_tabletype_t* wasm_table_type(const wasm_table_t*);
++WASM_API_EXTERN own wasmtime_wasm_tabletype_t* wasmtime_wasm_table_type(const wasmtime_wasm_table_t*);
+ 
+-WASM_API_EXTERN own wasm_ref_t* wasm_table_get(const wasm_table_t*, wasm_table_size_t index);
+-WASM_API_EXTERN bool wasm_table_set(wasm_table_t*, wasm_table_size_t index, wasm_ref_t*);
++WASM_API_EXTERN own wasmtime_wasm_ref_t* wasmtime_wasm_table_get(const wasmtime_wasm_table_t*, wasmtime_wasm_table_size_t index);
++WASM_API_EXTERN bool wasmtime_wasm_table_set(wasmtime_wasm_table_t*, wasmtime_wasm_table_size_t index, wasmtime_wasm_ref_t*);
+ 
+-WASM_API_EXTERN wasm_table_size_t wasm_table_size(const wasm_table_t*);
+-WASM_API_EXTERN bool wasm_table_grow(wasm_table_t*, wasm_table_size_t delta, wasm_ref_t* init);
++WASM_API_EXTERN wasmtime_wasm_table_size_t wasmtime_wasm_table_size(const wasmtime_wasm_table_t*);
++WASM_API_EXTERN bool wasmtime_wasm_table_grow(wasmtime_wasm_table_t*, wasmtime_wasm_table_size_t delta, wasmtime_wasm_ref_t* init);
+ 
+ 
+ // Memory Instances
+ 
+ WASM_DECLARE_REF(memory)
+ 
+-typedef uint32_t wasm_memory_pages_t;
++typedef uint32_t wasmtime_wasm_memory_pages_t;
+ 
+ static const size_t MEMORY_PAGE_SIZE = 0x10000;
+ 
+-WASM_API_EXTERN own wasm_memory_t* wasm_memory_new(wasm_store_t*, const wasm_memorytype_t*);
++WASM_API_EXTERN own wasmtime_wasm_memory_t* wasmtime_wasm_memory_new(wasmtime_wasm_store_t*, const wasmtime_wasm_memorytype_t*);
+ 
+-WASM_API_EXTERN own wasm_memorytype_t* wasm_memory_type(const wasm_memory_t*);
++WASM_API_EXTERN own wasmtime_wasm_memorytype_t* wasmtime_wasm_memory_type(const wasmtime_wasm_memory_t*);
+ 
+-WASM_API_EXTERN byte_t* wasm_memory_data(wasm_memory_t*);
+-WASM_API_EXTERN size_t wasm_memory_data_size(const wasm_memory_t*);
++WASM_API_EXTERN byte_t* wasmtime_wasm_memory_data(wasmtime_wasm_memory_t*);
++WASM_API_EXTERN size_t wasmtime_wasm_memory_data_size(const wasmtime_wasm_memory_t*);
+ 
+-WASM_API_EXTERN wasm_memory_pages_t wasm_memory_size(const wasm_memory_t*);
+-WASM_API_EXTERN bool wasm_memory_grow(wasm_memory_t*, wasm_memory_pages_t delta);
++WASM_API_EXTERN wasmtime_wasm_memory_pages_t wasmtime_wasm_memory_size(const wasmtime_wasm_memory_t*);
++WASM_API_EXTERN bool wasmtime_wasm_memory_grow(wasmtime_wasm_memory_t*, wasmtime_wasm_memory_pages_t delta);
+ 
+ 
+ // Externals
+@@ -493,40 +493,40 @@ WASM_API_EXTERN bool wasm_memory_grow(wasm_memory_t*, wasm_memory_pages_t delta)
+ WASM_DECLARE_REF(extern)
+ WASM_DECLARE_VEC(extern, *)
+ 
+-WASM_API_EXTERN wasm_externkind_t wasm_extern_kind(const wasm_extern_t*);
+-WASM_API_EXTERN own wasm_externtype_t* wasm_extern_type(const wasm_extern_t*);
++WASM_API_EXTERN wasmtime_wasm_externkind_t wasmtime_wasm_extern_kind(const wasmtime_wasm_extern_t*);
++WASM_API_EXTERN own wasmtime_wasm_externtype_t* wasmtime_wasm_extern_type(const wasmtime_wasm_extern_t*);
+ 
+-WASM_API_EXTERN wasm_extern_t* wasm_func_as_extern(wasm_func_t*);
+-WASM_API_EXTERN wasm_extern_t* wasm_global_as_extern(wasm_global_t*);
+-WASM_API_EXTERN wasm_extern_t* wasm_table_as_extern(wasm_table_t*);
+-WASM_API_EXTERN wasm_extern_t* wasm_memory_as_extern(wasm_memory_t*);
++WASM_API_EXTERN wasmtime_wasm_extern_t* wasmtime_wasm_func_as_extern(wasmtime_wasm_func_t*);
++WASM_API_EXTERN wasmtime_wasm_extern_t* wasmtime_wasm_global_as_extern(wasmtime_wasm_global_t*);
++WASM_API_EXTERN wasmtime_wasm_extern_t* wasmtime_wasm_table_as_extern(wasmtime_wasm_table_t*);
++WASM_API_EXTERN wasmtime_wasm_extern_t* wasmtime_wasm_memory_as_extern(wasmtime_wasm_memory_t*);
+ 
+-WASM_API_EXTERN wasm_func_t* wasm_extern_as_func(wasm_extern_t*);
+-WASM_API_EXTERN wasm_global_t* wasm_extern_as_global(wasm_extern_t*);
+-WASM_API_EXTERN wasm_table_t* wasm_extern_as_table(wasm_extern_t*);
+-WASM_API_EXTERN wasm_memory_t* wasm_extern_as_memory(wasm_extern_t*);
++WASM_API_EXTERN wasmtime_wasm_func_t* wasmtime_wasm_extern_as_func(wasmtime_wasm_extern_t*);
++WASM_API_EXTERN wasmtime_wasm_global_t* wasmtime_wasm_extern_as_global(wasmtime_wasm_extern_t*);
++WASM_API_EXTERN wasmtime_wasm_table_t* wasmtime_wasm_extern_as_table(wasmtime_wasm_extern_t*);
++WASM_API_EXTERN wasmtime_wasm_memory_t* wasmtime_wasm_extern_as_memory(wasmtime_wasm_extern_t*);
+ 
+-WASM_API_EXTERN const wasm_extern_t* wasm_func_as_extern_const(const wasm_func_t*);
+-WASM_API_EXTERN const wasm_extern_t* wasm_global_as_extern_const(const wasm_global_t*);
+-WASM_API_EXTERN const wasm_extern_t* wasm_table_as_extern_const(const wasm_table_t*);
+-WASM_API_EXTERN const wasm_extern_t* wasm_memory_as_extern_const(const wasm_memory_t*);
++WASM_API_EXTERN const wasmtime_wasm_extern_t* wasmtime_wasm_func_as_extern_const(const wasmtime_wasm_func_t*);
++WASM_API_EXTERN const wasmtime_wasm_extern_t* wasmtime_wasm_global_as_extern_const(const wasmtime_wasm_global_t*);
++WASM_API_EXTERN const wasmtime_wasm_extern_t* wasmtime_wasm_table_as_extern_const(const wasmtime_wasm_table_t*);
++WASM_API_EXTERN const wasmtime_wasm_extern_t* wasmtime_wasm_memory_as_extern_const(const wasmtime_wasm_memory_t*);
+ 
+-WASM_API_EXTERN const wasm_func_t* wasm_extern_as_func_const(const wasm_extern_t*);
+-WASM_API_EXTERN const wasm_global_t* wasm_extern_as_global_const(const wasm_extern_t*);
+-WASM_API_EXTERN const wasm_table_t* wasm_extern_as_table_const(const wasm_extern_t*);
+-WASM_API_EXTERN const wasm_memory_t* wasm_extern_as_memory_const(const wasm_extern_t*);
++WASM_API_EXTERN const wasmtime_wasm_func_t* wasmtime_wasm_extern_as_func_const(const wasmtime_wasm_extern_t*);
++WASM_API_EXTERN const wasmtime_wasm_global_t* wasmtime_wasm_extern_as_global_const(const wasmtime_wasm_extern_t*);
++WASM_API_EXTERN const wasmtime_wasm_table_t* wasmtime_wasm_extern_as_table_const(const wasmtime_wasm_extern_t*);
++WASM_API_EXTERN const wasmtime_wasm_memory_t* wasmtime_wasm_extern_as_memory_const(const wasmtime_wasm_extern_t*);
+ 
+ 
+ // Module Instances
+ 
+ WASM_DECLARE_REF(instance)
+ 
+-WASM_API_EXTERN own wasm_instance_t* wasm_instance_new(
+-  wasm_store_t*, const wasm_module_t*, const wasm_extern_vec_t* imports,
+-  own wasm_trap_t**
++WASM_API_EXTERN own wasmtime_wasm_instance_t* wasmtime_wasm_instance_new(
++  wasmtime_wasm_store_t*, const wasmtime_wasm_module_t*, const wasmtime_wasm_extern_vec_t* imports,
++  own wasmtime_wasm_trap_t**
+ );
+ 
+-WASM_API_EXTERN void wasm_instance_exports(const wasm_instance_t*, own wasm_extern_vec_t* out);
++WASM_API_EXTERN void wasmtime_wasm_instance_exports(const wasmtime_wasm_instance_t*, own wasmtime_wasm_extern_vec_t* out);
+ 
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+@@ -540,159 +540,159 @@ WASM_API_EXTERN void wasm_instance_exports(const wasm_instance_t*, own wasm_exte
+ 
+ // Value Type construction short-hands
+ 
+-static inline own wasm_valtype_t* wasm_valtype_new_i32(void) {
+-  return wasm_valtype_new(WASM_I32);
++static inline own wasmtime_wasm_valtype_t* wasmtime_wasm_valtype_new_i32(void) {
++  return wasmtime_wasm_valtype_new(WASM_I32);
+ }
+-static inline own wasm_valtype_t* wasm_valtype_new_i64(void) {
+-  return wasm_valtype_new(WASM_I64);
++static inline own wasmtime_wasm_valtype_t* wasmtime_wasm_valtype_new_i64(void) {
++  return wasmtime_wasm_valtype_new(WASM_I64);
+ }
+-static inline own wasm_valtype_t* wasm_valtype_new_f32(void) {
+-  return wasm_valtype_new(WASM_F32);
++static inline own wasmtime_wasm_valtype_t* wasmtime_wasm_valtype_new_f32(void) {
++  return wasmtime_wasm_valtype_new(WASM_F32);
+ }
+-static inline own wasm_valtype_t* wasm_valtype_new_f64(void) {
+-  return wasm_valtype_new(WASM_F64);
++static inline own wasmtime_wasm_valtype_t* wasmtime_wasm_valtype_new_f64(void) {
++  return wasmtime_wasm_valtype_new(WASM_F64);
+ }
+ 
+-static inline own wasm_valtype_t* wasm_valtype_new_externref(void) {
+-  return wasm_valtype_new(WASM_EXTERNREF);
++static inline own wasmtime_wasm_valtype_t* wasmtime_wasm_valtype_new_externref(void) {
++  return wasmtime_wasm_valtype_new(WASM_EXTERNREF);
+ }
+-static inline own wasm_valtype_t* wasm_valtype_new_funcref(void) {
+-  return wasm_valtype_new(WASM_FUNCREF);
++static inline own wasmtime_wasm_valtype_t* wasmtime_wasm_valtype_new_funcref(void) {
++  return wasmtime_wasm_valtype_new(WASM_FUNCREF);
+ }
+ 
+ 
+ // Function Types construction short-hands
+ 
+-static inline own wasm_functype_t* wasm_functype_new_0_0(void) {
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new_empty(&params);
+-  wasm_valtype_vec_new_empty(&results);
+-  return wasm_functype_new(&params, &results);
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_0_0(void) {
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new_empty(&params);
++  wasmtime_wasm_valtype_vec_new_empty(&results);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_1_0(
+-  own wasm_valtype_t* p
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_1_0(
++  own wasmtime_wasm_valtype_t* p
+ ) {
+-  wasm_valtype_t* ps[1] = {p};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new(&params, 1, ps);
+-  wasm_valtype_vec_new_empty(&results);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* ps[1] = {p};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new(&params, 1, ps);
++  wasmtime_wasm_valtype_vec_new_empty(&results);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_2_0(
+-  own wasm_valtype_t* p1, own wasm_valtype_t* p2
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_2_0(
++  own wasmtime_wasm_valtype_t* p1, own wasmtime_wasm_valtype_t* p2
+ ) {
+-  wasm_valtype_t* ps[2] = {p1, p2};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new(&params, 2, ps);
+-  wasm_valtype_vec_new_empty(&results);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* ps[2] = {p1, p2};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new(&params, 2, ps);
++  wasmtime_wasm_valtype_vec_new_empty(&results);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_3_0(
+-  own wasm_valtype_t* p1, own wasm_valtype_t* p2, own wasm_valtype_t* p3
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_3_0(
++  own wasmtime_wasm_valtype_t* p1, own wasmtime_wasm_valtype_t* p2, own wasmtime_wasm_valtype_t* p3
+ ) {
+-  wasm_valtype_t* ps[3] = {p1, p2, p3};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new(&params, 3, ps);
+-  wasm_valtype_vec_new_empty(&results);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* ps[3] = {p1, p2, p3};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new(&params, 3, ps);
++  wasmtime_wasm_valtype_vec_new_empty(&results);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_0_1(
+-  own wasm_valtype_t* r
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_0_1(
++  own wasmtime_wasm_valtype_t* r
+ ) {
+-  wasm_valtype_t* rs[1] = {r};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new_empty(&params);
+-  wasm_valtype_vec_new(&results, 1, rs);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* rs[1] = {r};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new_empty(&params);
++  wasmtime_wasm_valtype_vec_new(&results, 1, rs);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_1_1(
+-  own wasm_valtype_t* p, own wasm_valtype_t* r
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_1_1(
++  own wasmtime_wasm_valtype_t* p, own wasmtime_wasm_valtype_t* r
+ ) {
+-  wasm_valtype_t* ps[1] = {p};
+-  wasm_valtype_t* rs[1] = {r};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new(&params, 1, ps);
+-  wasm_valtype_vec_new(&results, 1, rs);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* ps[1] = {p};
++  wasmtime_wasm_valtype_t* rs[1] = {r};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new(&params, 1, ps);
++  wasmtime_wasm_valtype_vec_new(&results, 1, rs);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_2_1(
+-  own wasm_valtype_t* p1, own wasm_valtype_t* p2, own wasm_valtype_t* r
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_2_1(
++  own wasmtime_wasm_valtype_t* p1, own wasmtime_wasm_valtype_t* p2, own wasmtime_wasm_valtype_t* r
+ ) {
+-  wasm_valtype_t* ps[2] = {p1, p2};
+-  wasm_valtype_t* rs[1] = {r};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new(&params, 2, ps);
+-  wasm_valtype_vec_new(&results, 1, rs);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* ps[2] = {p1, p2};
++  wasmtime_wasm_valtype_t* rs[1] = {r};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new(&params, 2, ps);
++  wasmtime_wasm_valtype_vec_new(&results, 1, rs);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_3_1(
+-  own wasm_valtype_t* p1, own wasm_valtype_t* p2, own wasm_valtype_t* p3,
+-  own wasm_valtype_t* r
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_3_1(
++  own wasmtime_wasm_valtype_t* p1, own wasmtime_wasm_valtype_t* p2, own wasmtime_wasm_valtype_t* p3,
++  own wasmtime_wasm_valtype_t* r
+ ) {
+-  wasm_valtype_t* ps[3] = {p1, p2, p3};
+-  wasm_valtype_t* rs[1] = {r};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new(&params, 3, ps);
+-  wasm_valtype_vec_new(&results, 1, rs);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* ps[3] = {p1, p2, p3};
++  wasmtime_wasm_valtype_t* rs[1] = {r};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new(&params, 3, ps);
++  wasmtime_wasm_valtype_vec_new(&results, 1, rs);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_0_2(
+-  own wasm_valtype_t* r1, own wasm_valtype_t* r2
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_0_2(
++  own wasmtime_wasm_valtype_t* r1, own wasmtime_wasm_valtype_t* r2
+ ) {
+-  wasm_valtype_t* rs[2] = {r1, r2};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new_empty(&params);
+-  wasm_valtype_vec_new(&results, 2, rs);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* rs[2] = {r1, r2};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new_empty(&params);
++  wasmtime_wasm_valtype_vec_new(&results, 2, rs);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_1_2(
+-  own wasm_valtype_t* p, own wasm_valtype_t* r1, own wasm_valtype_t* r2
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_1_2(
++  own wasmtime_wasm_valtype_t* p, own wasmtime_wasm_valtype_t* r1, own wasmtime_wasm_valtype_t* r2
+ ) {
+-  wasm_valtype_t* ps[1] = {p};
+-  wasm_valtype_t* rs[2] = {r1, r2};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new(&params, 1, ps);
+-  wasm_valtype_vec_new(&results, 2, rs);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* ps[1] = {p};
++  wasmtime_wasm_valtype_t* rs[2] = {r1, r2};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new(&params, 1, ps);
++  wasmtime_wasm_valtype_vec_new(&results, 2, rs);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_2_2(
+-  own wasm_valtype_t* p1, own wasm_valtype_t* p2,
+-  own wasm_valtype_t* r1, own wasm_valtype_t* r2
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_2_2(
++  own wasmtime_wasm_valtype_t* p1, own wasmtime_wasm_valtype_t* p2,
++  own wasmtime_wasm_valtype_t* r1, own wasmtime_wasm_valtype_t* r2
+ ) {
+-  wasm_valtype_t* ps[2] = {p1, p2};
+-  wasm_valtype_t* rs[2] = {r1, r2};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new(&params, 2, ps);
+-  wasm_valtype_vec_new(&results, 2, rs);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* ps[2] = {p1, p2};
++  wasmtime_wasm_valtype_t* rs[2] = {r1, r2};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new(&params, 2, ps);
++  wasmtime_wasm_valtype_vec_new(&results, 2, rs);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+-static inline own wasm_functype_t* wasm_functype_new_3_2(
+-  own wasm_valtype_t* p1, own wasm_valtype_t* p2, own wasm_valtype_t* p3,
+-  own wasm_valtype_t* r1, own wasm_valtype_t* r2
++static inline own wasmtime_wasm_functype_t* wasmtime_wasm_functype_new_3_2(
++  own wasmtime_wasm_valtype_t* p1, own wasmtime_wasm_valtype_t* p2, own wasmtime_wasm_valtype_t* p3,
++  own wasmtime_wasm_valtype_t* r1, own wasmtime_wasm_valtype_t* r2
+ ) {
+-  wasm_valtype_t* ps[3] = {p1, p2, p3};
+-  wasm_valtype_t* rs[2] = {r1, r2};
+-  wasm_valtype_vec_t params, results;
+-  wasm_valtype_vec_new(&params, 3, ps);
+-  wasm_valtype_vec_new(&results, 2, rs);
+-  return wasm_functype_new(&params, &results);
++  wasmtime_wasm_valtype_t* ps[3] = {p1, p2, p3};
++  wasmtime_wasm_valtype_t* rs[2] = {r1, r2};
++  wasmtime_wasm_valtype_vec_t params, results;
++  wasmtime_wasm_valtype_vec_new(&params, 3, ps);
++  wasmtime_wasm_valtype_vec_new(&results, 2, rs);
++  return wasmtime_wasm_functype_new(&params, &results);
+ }
+ 
+ 
+ // Value construction short-hands
+ 
+-static inline void wasm_val_init_ptr(own wasm_val_t* out, void* p) {
++static inline void wasmtime_wasm_val_init_ptr(own wasmtime_wasm_val_t* out, void* p) {
+ #if UINTPTR_MAX == UINT32_MAX
+   out->kind = WASM_I32;
+   out->of.i32 = (intptr_t)p;
+@@ -702,7 +702,7 @@ static inline void wasm_val_init_ptr(own wasm_val_t* out, void* p) {
+ #endif
+ }
+ 
+-static inline void* wasm_val_ptr(const wasm_val_t* val) {
++static inline void* wasmtime_wasm_val_ptr(const wasmtime_wasm_val_t* val) {
+ #if UINTPTR_MAX == UINT32_MAX
+   return (void*)(intptr_t)val->of.i32;
+ #elif UINTPTR_MAX == UINT64_MAX
+diff --git a/crates/c-api/include/wasmtime.h b/crates/c-api/include/wasmtime.h
+index 28ff188f0a..c5ed10f1c7 100644
+--- a/crates/c-api/include/wasmtime.h
++++ b/crates/c-api/include/wasmtime.h
+@@ -242,7 +242,7 @@ extern "C" {
+  * deallocate the returned #wasmtime_error_t and #wasm_byte_vec_t.
+  */
+ WASM_API_EXTERN wasmtime_error_t *
+-wasmtime_wat2wasm(const char *wat, size_t wat_len, wasm_byte_vec_t *ret);
++wasmtime_wat2wasm(const char *wat, size_t wat_len, wasmtime_wasm_byte_vec_t *ret);
+ 
+ #endif
+ 
+diff --git a/crates/c-api/include/wasmtime/async.h b/crates/c-api/include/wasmtime/async.h
+index c0f6a14b4f..877c118d8b 100644
+--- a/crates/c-api/include/wasmtime/async.h
++++ b/crates/c-api/include/wasmtime/async.h
+@@ -164,7 +164,7 @@ typedef struct wasmtime_async_continuation_t {
+ typedef void (*wasmtime_func_async_callback_t)(
+     void *env, wasmtime_caller_t *caller, const wasmtime_val_t *args,
+     size_t nargs, wasmtime_val_t *results, size_t nresults,
+-    wasm_trap_t **trap_ret, wasmtime_async_continuation_t *continuation_ret);
++    wasmtime_wasm_trap_t **trap_ret, wasmtime_async_continuation_t *continuation_ret);
+ 
+ /**
+  * \brief The structure representing a asynchronously running function.
+@@ -235,7 +235,7 @@ wasmtime_call_future_delete(wasmtime_call_future_t *future);
+ WASM_API_EXTERN wasmtime_call_future_t *wasmtime_func_call_async(
+     wasmtime_context_t *context, const wasmtime_func_t *func,
+     const wasmtime_val_t *args, size_t nargs, wasmtime_val_t *results,
+-    size_t nresults, wasm_trap_t **trap_ret, wasmtime_error_t **error_ret);
++    size_t nresults, wasmtime_wasm_trap_t **trap_ret, wasmtime_error_t **error_ret);
+ 
+ /**
+  * \brief Defines a new async function in this linker.
+@@ -247,7 +247,7 @@ WASM_API_EXTERN wasmtime_call_future_t *wasmtime_func_call_async(
+  */
+ WASM_API_EXTERN wasmtime_error_t *wasmtime_linker_define_async_func(
+     wasmtime_linker_t *linker, const char *module, size_t module_len,
+-    const char *name, size_t name_len, const wasm_functype_t *ty,
++    const char *name, size_t name_len, const wasmtime_wasm_functype_t *ty,
+     wasmtime_func_async_callback_t cb, void *data, void (*finalizer)(void *));
+ 
+ /**
+@@ -268,7 +268,7 @@ WASM_API_EXTERN wasmtime_error_t *wasmtime_linker_define_async_func(
+ WASM_API_EXTERN wasmtime_call_future_t *wasmtime_linker_instantiate_async(
+     const wasmtime_linker_t *linker, wasmtime_context_t *store,
+     const wasmtime_module_t *module, wasmtime_instance_t *instance,
+-    wasm_trap_t **trap_ret, wasmtime_error_t **error_ret);
++    wasmtime_wasm_trap_t **trap_ret, wasmtime_error_t **error_ret);
+ 
+ /**
+  * \brief Instantiates instance within the given store.
+@@ -292,7 +292,7 @@ WASM_API_EXTERN wasmtime_call_future_t *wasmtime_linker_instantiate_async(
+  */
+ WASM_API_EXTERN wasmtime_call_future_t *wasmtime_instance_pre_instantiate_async(
+     const wasmtime_instance_pre_t *instance_pre, wasmtime_context_t *store,
+-    wasmtime_instance_t *instance, wasm_trap_t **trap_ret,
++    wasmtime_instance_t *instance, wasmtime_wasm_trap_t **trap_ret,
+     wasmtime_error_t **error_ret);
+ 
+ /**
+@@ -362,7 +362,7 @@ typedef struct {
+  * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.with_host_stack
+  */
+ WASM_API_EXTERN void
+-wasmtime_config_host_stack_creator_set(wasm_config_t *,
++wasmtime_config_host_stack_creator_set(wasmtime_wasm_config_t *,
+                                        wasmtime_stack_creator_t *);
+ 
+ #ifdef __cplusplus
+diff --git a/crates/c-api/include/wasmtime/config.h b/crates/c-api/include/wasmtime/config.h
+index 0cd970ccc9..13ec0dabd7 100644
+--- a/crates/c-api/include/wasmtime/config.h
++++ b/crates/c-api/include/wasmtime/config.h
+@@ -88,7 +88,7 @@ enum wasmtime_profiling_strategy_enum { // ProfilingStrategy
+ };
+ 
+ #define WASMTIME_CONFIG_PROP(ret, name, ty)                                    \
+-  WASM_API_EXTERN ret wasmtime_config_##name##_set(wasm_config_t *, ty);
++  WASM_API_EXTERN ret wasmtime_config_##name##_set(wasmtime_wasm_config_t *, ty);
+ 
+ /**
+  * \brief Configures whether DWARF debug information is constructed at runtime
+@@ -150,7 +150,7 @@ WASMTIME_CONFIG_PROP(void, max_wasm_stack, size_t)
+  *
+  * Note that threads are largely unimplemented in Wasmtime at this time.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_threads, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_threads, bool)
+ 
+ #endif // WASMTIME_FEATURE_THREADS
+ 
+@@ -159,7 +159,7 @@ WASMTIME_CONFIG_PROP(void, wasm_threads, bool)
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_tail_call, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_tail_call, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly reference types proposal is
+@@ -167,7 +167,7 @@ WASMTIME_CONFIG_PROP(void, wasm_tail_call, bool)
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_reference_types, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_reference_types, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly typed function reference types
+@@ -175,14 +175,14 @@ WASMTIME_CONFIG_PROP(void, wasm_reference_types, bool)
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_function_references, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_function_references, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly GC proposal is enabled.
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_gc, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_gc, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly SIMD proposal is
+@@ -190,7 +190,7 @@ WASMTIME_CONFIG_PROP(void, wasm_gc, bool)
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_simd, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_simd, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly relaxed SIMD proposal is
+@@ -198,7 +198,7 @@ WASMTIME_CONFIG_PROP(void, wasm_simd, bool)
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_relaxed_simd, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_relaxed_simd, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly relaxed SIMD proposal is
+@@ -206,7 +206,7 @@ WASMTIME_CONFIG_PROP(void, wasm_relaxed_simd, bool)
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_relaxed_simd_deterministic, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_relaxed_simd_deterministic, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly bulk memory proposal is
+@@ -214,7 +214,7 @@ WASMTIME_CONFIG_PROP(void, wasm_relaxed_simd_deterministic, bool)
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_bulk_memory, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_bulk_memory, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly multi value proposal is
+@@ -222,7 +222,7 @@ WASMTIME_CONFIG_PROP(void, wasm_bulk_memory, bool)
+  *
+  * This setting is `true` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_multi_value, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_multi_value, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly multi-memory proposal is
+@@ -230,7 +230,7 @@ WASMTIME_CONFIG_PROP(void, wasm_multi_value, bool)
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_multi_memory, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_multi_memory, bool)
+ 
+ /**
+  * \brief Configures whether the WebAssembly memory64 proposal is
+@@ -238,7 +238,7 @@ WASMTIME_CONFIG_PROP(void, wasm_multi_memory, bool)
+  *
+  * This setting is `false` by default.
+  */
+-WASMTIME_CONFIG_PROP(void, wasm_memory64, bool)
++WASMTIME_CONFIG_PROP(void, wasmtime_wasm_memory64, bool)
+ 
+ #ifdef WASMTIME_FEATURE_COMPILER
+ 
+@@ -376,7 +376,7 @@ WASMTIME_CONFIG_PROP(void, native_unwind_info, bool)
+  * cache could not be enabled.
+  */
+ WASM_API_EXTERN wasmtime_error_t *
+-wasmtime_config_cache_config_load(wasm_config_t *, const char *);
++wasmtime_config_cache_config_load(wasmtime_wasm_config_t *, const char *);
+ 
+ #endif // WASMTIME_FEATURE_CACHE
+ 
+@@ -405,7 +405,7 @@ WASMTIME_CONFIG_PROP(wasmtime_error_t *, target, const char *)
+  * For more information see the Rust documentation at
+  * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.cranelift_flag_enable
+  */
+-WASM_API_EXTERN void wasmtime_config_cranelift_flag_enable(wasm_config_t *,
++WASM_API_EXTERN void wasmtime_config_cranelift_flag_enable(wasmtime_wasm_config_t *,
+                                                            const char *);
+ 
+ /**
+@@ -417,7 +417,7 @@ WASM_API_EXTERN void wasmtime_config_cranelift_flag_enable(wasm_config_t *,
+  * For more information see the Rust documentation at
+  * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.cranelift_flag_set
+  */
+-WASM_API_EXTERN void wasmtime_config_cranelift_flag_set(wasm_config_t *,
++WASM_API_EXTERN void wasmtime_config_cranelift_flag_set(wasmtime_wasm_config_t *,
+                                                         const char *key,
+                                                         const char *value);
+ 
+@@ -484,7 +484,7 @@ typedef struct wasmtime_linear_memory {
+  * https://docs.wasmtime.dev/api/wasmtime/trait.MemoryCreator.html#tymethod.new_memory
+  */
+ typedef wasmtime_error_t *(*wasmtime_new_memory_callback_t)(
+-    void *env, const wasm_memorytype_t *ty, size_t minimum, size_t maximum,
++    void *env, const wasmtime_wasm_memorytype_t *ty, size_t minimum, size_t maximum,
+     size_t reserved_size_in_bytes, size_t guard_size_in_bytes,
+     wasmtime_linear_memory_t *memory_ret);
+ 
+@@ -518,7 +518,7 @@ typedef struct wasmtime_memory_creator {
+  * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.with_host_memory
+  */
+ WASM_API_EXTERN void
+-wasmtime_config_host_memory_creator_set(wasm_config_t *,
++wasmtime_config_host_memory_creator_set(wasmtime_wasm_config_t *,
+                                         wasmtime_memory_creator_t *);
+ 
+ /**
+diff --git a/crates/c-api/include/wasmtime/engine.h b/crates/c-api/include/wasmtime/engine.h
+index 6b666bf5f9..38457dcafd 100644
+--- a/crates/c-api/include/wasmtime/engine.h
++++ b/crates/c-api/include/wasmtime/engine.h
+@@ -19,7 +19,7 @@ extern "C" {
+  * This function clones the reference-counted pointer to the internal object,
+  * and must be freed using #wasm_engine_delete.
+  */
+-WASM_API_EXTERN wasm_engine_t *wasmtime_engine_clone(wasm_engine_t *engine);
++WASM_API_EXTERN wasmtime_wasm_engine_t *wasmtime_engine_clone(wasmtime_wasm_engine_t *engine);
+ 
+ /**
+  * \brief Increments the engine-local epoch variable.
+@@ -33,7 +33,7 @@ WASM_API_EXTERN wasm_engine_t *wasmtime_engine_clone(wasm_engine_t *engine);
+  *
+  * See also #wasmtime_config_epoch_interruption_set.
+  */
+-WASM_API_EXTERN void wasmtime_engine_increment_epoch(wasm_engine_t *engine);
++WASM_API_EXTERN void wasmtime_engine_increment_epoch(wasmtime_wasm_engine_t *engine);
+ 
+ #ifdef __cplusplus
+ } // extern "C"
+diff --git a/crates/c-api/include/wasmtime/error.h b/crates/c-api/include/wasmtime/error.h
+index ad91725436..e0cc880a04 100644
+--- a/crates/c-api/include/wasmtime/error.h
++++ b/crates/c-api/include/wasmtime/error.h
+@@ -49,7 +49,7 @@ WASM_API_EXTERN void wasmtime_error_delete(wasmtime_error_t *error);
+  * for deallocating it with #wasm_byte_vec_delete afterwards.
+  */
+ WASM_API_EXTERN void wasmtime_error_message(const wasmtime_error_t *error,
+-                                            wasm_name_t *message);
++                                            wasmtime_wasm_name_t *message);
+ 
+ /**
+  * \brief Attempts to extract a WASI-specific exit status from this error.
+@@ -69,7 +69,7 @@ WASM_API_EXTERN bool wasmtime_error_exit_status(const wasmtime_error_t *,
+  * present.
+  */
+ WASM_API_EXTERN void wasmtime_error_wasm_trace(const wasmtime_error_t *,
+-                                               wasm_frame_vec_t *out);
++                                               wasmtime_wasm_frame_vec_t *out);
+ 
+ #ifdef __cplusplus
+ } // extern "C"
+diff --git a/crates/c-api/include/wasmtime/extern.h b/crates/c-api/include/wasmtime/extern.h
+index 347f2b51bd..b0427dea0e 100644
+--- a/crates/c-api/include/wasmtime/extern.h
++++ b/crates/c-api/include/wasmtime/extern.h
+@@ -145,7 +145,7 @@ void wasmtime_extern_delete(wasmtime_extern_t *val);
+ ///
+ /// Does not take ownership of `context` or `val`, but the returned
+ /// #wasm_externtype_t is an owned value that needs to be deleted.
+-wasm_externtype_t *wasmtime_extern_type(wasmtime_context_t *context,
++wasmtime_wasm_externtype_t *wasmtime_extern_type(wasmtime_context_t *context,
+                                         wasmtime_extern_t *val);
+ 
+ #ifdef __cplusplus
+diff --git a/crates/c-api/include/wasmtime/func.h b/crates/c-api/include/wasmtime/func.h
+index 41ff907c37..932c396497 100644
+--- a/crates/c-api/include/wasmtime/func.h
++++ b/crates/c-api/include/wasmtime/func.h
+@@ -54,7 +54,7 @@ typedef struct wasmtime_caller wasmtime_caller_t;
+  * should be raised in WebAssembly. It's expected that in this case the caller
+  * relinquishes ownership of the trap and it is passed back to the engine.
+  */
+-typedef wasm_trap_t *(*wasmtime_func_callback_t)(
++typedef wasmtime_wasm_trap_t *(*wasmtime_func_callback_t)(
+     void *env, wasmtime_caller_t *caller, const wasmtime_val_t *args,
+     size_t nargs, wasmtime_val_t *results, size_t nresults);
+ 
+@@ -75,7 +75,7 @@ typedef wasm_trap_t *(*wasmtime_func_callback_t)(
+  * The returned function can only be used with the specified `store`.
+  */
+ WASM_API_EXTERN void wasmtime_func_new(wasmtime_context_t *store,
+-                                       const wasm_functype_t *type,
++                                       const wasmtime_wasm_functype_t *type,
+                                        wasmtime_func_callback_t callback,
+                                        void *env, void (*finalizer)(void *),
+                                        wasmtime_func_t *ret);
+@@ -113,7 +113,7 @@ WASM_API_EXTERN void wasmtime_func_new(wasmtime_context_t *store,
+  * array. Results are also written starting at index 0, which will overwrite
+  * the arguments.
+  */
+-typedef wasm_trap_t *(*wasmtime_func_unchecked_callback_t)(
++typedef wasmtime_wasm_trap_t *(*wasmtime_func_unchecked_callback_t)(
+     void *env, wasmtime_caller_t *caller, wasmtime_val_raw_t *args_and_results,
+     size_t num_args_and_results);
+ 
+@@ -142,7 +142,7 @@ typedef wasm_trap_t *(*wasmtime_func_unchecked_callback_t)(
+  * existence).
+  */
+ WASM_API_EXTERN void wasmtime_func_new_unchecked(
+-    wasmtime_context_t *store, const wasm_functype_t *type,
++    wasmtime_context_t *store, const wasmtime_wasm_functype_t *type,
+     wasmtime_func_unchecked_callback_t callback, void *env,
+     void (*finalizer)(void *), wasmtime_func_t *ret);
+ 
+@@ -151,7 +151,7 @@ WASM_API_EXTERN void wasmtime_func_new_unchecked(
+  *
+  * The returned #wasm_functype_t is owned by the caller.
+  */
+-WASM_API_EXTERN wasm_functype_t *
++WASM_API_EXTERN wasmtime_wasm_functype_t *
+ wasmtime_func_type(const wasmtime_context_t *store,
+                    const wasmtime_func_t *func);
+ 
+@@ -194,7 +194,7 @@ WASM_API_EXTERN wasmtime_error_t *
+ wasmtime_func_call(wasmtime_context_t *store, const wasmtime_func_t *func,
+                    const wasmtime_val_t *args, size_t nargs,
+                    wasmtime_val_t *results, size_t nresults,
+-                   wasm_trap_t **trap);
++                   wasmtime_wasm_trap_t **trap);
+ 
+ /**
+  * \brief Call a WebAssembly function in an "unchecked" fashion.
+@@ -229,7 +229,7 @@ WASM_API_EXTERN wasmtime_error_t *
+ wasmtime_func_call_unchecked(wasmtime_context_t *store,
+                              const wasmtime_func_t *func,
+                              wasmtime_val_raw_t *args_and_results,
+-                             size_t args_and_results_len, wasm_trap_t **trap);
++                             size_t args_and_results_len, wasmtime_wasm_trap_t **trap);
+ 
+ /**
+  * \brief Loads a #wasmtime_extern_t from the caller's context
+diff --git a/crates/c-api/include/wasmtime/global.h b/crates/c-api/include/wasmtime/global.h
+index 8b20af9150..7df9b0e025 100644
+--- a/crates/c-api/include/wasmtime/global.h
++++ b/crates/c-api/include/wasmtime/global.h
+@@ -34,7 +34,7 @@ extern "C" {
+  * owned by the caller.
+  */
+ WASM_API_EXTERN wasmtime_error_t *
+-wasmtime_global_new(wasmtime_context_t *store, const wasm_globaltype_t *type,
++wasmtime_global_new(wasmtime_context_t *store, const wasmtime_wasm_globaltype_t *type,
+                     const wasmtime_val_t *val, wasmtime_global_t *ret);
+ 
+ /**
+@@ -42,7 +42,7 @@ wasmtime_global_new(wasmtime_context_t *store, const wasm_globaltype_t *type,
+  *
+  * The returned #wasm_globaltype_t is owned by the caller.
+  */
+-WASM_API_EXTERN wasm_globaltype_t *
++WASM_API_EXTERN wasmtime_wasm_globaltype_t *
+ wasmtime_global_type(const wasmtime_context_t *store,
+                      const wasmtime_global_t *global);
+ 
+diff --git a/crates/c-api/include/wasmtime/instance.h b/crates/c-api/include/wasmtime/instance.h
+index 0d63cfb7a4..fb590ad682 100644
+--- a/crates/c-api/include/wasmtime/instance.h
++++ b/crates/c-api/include/wasmtime/instance.h
+@@ -66,7 +66,7 @@ WASM_API_EXTERN wasmtime_error_t *
+ wasmtime_instance_new(wasmtime_context_t *store,
+                       const wasmtime_module_t *module,
+                       const wasmtime_extern_t *imports, size_t nimports,
+-                      wasmtime_instance_t *instance, wasm_trap_t **trap);
++                      wasmtime_instance_t *instance, wasmtime_wasm_trap_t **trap);
+ 
+ /**
+  * \brief Get an export by name from an instance.
+@@ -151,7 +151,7 @@ wasmtime_instance_pre_delete(wasmtime_instance_pre_t *instance_pre);
+  */
+ WASM_API_EXTERN wasmtime_error_t *wasmtime_instance_pre_instantiate(
+     const wasmtime_instance_pre_t *instance_pre, wasmtime_store_t *store,
+-    wasmtime_instance_t *instance, wasm_trap_t **trap_ptr);
++    wasmtime_instance_t *instance, wasmtime_wasm_trap_t **trap_ptr);
+ 
+ /**
+  * \brief Get the module (as a shallow clone) for a instance_pre.
+diff --git a/crates/c-api/include/wasmtime/linker.h b/crates/c-api/include/wasmtime/linker.h
+index 0a793d1e6f..ed4a27688c 100644
+--- a/crates/c-api/include/wasmtime/linker.h
++++ b/crates/c-api/include/wasmtime/linker.h
+@@ -41,7 +41,7 @@ typedef struct wasmtime_linker wasmtime_linker_t;
+  * This function does not take ownership of the engine argument, and the caller
+  * is expected to delete the returned linker.
+  */
+-WASM_API_EXTERN wasmtime_linker_t *wasmtime_linker_new(wasm_engine_t *engine);
++WASM_API_EXTERN wasmtime_linker_t *wasmtime_linker_new(wasmtime_wasm_engine_t *engine);
+ 
+ /**
+  * \brief Clones existing linker.
+@@ -116,7 +116,7 @@ wasmtime_linker_define(wasmtime_linker_t *linker, wasmtime_context_t *store,
+  */
+ WASM_API_EXTERN wasmtime_error_t *wasmtime_linker_define_func(
+     wasmtime_linker_t *linker, const char *module, size_t module_len,
+-    const char *name, size_t name_len, const wasm_functype_t *ty,
++    const char *name, size_t name_len, const wasmtime_wasm_functype_t *ty,
+     wasmtime_func_callback_t cb, void *data, void (*finalizer)(void *));
+ 
+ /**
+@@ -130,7 +130,7 @@ WASM_API_EXTERN wasmtime_error_t *wasmtime_linker_define_func(
+  */
+ WASM_API_EXTERN wasmtime_error_t *wasmtime_linker_define_func_unchecked(
+     wasmtime_linker_t *linker, const char *module, size_t module_len,
+-    const char *name, size_t name_len, const wasm_functype_t *ty,
++    const char *name, size_t name_len, const wasmtime_wasm_functype_t *ty,
+     wasmtime_func_unchecked_callback_t cb, void *data,
+     void (*finalizer)(void *));
+ 
+@@ -207,7 +207,7 @@ WASM_API_EXTERN wasmtime_error_t *
+ wasmtime_linker_instantiate(const wasmtime_linker_t *linker,
+                             wasmtime_context_t *store,
+                             const wasmtime_module_t *module,
+-                            wasmtime_instance_t *instance, wasm_trap_t **trap);
++                            wasmtime_instance_t *instance, wasmtime_wasm_trap_t **trap);
+ 
+ /**
+  * \brief Defines automatic instantiations of a #wasm_module_t in this linker.
+diff --git a/crates/c-api/include/wasmtime/memory.h b/crates/c-api/include/wasmtime/memory.h
+index 53e82fcc65..ac69080690 100644
+--- a/crates/c-api/include/wasmtime/memory.h
++++ b/crates/c-api/include/wasmtime/memory.h
+@@ -22,7 +22,7 @@ extern "C" {
+  * Note that this function is preferred over #wasm_memorytype_new for
+  * compatibility with the memory64 proposal.
+  */
+-WASM_API_EXTERN wasm_memorytype_t *wasmtime_memorytype_new(uint64_t min,
++WASM_API_EXTERN wasmtime_wasm_memorytype_t *wasmtime_memorytype_new(uint64_t min,
+                                                            bool max_present,
+                                                            uint64_t max,
+                                                            bool is_64);
+@@ -34,7 +34,7 @@ WASM_API_EXTERN wasm_memorytype_t *wasmtime_memorytype_new(uint64_t min,
+  * compatibility with the memory64 proposal.
+  */
+ WASM_API_EXTERN uint64_t
+-wasmtime_memorytype_minimum(const wasm_memorytype_t *ty);
++wasmtime_memorytype_minimum(const wasmtime_wasm_memorytype_t *ty);
+ 
+ /**
+  * \brief Returns the maximum size, in pages, of the specified memory type.
+@@ -46,18 +46,18 @@ wasmtime_memorytype_minimum(const wasm_memorytype_t *ty);
+  * Note that this function is preferred over #wasm_memorytype_limits for
+  * compatibility with the memory64 proposal.
+  */
+-WASM_API_EXTERN bool wasmtime_memorytype_maximum(const wasm_memorytype_t *ty,
++WASM_API_EXTERN bool wasmtime_memorytype_maximum(const wasmtime_wasm_memorytype_t *ty,
+                                                  uint64_t *max);
+ 
+ /**
+  * \brief Returns whether this type of memory represents a 64-bit memory.
+  */
+-WASM_API_EXTERN bool wasmtime_memorytype_is64(const wasm_memorytype_t *ty);
++WASM_API_EXTERN bool wasmtime_memorytype_is64(const wasmtime_wasm_memorytype_t *ty);
+ 
+ /**
+  * \brief Returns whether this type of memory represents a shared memory.
+  */
+-WASM_API_EXTERN bool wasmtime_memorytype_isshared(const wasm_memorytype_t *ty);
++WASM_API_EXTERN bool wasmtime_memorytype_isshared(const wasmtime_wasm_memorytype_t *ty);
+ 
+ /**
+  * \brief Creates a new WebAssembly linear memory
+@@ -70,13 +70,13 @@ WASM_API_EXTERN bool wasmtime_memorytype_isshared(const wasm_memorytype_t *ty);
+  * caller. If an error happens then `ret` is not filled in.
+  */
+ WASM_API_EXTERN wasmtime_error_t *
+-wasmtime_memory_new(wasmtime_context_t *store, const wasm_memorytype_t *ty,
++wasmtime_memory_new(wasmtime_context_t *store, const wasmtime_wasm_memorytype_t *ty,
+                     wasmtime_memory_t *ret);
+ 
+ /**
+  * \brief Returns the type of the memory specified
+  */
+-WASM_API_EXTERN wasm_memorytype_t *
++WASM_API_EXTERN wasmtime_wasm_memorytype_t *
+ wasmtime_memory_type(const wasmtime_context_t *store,
+                      const wasmtime_memory_t *memory);
+ 
+diff --git a/crates/c-api/include/wasmtime/module.h b/crates/c-api/include/wasmtime/module.h
+index 286f784bd5..50b77a3a07 100644
+--- a/crates/c-api/include/wasmtime/module.h
++++ b/crates/c-api/include/wasmtime/module.h
+@@ -43,9 +43,9 @@ typedef struct wasmtime_module wasmtime_module_t;
+  * This function does not take ownership of any of its arguments, but the
+  * returned error and module are owned by the caller.
+  */
+-WASM_API_EXTERN wasmtime_error_t *wasmtime_module_new(wasm_engine_t *engine,
++WASM_API_EXTERN wasmtime_error_t *wasmtime_module_new(wasmtime_wasm_engine_t *engine,
+                                                       const uint8_t *wasm,
+-                                                      size_t wasm_len,
++                                                      size_t wasmtime_wasm_len,
+                                                       wasmtime_module_t **ret);
+ 
+ #endif // WASMTIME_FEATURE_COMPILER
+@@ -65,13 +65,13 @@ WASM_API_EXTERN wasmtime_module_t *wasmtime_module_clone(wasmtime_module_t *m);
+  * \brief Same as #wasm_module_imports, but for #wasmtime_module_t.
+  */
+ WASM_API_EXTERN void wasmtime_module_imports(const wasmtime_module_t *module,
+-                                             wasm_importtype_vec_t *out);
++                                             wasmtime_wasm_importtype_vec_t *out);
+ 
+ /**
+  * \brief Same as #wasm_module_exports, but for #wasmtime_module_t.
+  */
+ WASM_API_EXTERN void wasmtime_module_exports(const wasmtime_module_t *module,
+-                                             wasm_exporttype_vec_t *out);
++                                             wasmtime_wasm_exporttype_vec_t *out);
+ 
+ #ifdef WASMTIME_FEATURE_COMPILER
+ 
+@@ -88,8 +88,8 @@ WASM_API_EXTERN void wasmtime_module_exports(const wasmtime_module_t *module,
+  * describes why the binary did not validate.
+  */
+ WASM_API_EXTERN wasmtime_error_t *
+-wasmtime_module_validate(wasm_engine_t *engine, const uint8_t *wasm,
+-                         size_t wasm_len);
++wasmtime_module_validate(wasmtime_wasm_engine_t *engine, const uint8_t *wasm,
++                         size_t wasmtime_wasm_len);
+ 
+ /**
+  * \brief This function serializes compiled module artifacts as blob data.
+@@ -105,7 +105,7 @@ wasmtime_module_validate(wasm_engine_t *engine, const uint8_t *wasm,
+  * expected to deallocate the returned #wasmtime_error_t and #wasm_byte_vec_t.
+  */
+ WASM_API_EXTERN wasmtime_error_t *
+-wasmtime_module_serialize(wasmtime_module_t *module, wasm_byte_vec_t *ret);
++wasmtime_module_serialize(wasmtime_module_t *module, wasmtime_wasm_byte_vec_t *ret);
+ 
+ #endif // WASMTIME_FEATURE_COMPILER
+ 
+@@ -120,7 +120,7 @@ wasmtime_module_serialize(wasmtime_module_t *module, wasm_byte_vec_t *ret);
+  * (e.g. only that of `wasmtime_module_serialize`)
+  */
+ WASM_API_EXTERN wasmtime_error_t *
+-wasmtime_module_deserialize(wasm_engine_t *engine, const uint8_t *bytes,
++wasmtime_module_deserialize(wasmtime_wasm_engine_t *engine, const uint8_t *bytes,
+                             size_t bytes_len, wasmtime_module_t **ret);
+ 
+ /**
+@@ -138,7 +138,7 @@ wasmtime_module_deserialize(wasm_engine_t *engine, const uint8_t *bytes,
+  * (e.g. only that of `wasmtime_module_serialize`)
+  */
+ WASM_API_EXTERN wasmtime_error_t *
+-wasmtime_module_deserialize_file(wasm_engine_t *engine, const char *path,
++wasmtime_module_deserialize_file(wasmtime_wasm_engine_t *engine, const char *path,
+                                  wasmtime_module_t **ret);
+ 
+ /**
+diff --git a/crates/c-api/include/wasmtime/profiling.h b/crates/c-api/include/wasmtime/profiling.h
+index 55e95d3723..d8d63d73a2 100644
+--- a/crates/c-api/include/wasmtime/profiling.h
++++ b/crates/c-api/include/wasmtime/profiling.h
+@@ -46,7 +46,7 @@ WASM_API_EXTERN void wasmtime_guestprofiler_delete(
+  * \brief Tuple of name and module for passing into #wasmtime_guestprofiler_new.
+  */
+ typedef struct wasmtime_guestprofiler_modules {
+-  const wasm_name_t *name; //!< Name recorded in the profile.
++  const wasmtime_wasm_name_t *name; //!< Name recorded in the profile.
+   const wasmtime_module_t
+       *mod; //!< Module that is being allowed to appear in captured stack trace.
+ } wasmtime_guestprofiler_modules_t;
+@@ -69,7 +69,7 @@ typedef struct wasmtime_guestprofiler_modules {
+  * https://docs.wasmtime.dev/api/wasmtime/struct.GuestProfiler.html#method.new
+  */
+ WASM_API_EXTERN /* own */ wasmtime_guestprofiler_t *wasmtime_guestprofiler_new(
+-    const wasm_name_t *module_name, uint64_t interval_nanos,
++    const wasmtime_wasm_name_t *module_name, uint64_t interval_nanos,
+     const wasmtime_guestprofiler_modules_t *modules, size_t modules_len);
+ 
+ /**
+@@ -112,7 +112,7 @@ wasmtime_guestprofiler_sample(wasmtime_guestprofiler_t *guestprofiler,
+  */
+ WASM_API_EXTERN /* own */ wasmtime_error_t *
+ wasmtime_guestprofiler_finish(/* own */ wasmtime_guestprofiler_t *guestprofiler,
+-                              /* own */ wasm_byte_vec_t *out);
++                              /* own */ wasmtime_wasm_byte_vec_t *out);
+ 
+ #ifdef __cplusplus
+ } // extern "C"
+diff --git a/crates/c-api/include/wasmtime/sharedmemory.h b/crates/c-api/include/wasmtime/sharedmemory.h
+index 3065a0ef1a..08beccc095 100644
+--- a/crates/c-api/include/wasmtime/sharedmemory.h
++++ b/crates/c-api/include/wasmtime/sharedmemory.h
+@@ -36,8 +36,8 @@ typedef struct wasmtime_sharedmemory wasmtime_sharedmemory_t;
+  * caller. If an error happens then `ret` is not filled in.
+  */
+ WASM_API_EXTERN wasmtime_error_t *
+-wasmtime_sharedmemory_new(const wasm_engine_t *engine,
+-                          const wasm_memorytype_t *ty,
++wasmtime_sharedmemory_new(const wasmtime_wasm_engine_t *engine,
++                          const wasmtime_wasm_memorytype_t *ty,
+                           wasmtime_sharedmemory_t **ret);
+ 
+ #endif // WASMTIME_FEATURE_THREADS
+@@ -64,7 +64,7 @@ wasmtime_sharedmemory_clone(const wasmtime_sharedmemory_t *memory);
+ /**
+  * \brief Returns the type of the shared memory specified
+  */
+-WASM_API_EXTERN wasm_memorytype_t *
++WASM_API_EXTERN wasmtime_wasm_memorytype_t *
+ wasmtime_sharedmemory_type(const wasmtime_sharedmemory_t *memory);
+ 
+ /**
+diff --git a/crates/c-api/include/wasmtime/store.h b/crates/c-api/include/wasmtime/store.h
+index 65613041c9..d46e5aa23c 100644
+--- a/crates/c-api/include/wasmtime/store.h
++++ b/crates/c-api/include/wasmtime/store.h
+@@ -69,7 +69,7 @@ typedef struct wasmtime_context wasmtime_context_t;
+  * This function creates a fresh store with the provided configuration settings.
+  * The returned store must be deleted with #wasmtime_store_delete.
+  */
+-WASM_API_EXTERN wasmtime_store_t *wasmtime_store_new(wasm_engine_t *engine,
++WASM_API_EXTERN wasmtime_store_t *wasmtime_store_new(wasmtime_wasm_engine_t *engine,
+                                                      void *data,
+                                                      void (*finalizer)(void *));
+ 
+diff --git a/crates/c-api/include/wasmtime/table.h b/crates/c-api/include/wasmtime/table.h
+index 9ec8f3796c..df0570ca20 100644
+--- a/crates/c-api/include/wasmtime/table.h
++++ b/crates/c-api/include/wasmtime/table.h
+@@ -30,7 +30,7 @@ extern "C" {
+  * value does not match `ty`, for example.
+  */
+ WASM_API_EXTERN wasmtime_error_t *wasmtime_table_new(wasmtime_context_t *store,
+-                                                     const wasm_tabletype_t *ty,
++                                                     const wasmtime_wasm_tabletype_t *ty,
+                                                      const wasmtime_val_t *init,
+                                                      wasmtime_table_t *table);
+ 
+@@ -39,7 +39,7 @@ WASM_API_EXTERN wasmtime_error_t *wasmtime_table_new(wasmtime_context_t *store,
+  *
+  * The caller has ownership of the returned #wasm_tabletype_t
+  */
+-WASM_API_EXTERN wasm_tabletype_t *
++WASM_API_EXTERN wasmtime_wasm_tabletype_t *
+ wasmtime_table_type(const wasmtime_context_t *store,
+                     const wasmtime_table_t *table);
+ 
+diff --git a/crates/c-api/include/wasmtime/trap.h b/crates/c-api/include/wasmtime/trap.h
+index 0d2385bb00..b600a285cc 100644
+--- a/crates/c-api/include/wasmtime/trap.h
++++ b/crates/c-api/include/wasmtime/trap.h
+@@ -59,7 +59,7 @@ enum wasmtime_trap_code_enum {
+  *
+  * The #wasm_trap_t returned is owned by the caller.
+  */
+-WASM_API_EXTERN wasm_trap_t *wasmtime_trap_new(const char *msg, size_t msg_len);
++WASM_API_EXTERN wasmtime_wasm_trap_t *wasmtime_trap_new(const char *msg, size_t msg_len);
+ 
+ /**
+  * \brief Attempts to extract the trap code from this trap.
+@@ -67,10 +67,10 @@ WASM_API_EXTERN wasm_trap_t *wasmtime_trap_new(const char *msg, size_t msg_len);
+  * Returns `true` if the trap is an instruction trap triggered while
+  * executing Wasm. If `true` is returned then the trap code is returned
+  * through the `code` pointer. If `false` is returned then this is not
+- * an instruction trap -- traps can also be created using wasm_trap_new,
++ * an instruction trap -- traps can also be created using wasmtime_wasm_trap_new,
+  * or occur with WASI modules exiting with a certain exit code.
+  */
+-WASM_API_EXTERN bool wasmtime_trap_code(const wasm_trap_t *,
++WASM_API_EXTERN bool wasmtime_trap_code(const wasmtime_wasm_trap_t *,
+                                         wasmtime_trap_code_t *code);
+ 
+ /**
+@@ -81,8 +81,8 @@ WASM_API_EXTERN bool wasmtime_trap_code(const wasm_trap_t *,
+  *
+  * The lifetime of the returned name is the same as the #wasm_frame_t itself.
+  */
+-WASM_API_EXTERN const wasm_name_t *
+-wasmtime_frame_func_name(const wasm_frame_t *);
++WASM_API_EXTERN const wasmtime_wasm_name_t *
++wasmtime_frame_func_name(const wasmtime_wasm_frame_t *);
+ 
+ /**
+  * \brief Returns a human-readable name for this frame's module.
+@@ -92,8 +92,8 @@ wasmtime_frame_func_name(const wasm_frame_t *);
+  *
+  * The lifetime of the returned name is the same as the #wasm_frame_t itself.
+  */
+-WASM_API_EXTERN const wasm_name_t *
+-wasmtime_frame_module_name(const wasm_frame_t *);
++WASM_API_EXTERN const wasmtime_wasm_name_t *
++wasmtime_frame_module_name(const wasmtime_wasm_frame_t *);
+ 
+ #ifdef __cplusplus
+ } // extern "C"
+diff --git a/crates/c-api/src/async.rs b/crates/c-api/src/async.rs
+index 2e29b88398..7294b21571 100644
+--- a/crates/c-api/src/async.rs
++++ b/crates/c-api/src/async.rs
+@@ -12,19 +12,19 @@ use wasmtime::{
+ };
+ 
+ use crate::{
+-    bad_utf8, handle_result, to_str, translate_args, wasm_config_t, wasm_functype_t, wasm_trap_t,
++    bad_utf8, handle_result, to_str, translate_args, wasmtime_wasm_config_t, wasmtime_wasm_functype_t, wasmtime_wasm_trap_t,
+     wasmtime_caller_t, wasmtime_error_t, wasmtime_instance_pre_t, wasmtime_linker_t,
+     wasmtime_module_t, wasmtime_val_t, wasmtime_val_union, WasmtimeCaller, WasmtimeStoreContextMut,
+     WASMTIME_I32,
+ };
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_async_support_set(c: &mut wasm_config_t, enable: bool) {
++pub extern "C" fn wasmtime_config_async_support_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
+     c.config.async_support(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_async_stack_size_set(c: &mut wasm_config_t, size: usize) {
++pub extern "C" fn wasmtime_config_async_stack_size_set(c: &mut wasmtime_wasm_config_t, size: usize) {
+     c.config.async_stack_size(size);
+ }
+ 
+@@ -54,7 +54,7 @@ pub type wasmtime_func_async_callback_t = extern "C" fn(
+     usize,
+     *mut wasmtime_val_t,
+     usize,
+-    &mut Option<Box<wasm_trap_t>>,
++    &mut Option<Box<wasmtime_wasm_trap_t>>,
+     &mut wasmtime_async_continuation_t,
+ );
+ 
+@@ -208,11 +208,11 @@ pub extern "C" fn wasmtime_call_future_poll(future: &mut wasmtime_call_future_t)
+ 
+ fn handle_call_error(
+     err: wasmtime::Error,
+-    trap_ret: &mut *mut wasm_trap_t,
++    trap_ret: &mut *mut wasmtime_wasm_trap_t,
+     err_ret: &mut *mut wasmtime_error_t,
+ ) {
+     if err.is::<Trap>() {
+-        *trap_ret = Box::into_raw(Box::new(wasm_trap_t::new(err)));
++        *trap_ret = Box::into_raw(Box::new(wasmtime_wasm_trap_t::new(err)));
+     } else {
+         *err_ret = Box::into_raw(Box::new(wasmtime_error_t::from(err)));
+     }
+@@ -223,10 +223,10 @@ async fn do_func_call_async(
+     func: &Func,
+     args: impl ExactSizeIterator<Item = Val>,
+     results: &mut [MaybeUninit<wasmtime_val_t>],
+-    trap_ret: &mut *mut wasm_trap_t,
++    trap_ret: &mut *mut wasmtime_wasm_trap_t,
+     err_ret: &mut *mut wasmtime_error_t,
+ ) {
+-    let mut params = mem::take(&mut store.as_context_mut().data_mut().wasm_val_storage);
++    let mut params = mem::take(&mut store.as_context_mut().data_mut().wasmtime_wasm_val_storage);
+     let (wt_params, wt_results) = translate_args(&mut params, args, results.len());
+     let result = func.call_async(&mut store, wt_params, wt_results).await;
+ 
+@@ -236,7 +236,7 @@ async fn do_func_call_async(
+                 crate::initialize(slot, wasmtime_val_t::from_val(&mut store, *val));
+             }
+             params.truncate(0);
+-            store.as_context_mut().data_mut().wasm_val_storage = params;
++            store.as_context_mut().data_mut().wasmtime_wasm_val_storage = params;
+         }
+         Err(err) => handle_call_error(err, trap_ret, err_ret),
+     }
+@@ -250,7 +250,7 @@ pub unsafe extern "C" fn wasmtime_func_call_async<'a>(
+     nargs: usize,
+     results: *mut MaybeUninit<wasmtime_val_t>,
+     nresults: usize,
+-    trap_ret: &'a mut *mut wasm_trap_t,
++    trap_ret: &'a mut *mut wasmtime_wasm_trap_t,
+     err_ret: &'a mut *mut wasmtime_error_t,
+ ) -> Box<wasmtime_call_future_t<'a>> {
+     let mut scope = RootScope::new(store);
+@@ -277,7 +277,7 @@ pub unsafe extern "C" fn wasmtime_linker_define_async_func(
+     module_len: usize,
+     name: *const u8,
+     name_len: usize,
+-    ty: &wasm_functype_t,
++    ty: &wasmtime_wasm_functype_t,
+     callback: crate::wasmtime_func_async_callback_t,
+     data: *mut c_void,
+     finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
+@@ -298,7 +298,7 @@ async fn do_linker_instantiate_async(
+     store: WasmtimeStoreContextMut<'_>,
+     module: &wasmtime_module_t,
+     instance_ptr: &mut Instance,
+-    trap_ret: &mut *mut wasm_trap_t,
++    trap_ret: &mut *mut wasmtime_wasm_trap_t,
+     err_ret: &mut *mut wasmtime_error_t,
+ ) {
+     let result = linker.linker.instantiate_async(store, &module.module).await;
+@@ -314,7 +314,7 @@ pub extern "C" fn wasmtime_linker_instantiate_async<'a>(
+     store: WasmtimeStoreContextMut<'a>,
+     module: &'a wasmtime_module_t,
+     instance_ptr: &'a mut Instance,
+-    trap_ret: &'a mut *mut wasm_trap_t,
++    trap_ret: &'a mut *mut wasmtime_wasm_trap_t,
+     err_ret: &'a mut *mut wasmtime_error_t,
+ ) -> Box<crate::wasmtime_call_future_t<'a>> {
+     let fut = Box::pin(do_linker_instantiate_async(
+@@ -332,7 +332,7 @@ async fn do_instance_pre_instantiate_async(
+     instance_pre: &wasmtime_instance_pre_t,
+     store: WasmtimeStoreContextMut<'_>,
+     instance_ptr: &mut Instance,
+-    trap_ret: &mut *mut wasm_trap_t,
++    trap_ret: &mut *mut wasmtime_wasm_trap_t,
+     err_ret: &mut *mut wasmtime_error_t,
+ ) {
+     let result = instance_pre.underlying.instantiate_async(store).await;
+@@ -347,7 +347,7 @@ pub extern "C" fn wasmtime_instance_pre_instantiate_async<'a>(
+     instance_pre: &'a wasmtime_instance_pre_t,
+     store: WasmtimeStoreContextMut<'a>,
+     instance_ptr: &'a mut Instance,
+-    trap_ret: &'a mut *mut wasm_trap_t,
++    trap_ret: &'a mut *mut wasmtime_wasm_trap_t,
+     err_ret: &'a mut *mut wasmtime_error_t,
+ ) -> Box<crate::wasmtime_call_future_t<'a>> {
+     let fut = Box::pin(do_instance_pre_instantiate_async(
+@@ -437,7 +437,7 @@ unsafe impl StackCreator for CHostStackCreator {
+ 
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_config_host_stack_creator_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     creator: &wasmtime_stack_creator_t,
+ ) {
+     c.config.with_host_stack(Arc::new(CHostStackCreator {
+diff --git a/crates/c-api/src/config.rs b/crates/c-api/src/config.rs
+index 75d8cd5d9d..71d21438f0 100644
+--- a/crates/c-api/src/config.rs
++++ b/crates/c-api/src/config.rs
+@@ -2,7 +2,7 @@
+ // them with the default set of features enabled.
+ #![cfg_attr(not(feature = "cache"), allow(unused_imports))]
+ 
+-use crate::{handle_result, wasm_memorytype_t, wasmtime_error_t};
++use crate::{handle_result, wasmtime_wasm_memorytype_t, wasmtime_error_t};
+ use std::ops::Range;
+ use std::os::raw::c_char;
+ use std::ptr;
+@@ -13,11 +13,11 @@ use wasmtime::{
+ 
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_config_t {
++pub struct wasmtime_wasm_config_t {
+     pub(crate) config: Config,
+ }
+ 
+-wasmtime_c_api_macros::declare_own!(wasm_config_t);
++wasmtime_c_api_macros::declare_own!(wasmtime_wasm_config_t);
+ 
+ #[repr(u8)]
+ #[derive(Clone)]
+@@ -44,103 +44,103 @@ pub enum wasmtime_profiling_strategy_t {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_config_new() -> Box<wasm_config_t> {
+-    Box::new(wasm_config_t {
++pub extern "C" fn wasmtime_wasm_config_new() -> Box<wasmtime_wasm_config_t> {
++    Box::new(wasmtime_wasm_config_t {
+         config: Config::default(),
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_debug_info_set(c: &mut wasm_config_t, enable: bool) {
++pub extern "C" fn wasmtime_config_debug_info_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
+     c.config.debug_info(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_consume_fuel_set(c: &mut wasm_config_t, enable: bool) {
++pub extern "C" fn wasmtime_config_consume_fuel_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
+     c.config.consume_fuel(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_epoch_interruption_set(c: &mut wasm_config_t, enable: bool) {
++pub extern "C" fn wasmtime_config_epoch_interruption_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
+     c.config.epoch_interruption(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_max_wasm_stack_set(c: &mut wasm_config_t, size: usize) {
++pub extern "C" fn wasmtime_config_max_wasm_stack_set(c: &mut wasmtime_wasm_config_t, size: usize) {
+     c.config.max_wasm_stack(size);
+ }
+ 
+ #[no_mangle]
+ #[cfg(feature = "threads")]
+-pub extern "C" fn wasmtime_config_wasm_threads_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_threads(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_threads_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_threads(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_tail_call_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_tail_call(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_tail_call_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_tail_call(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_reference_types_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_reference_types(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_reference_types_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_reference_types(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_function_references_set(
+-    c: &mut wasm_config_t,
++pub extern "C" fn wasmtime_config_wasmtime_wasm_function_references_set(
++    c: &mut wasmtime_wasm_config_t,
+     enable: bool,
+ ) {
+-    c.config.wasm_function_references(enable);
++    c.config.wasmtime_wasm_function_references(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_gc_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_gc(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_gc_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_gc(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_simd_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_simd(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_simd_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_simd(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_relaxed_simd_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_relaxed_simd(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_relaxed_simd_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_relaxed_simd(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_relaxed_simd_deterministic_set(
+-    c: &mut wasm_config_t,
++pub extern "C" fn wasmtime_config_wasmtime_wasm_relaxed_simd_deterministic_set(
++    c: &mut wasmtime_wasm_config_t,
+     enable: bool,
+ ) {
+     c.config.relaxed_simd_deterministic(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_bulk_memory_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_bulk_memory(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_bulk_memory_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_bulk_memory(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_multi_value_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_multi_value(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_multi_value_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_multi_value(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_multi_memory_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_multi_memory(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_multi_memory_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_multi_memory(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_wasm_memory64_set(c: &mut wasm_config_t, enable: bool) {
+-    c.config.wasm_memory64(enable);
++pub extern "C" fn wasmtime_config_wasmtime_wasm_memory64_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
++    c.config.wasmtime_wasm_memory64(enable);
+ }
+ 
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub extern "C" fn wasmtime_config_strategy_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     strategy: wasmtime_strategy_t,
+ ) {
+     use wasmtime_strategy_t::*;
+@@ -152,14 +152,14 @@ pub extern "C" fn wasmtime_config_strategy_set(
+ 
+ #[no_mangle]
+ #[cfg(feature = "parallel-compilation")]
+-pub extern "C" fn wasmtime_config_parallel_compilation_set(c: &mut wasm_config_t, enable: bool) {
++pub extern "C" fn wasmtime_config_parallel_compilation_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
+     c.config.parallel_compilation(enable);
+ }
+ 
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub extern "C" fn wasmtime_config_cranelift_debug_verifier_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     enable: bool,
+ ) {
+     c.config.cranelift_debug_verifier(enable);
+@@ -168,7 +168,7 @@ pub extern "C" fn wasmtime_config_cranelift_debug_verifier_set(
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub extern "C" fn wasmtime_config_cranelift_nan_canonicalization_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     enable: bool,
+ ) {
+     c.config.cranelift_nan_canonicalization(enable);
+@@ -177,7 +177,7 @@ pub extern "C" fn wasmtime_config_cranelift_nan_canonicalization_set(
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub extern "C" fn wasmtime_config_cranelift_opt_level_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     opt_level: wasmtime_opt_level_t,
+ ) {
+     use wasmtime_opt_level_t::*;
+@@ -190,7 +190,7 @@ pub extern "C" fn wasmtime_config_cranelift_opt_level_set(
+ 
+ #[no_mangle]
+ pub extern "C" fn wasmtime_config_profiler_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     strategy: wasmtime_profiling_strategy_t,
+ ) {
+     use wasmtime_profiling_strategy_t::*;
+@@ -205,7 +205,7 @@ pub extern "C" fn wasmtime_config_profiler_set(
+ #[no_mangle]
+ #[cfg(feature = "cache")]
+ pub unsafe extern "C" fn wasmtime_config_cache_config_load(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     filename: *const c_char,
+ ) -> Option<Box<wasmtime_error_t>> {
+     handle_result(
+@@ -222,42 +222,42 @@ pub unsafe extern "C" fn wasmtime_config_cache_config_load(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_static_memory_forced_set(c: &mut wasm_config_t, enable: bool) {
++pub extern "C" fn wasmtime_config_static_memory_forced_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
+     c.config.static_memory_forced(enable);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_static_memory_maximum_size_set(c: &mut wasm_config_t, size: u64) {
++pub extern "C" fn wasmtime_config_static_memory_maximum_size_set(c: &mut wasmtime_wasm_config_t, size: u64) {
+     c.config.static_memory_maximum_size(size);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_static_memory_guard_size_set(c: &mut wasm_config_t, size: u64) {
++pub extern "C" fn wasmtime_config_static_memory_guard_size_set(c: &mut wasmtime_wasm_config_t, size: u64) {
+     c.config.static_memory_guard_size(size);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_dynamic_memory_guard_size_set(c: &mut wasm_config_t, size: u64) {
++pub extern "C" fn wasmtime_config_dynamic_memory_guard_size_set(c: &mut wasmtime_wasm_config_t, size: u64) {
+     c.config.dynamic_memory_guard_size(size);
+ }
+ 
+ #[no_mangle]
+ pub extern "C" fn wasmtime_config_dynamic_memory_reserved_for_growth_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     size: u64,
+ ) {
+     c.config.dynamic_memory_reserved_for_growth(size);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_native_unwind_info_set(c: &mut wasm_config_t, enabled: bool) {
++pub extern "C" fn wasmtime_config_native_unwind_info_set(c: &mut wasmtime_wasm_config_t, enabled: bool) {
+     c.config.native_unwind_info(enabled);
+ }
+ 
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub unsafe extern "C" fn wasmtime_config_target_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     target: *const c_char,
+ ) -> Option<Box<wasmtime_error_t>> {
+     let target = CStr::from_ptr(target).to_str().expect("not valid utf-8");
+@@ -265,14 +265,14 @@ pub unsafe extern "C" fn wasmtime_config_target_set(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_macos_use_mach_ports_set(c: &mut wasm_config_t, enabled: bool) {
++pub extern "C" fn wasmtime_config_macos_use_mach_ports_set(c: &mut wasmtime_wasm_config_t, enabled: bool) {
+     c.config.macos_use_mach_ports(enabled);
+ }
+ 
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub unsafe extern "C" fn wasmtime_config_cranelift_flag_enable(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     flag: *const c_char,
+ ) {
+     let flag = CStr::from_ptr(flag).to_str().expect("not valid utf-8");
+@@ -282,7 +282,7 @@ pub unsafe extern "C" fn wasmtime_config_cranelift_flag_enable(
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub unsafe extern "C" fn wasmtime_config_cranelift_flag_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     flag: *const c_char,
+     value: *const c_char,
+ ) {
+@@ -310,7 +310,7 @@ pub struct wasmtime_linear_memory_t {
+ 
+ pub type wasmtime_new_memory_callback_t = extern "C" fn(
+     env: *mut std::ffi::c_void,
+-    ty: &wasm_memorytype_t,
++    ty: &wasmtime_wasm_memorytype_t,
+     minimum: usize,
+     maximum: usize,
+     reserved_size_in_bytes: usize,
+@@ -349,7 +349,7 @@ unsafe impl LinearMemory for CHostLinearMemory {
+         let cb = self.get_memory;
+         cb(self.foreign.data, &mut byte_size, &mut maximum_byte_size)
+     }
+-    fn wasm_accessible(&self) -> Range<usize> {
++    fn wasmtime_wasm_accessible(&self) -> Range<usize> {
+         let mut byte_size = 0;
+         let mut maximum_byte_size = 0;
+         let cb = self.get_memory;
+@@ -415,7 +415,7 @@ unsafe impl MemoryCreator for CHostMemoryCreator {
+         let cb = self.new_memory;
+         let error = cb(
+             self.foreign.data,
+-            &wasm_memorytype_t::new(ty),
++            &wasmtime_wasm_memorytype_t::new(ty),
+             minimum,
+             maximum.unwrap_or(usize::MAX),
+             reserved_size_in_bytes.unwrap_or(0),
+@@ -444,7 +444,7 @@ unsafe impl MemoryCreator for CHostMemoryCreator {
+ 
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_config_host_memory_creator_set(
+-    c: &mut wasm_config_t,
++    c: &mut wasmtime_wasm_config_t,
+     creator: &wasmtime_memory_creator_t,
+ ) {
+     c.config.with_host_memory(Arc::new(CHostMemoryCreator {
+@@ -457,6 +457,6 @@ pub unsafe extern "C" fn wasmtime_config_host_memory_creator_set(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_config_memory_init_cow_set(c: &mut wasm_config_t, enable: bool) {
++pub extern "C" fn wasmtime_config_memory_init_cow_set(c: &mut wasmtime_wasm_config_t, enable: bool) {
+     c.config.memory_init_cow(enable);
+ }
+diff --git a/crates/c-api/src/engine.rs b/crates/c-api/src/engine.rs
+index e8cea19e75..c1105cff57 100644
+--- a/crates/c-api/src/engine.rs
++++ b/crates/c-api/src/engine.rs
+@@ -3,14 +3,14 @@ use wasmtime::Engine;
+ 
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_engine_t {
++pub struct wasmtime_wasm_engine_t {
+     pub(crate) engine: Engine,
+ }
+ 
+-wasmtime_c_api_macros::declare_own!(wasm_engine_t);
++wasmtime_c_api_macros::declare_own!(wasmtime_wasm_engine_t);
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
++pub extern "C" fn wasmtime_wasm_engine_new() -> Box<wasmtime_wasm_engine_t> {
+     // Enable the `env_logger` crate since this is as good a place as any to
+     // support some "top level initialization" for the C API. Almost all support
+     // should go through this one way or another, so this ensures that
+@@ -22,28 +22,28 @@ pub extern "C" fn wasm_engine_new() -> Box<wasm_engine_t> {
+     #[cfg(feature = "logging")]
+     drop(env_logger::try_init());
+ 
+-    Box::new(wasm_engine_t {
++    Box::new(wasmtime_wasm_engine_t {
+         engine: Engine::default(),
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_engine_new_with_config(c: Box<wasm_config_t>) -> Box<wasm_engine_t> {
++pub extern "C" fn wasmtime_wasm_engine_new_with_config(c: Box<wasmtime_wasm_config_t>) -> Box<wasmtime_wasm_engine_t> {
+     #[cfg(feature = "logging")]
+     drop(env_logger::try_init());
+ 
+     let config = c.config;
+-    Box::new(wasm_engine_t {
++    Box::new(wasmtime_wasm_engine_t {
+         engine: Engine::new(&config).unwrap(),
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_engine_clone(engine: &wasm_engine_t) -> Box<wasm_engine_t> {
++pub extern "C" fn wasmtime_engine_clone(engine: &wasmtime_wasm_engine_t) -> Box<wasmtime_wasm_engine_t> {
+     Box::new(engine.clone())
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_engine_increment_epoch(engine: &wasm_engine_t) {
++pub extern "C" fn wasmtime_engine_increment_epoch(engine: &wasmtime_wasm_engine_t) {
+     engine.engine.increment_epoch();
+ }
+diff --git a/crates/c-api/src/error.rs b/crates/c-api/src/error.rs
+index 0c9dde8790..3193af1934 100644
+--- a/crates/c-api/src/error.rs
++++ b/crates/c-api/src/error.rs
+@@ -1,4 +1,4 @@
+-use crate::{wasm_frame_vec_t, wasm_name_t};
++use crate::{wasm_frame_vec_t, wasmtime_wasm_name_t};
+ use anyhow::{anyhow, Error, Result};
+ 
+ #[repr(C)]
+@@ -49,7 +49,7 @@ pub(crate) fn bad_utf8() -> Option<Box<wasmtime_error_t>> {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_error_message(error: &wasmtime_error_t, message: &mut wasm_name_t) {
++pub extern "C" fn wasmtime_error_message(error: &wasmtime_error_t, message: &mut wasmtime_wasm_name_t) {
+     message.set_buffer(format!("{:?}", error.error).into_bytes());
+ }
+ 
+@@ -70,7 +70,7 @@ pub extern "C" fn wasmtime_error_exit_status(raw: &wasmtime_error_t, status: &mu
+ #[no_mangle]
+ pub extern "C" fn wasmtime_error_wasm_trace<'a>(
+     raw: &'a wasmtime_error_t,
+-    out: &mut wasm_frame_vec_t<'a>,
++    out: &mut wasmtime_wasm_frame_vec_t<'a>,
+ ) {
+     crate::trap::error_trace(&raw.error, out)
+ }
+diff --git a/crates/c-api/src/extern.rs b/crates/c-api/src/extern.rs
+index 8d40e7a262..75259187dd 100644
+--- a/crates/c-api/src/extern.rs
++++ b/crates/c-api/src/extern.rs
+@@ -1,20 +1,20 @@
+ use crate::{
+-    wasm_externkind_t, wasm_externtype_t, wasm_func_t, wasm_global_t, wasm_memory_t, wasm_table_t,
++    wasmtime_wasm_externkind_t, wasmtime_wasm_externtype_t, wasmtime_wasm_func_t, wasmtime_wasm_global_t, wasmtime_wasm_memory_t, wasmtime_wasm_table_t,
+     WasmStoreRef, WasmtimeStoreContext,
+ };
+ use std::mem::ManuallyDrop;
+ use wasmtime::{Extern, Func, Global, Memory, SharedMemory, Table};
+ 
+ #[derive(Clone)]
+-pub struct wasm_extern_t {
++pub struct wasmtime_wasm_extern_t {
+     pub(crate) store: WasmStoreRef,
+     pub(crate) which: Extern,
+ }
+ 
+-wasmtime_c_api_macros::declare_ref!(wasm_extern_t);
++wasmtime_c_api_macros::declare_ref!(wasmtime_wasm_extern_t);
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_extern_kind(e: &wasm_extern_t) -> wasm_externkind_t {
++pub extern "C" fn wasmtime_wasm_extern_kind(e: &wasmtime_wasm_extern_t) -> wasmtime_wasm_externkind_t {
+     match e.which {
+         Extern::Func(_) => crate::WASM_EXTERN_FUNC,
+         Extern::Global(_) => crate::WASM_EXTERN_GLOBAL,
+@@ -25,50 +25,50 @@ pub extern "C" fn wasm_extern_kind(e: &wasm_extern_t) -> wasm_externkind_t {
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_extern_type(e: &wasm_extern_t) -> Box<wasm_externtype_t> {
+-    Box::new(wasm_externtype_t::from_extern_type(
++pub unsafe extern "C" fn wasmtime_wasm_extern_type(e: &wasmtime_wasm_extern_t) -> Box<wasmtime_wasm_externtype_t> {
++    Box::new(wasmtime_wasm_externtype_t::from_extern_type(
+         e.which.ty(&e.store.context()),
+     ))
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_extern_as_func(e: &wasm_extern_t) -> Option<&wasm_func_t> {
+-    wasm_func_t::try_from(e)
++pub extern "C" fn wasmtime_wasm_extern_as_func(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_func_t> {
++    wasmtime_wasm_func_t::try_from(e)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_extern_as_func_const(e: &wasm_extern_t) -> Option<&wasm_func_t> {
+-    wasm_extern_as_func(e)
++pub extern "C" fn wasmtime_wasm_extern_as_func_const(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_func_t> {
++    wasmtime_wasm_extern_as_func(e)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_extern_as_global(e: &wasm_extern_t) -> Option<&wasm_global_t> {
+-    wasm_global_t::try_from(e)
++pub extern "C" fn wasmtime_wasm_extern_as_global(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_global_t> {
++    wasmtime_wasm_global_t::try_from(e)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_extern_as_global_const(e: &wasm_extern_t) -> Option<&wasm_global_t> {
+-    wasm_extern_as_global(e)
++pub extern "C" fn wasmtime_wasm_extern_as_global_const(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_global_t> {
++    wasmtime_wasm_extern_as_global(e)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_extern_as_table(e: &wasm_extern_t) -> Option<&wasm_table_t> {
+-    wasm_table_t::try_from(e)
++pub extern "C" fn wasmtime_wasm_extern_as_table(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_table_t> {
++    wasmtime_wasm_table_t::try_from(e)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_extern_as_table_const(e: &wasm_extern_t) -> Option<&wasm_table_t> {
+-    wasm_extern_as_table(e)
++pub extern "C" fn wasmtime_wasm_extern_as_table_const(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_table_t> {
++    wasmtime_wasm_extern_as_table(e)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_extern_as_memory(e: &wasm_extern_t) -> Option<&wasm_memory_t> {
+-    wasm_memory_t::try_from(e)
++pub extern "C" fn wasmtime_wasm_extern_as_memory(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_memory_t> {
++    wasmtime_wasm_memory_t::try_from(e)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_extern_as_memory_const(e: &wasm_extern_t) -> Option<&wasm_memory_t> {
+-    wasm_extern_as_memory(e)
++pub extern "C" fn wasmtime_wasm_extern_as_memory_const(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_memory_t> {
++    wasmtime_wasm_extern_as_memory(e)
+ }
+ 
+ #[repr(C)]
+@@ -154,6 +154,6 @@ pub unsafe extern "C" fn wasmtime_extern_delete(e: &mut ManuallyDrop<wasmtime_ex
+ pub unsafe extern "C" fn wasmtime_extern_type(
+     store: WasmtimeStoreContext<'_>,
+     e: &wasmtime_extern_t,
+-) -> Box<wasm_externtype_t> {
+-    Box::new(wasm_externtype_t::from_extern_type(e.to_extern().ty(store)))
++) -> Box<wasmtime_wasm_externtype_t> {
++    Box::new(wasmtime_wasm_externtype_t::from_extern_type(e.to_extern().ty(store)))
+ }
+diff --git a/crates/c-api/src/func.rs b/crates/c-api/src/func.rs
+index 0e85ee9b90..b5e97b9576 100644
+--- a/crates/c-api/src/func.rs
++++ b/crates/c-api/src/func.rs
+@@ -1,5 +1,5 @@
+ use crate::{
+-    wasm_extern_t, wasm_functype_t, wasm_store_t, wasm_val_t, wasm_val_vec_t, wasmtime_error_t,
++    wasmtime_wasm_extern_t, wasmtime_wasm_functype_t, wasmtime_wasm_store_t, wasmtime_wasm_val_t, wasmtime_wasm_val_vec_t, wasmtime_error_t,
+     wasmtime_extern_t, wasmtime_val_t, wasmtime_val_union, WasmtimeStoreContext,
+     WasmtimeStoreContextMut,
+ };
+@@ -18,25 +18,25 @@ use wasmtime::{
+ 
+ #[derive(Clone)]
+ #[repr(transparent)]
+-pub struct wasm_func_t {
+-    ext: wasm_extern_t,
++pub struct wasmtime_wasm_func_t {
++    ext: wasmtime_wasm_extern_t,
+ }
+ 
+-wasmtime_c_api_macros::declare_ref!(wasm_func_t);
++wasmtime_c_api_macros::declare_ref!(wasmtime_wasm_func_t);
+ 
+-pub type wasm_func_callback_t = extern "C" fn(
+-    args: *const wasm_val_vec_t,
+-    results: *mut wasm_val_vec_t,
+-) -> Option<Box<wasm_trap_t>>;
++pub type wasmtime_wasm_func_callback_t = extern "C" fn(
++    args: *const wasmtime_wasm_val_vec_t,
++    results: *mut wasmtime_wasm_val_vec_t,
++) -> Option<Box<wasmtime_wasm_trap_t>>;
+ 
+-pub type wasm_func_callback_with_env_t = extern "C" fn(
++pub type wasmtime_wasm_func_callback_with_env_t = extern "C" fn(
+     env: *mut std::ffi::c_void,
+-    args: *const wasm_val_vec_t,
+-    results: *mut wasm_val_vec_t,
+-) -> Option<Box<wasm_trap_t>>;
++    args: *const wasmtime_wasm_val_vec_t,
++    results: *mut wasmtime_wasm_val_vec_t,
++) -> Option<Box<wasmtime_wasm_trap_t>>;
+ 
+-impl wasm_func_t {
+-    pub(crate) fn try_from(e: &wasm_extern_t) -> Option<&wasm_func_t> {
++impl wasmtime_wasm_func_t {
++    pub(crate) fn try_from(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_func_t> {
+         match &e.which {
+             Extern::Func(_) => Some(unsafe { &*(e as *const _ as *const _) }),
+             _ => None,
+@@ -52,25 +52,25 @@ impl wasm_func_t {
+ }
+ 
+ unsafe fn create_function(
+-    store: &mut wasm_store_t,
+-    ty: &wasm_functype_t,
+-    func: impl Fn(*const wasm_val_vec_t, *mut wasm_val_vec_t) -> Option<Box<wasm_trap_t>>
++    store: &mut wasmtime_wasm_store_t,
++    ty: &wasmtime_wasm_functype_t,
++    func: impl Fn(*const wasmtime_wasm_val_vec_t, *mut wasmtime_wasm_val_vec_t) -> Option<Box<wasmtime_wasm_trap_t>>
+         + Send
+         + Sync
+         + 'static,
+-) -> Box<wasm_func_t> {
++) -> Box<wasmtime_wasm_func_t> {
+     let ty = ty.ty().ty(store.store.context().engine());
+     let func = Func::new(
+         store.store.context_mut(),
+         ty,
+         move |_caller, params, results| {
+-            let params: wasm_val_vec_t = params
++            let params: wasmtime_wasm_val_vec_t = params
+                 .iter()
+                 .cloned()
+-                .map(|p| wasm_val_t::from_val(p))
++                .map(|p| wasmtime_wasm_val_t::from_val(p))
+                 .collect::<Vec<_>>()
+                 .into();
+-            let mut out_results: wasm_val_vec_t = vec![wasm_val_t::default(); results.len()].into();
++            let mut out_results: wasmtime_wasm_val_vec_t = vec![wasmtime_wasm_val_t::default(); results.len()].into();
+             let out = func(&params, &mut out_results);
+             if let Some(trap) = out {
+                 return Err(trap.error);
+@@ -83,8 +83,8 @@ unsafe fn create_function(
+             Ok(())
+         },
+     );
+-    Box::new(wasm_func_t {
+-        ext: wasm_extern_t {
++    Box::new(wasmtime_wasm_func_t {
++        ext: wasmtime_wasm_extern_t {
+             store: store.store.clone(),
+             which: func.into(),
+         },
+@@ -92,22 +92,22 @@ unsafe fn create_function(
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_func_new(
+-    store: &mut wasm_store_t,
+-    ty: &wasm_functype_t,
+-    callback: wasm_func_callback_t,
+-) -> Box<wasm_func_t> {
++pub unsafe extern "C" fn wasmtime_wasm_func_new(
++    store: &mut wasmtime_wasm_store_t,
++    ty: &wasmtime_wasm_functype_t,
++    callback: wasmtime_wasm_func_callback_t,
++) -> Box<wasmtime_wasm_func_t> {
+     create_function(store, ty, move |params, results| callback(params, results))
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_func_new_with_env(
+-    store: &mut wasm_store_t,
+-    ty: &wasm_functype_t,
+-    callback: wasm_func_callback_with_env_t,
++pub unsafe extern "C" fn wasmtime_wasm_func_new_with_env(
++    store: &mut wasmtime_wasm_store_t,
++    ty: &wasmtime_wasm_functype_t,
++    callback: wasmtime_wasm_func_callback_with_env_t,
+     data: *mut c_void,
+     finalizer: Option<extern "C" fn(arg1: *mut std::ffi::c_void)>,
+-) -> Box<wasm_func_t> {
++) -> Box<wasmtime_wasm_func_t> {
+     let finalizer = crate::ForeignData { data, finalizer };
+     create_function(store, ty, move |params, results| {
+         let _ = &finalizer; // move entire finalizer into this closure
+@@ -132,11 +132,11 @@ pub(crate) fn translate_args<'a>(
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_func_call(
+-    func: &mut wasm_func_t,
+-    args: *const wasm_val_vec_t,
+-    results: *mut wasm_val_vec_t,
+-) -> *mut wasm_trap_t {
++pub unsafe extern "C" fn wasmtime_wasm_func_call(
++    func: &mut wasmtime_wasm_func_t,
++    args: *const wasmtime_wasm_val_vec_t,
++    results: *mut wasmtime_wasm_val_vec_t,
++) -> *mut wasmtime_wasm_trap_t {
+     let f = func.func();
+     let results = (*results).as_uninit_slice();
+     let args = (*args).as_slice();
+@@ -154,14 +154,14 @@ pub unsafe extern "C" fn wasm_func_call(
+     match result {
+         Ok(Ok(())) => {
+             for (slot, val) in results.iter_mut().zip(wt_results.iter().cloned()) {
+-                crate::initialize(slot, wasm_val_t::from_val(val));
++                crate::initialize(slot, wasmtime_wasm_val_t::from_val(val));
+             }
+             ptr::null_mut()
+         }
+-        Ok(Err(err)) => Box::into_raw(Box::new(wasm_trap_t::new(err))),
++        Ok(Err(err)) => Box::into_raw(Box::new(wasmtime_wasm_trap_t::new(err))),
+         Err(panic) => {
+             let err = error_from_panic(panic);
+-            let trap = Box::new(wasm_trap_t::new(err));
++            let trap = Box::new(wasmtime_wasm_trap_t::new(err));
+             Box::into_raw(trap)
+         }
+     }
+@@ -178,27 +178,27 @@ fn error_from_panic(panic: Box<dyn Any + Send>) -> Error {
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_func_type(f: &wasm_func_t) -> Box<wasm_functype_t> {
+-    Box::new(wasm_functype_t::new(f.func().ty(f.ext.store.context())))
++pub unsafe extern "C" fn wasmtime_wasm_func_type(f: &wasmtime_wasm_func_t) -> Box<wasmtime_wasm_functype_t> {
++    Box::new(wasmtime_wasm_functype_t::new(f.func().ty(f.ext.store.context())))
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_func_param_arity(f: &wasm_func_t) -> usize {
++pub unsafe extern "C" fn wasmtime_wasm_func_param_arity(f: &wasmtime_wasm_func_t) -> usize {
+     f.func().ty(f.ext.store.context()).params().len()
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_func_result_arity(f: &wasm_func_t) -> usize {
++pub unsafe extern "C" fn wasmtime_wasm_func_result_arity(f: &wasmtime_wasm_func_t) -> usize {
+     f.func().ty(f.ext.store.context()).results().len()
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_func_as_extern(f: &mut wasm_func_t) -> &mut wasm_extern_t {
++pub extern "C" fn wasmtime_wasm_func_as_extern(f: &mut wasmtime_wasm_func_t) -> &mut wasmtime_wasm_extern_t {
+     &mut (*f).ext
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_func_as_extern_const(f: &wasm_func_t) -> &wasm_extern_t {
++pub extern "C" fn wasmtime_wasm_func_as_extern_const(f: &wasmtime_wasm_func_t) -> &wasmtime_wasm_extern_t {
+     &(*f).ext
+ }
+ 
+@@ -228,19 +228,19 @@ pub type wasmtime_func_callback_t = extern "C" fn(
+     usize,
+     *mut wasmtime_val_t,
+     usize,
+-) -> Option<Box<wasm_trap_t>>;
++) -> Option<Box<wasmtime_wasm_trap_t>>;
+ 
+ pub type wasmtime_func_unchecked_callback_t = extern "C" fn(
+     *mut c_void,
+     *mut wasmtime_caller_t,
+     *mut ValRaw,
+     usize,
+-) -> Option<Box<wasm_trap_t>>;
++) -> Option<Box<wasmtime_wasm_trap_t>>;
+ 
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_func_new(
+     store: WasmtimeStoreContextMut<'_>,
+-    ty: &wasm_functype_t,
++    ty: &wasmtime_wasm_functype_t,
+     callback: wasmtime_func_callback_t,
+     data: *mut c_void,
+     finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
+@@ -310,7 +310,7 @@ pub(crate) unsafe fn c_callback_to_rust_fn(
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_func_new_unchecked(
+     store: WasmtimeStoreContextMut<'_>,
+-    ty: &wasm_functype_t,
++    ty: &wasmtime_wasm_functype_t,
+     callback: wasmtime_func_unchecked_callback_t,
+     data: *mut c_void,
+     finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
+@@ -345,10 +345,10 @@ pub unsafe extern "C" fn wasmtime_func_call(
+     nargs: usize,
+     results: *mut MaybeUninit<wasmtime_val_t>,
+     nresults: usize,
+-    trap_ret: &mut *mut wasm_trap_t,
++    trap_ret: &mut *mut wasmtime_wasm_trap_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     let mut scope = RootScope::new(&mut store);
+-    let mut params = mem::take(&mut scope.as_context_mut().data_mut().wasm_val_storage);
++    let mut params = mem::take(&mut scope.as_context_mut().data_mut().wasmtime_wasm_val_storage);
+     let (wt_params, wt_results) = translate_args(
+         &mut params,
+         crate::slice_from_raw_parts(args, nargs)
+@@ -371,13 +371,13 @@ pub unsafe extern "C" fn wasmtime_func_call(
+                 crate::initialize(slot, wasmtime_val_t::from_val(&mut scope, *val));
+             }
+             params.truncate(0);
+-            scope.as_context_mut().data_mut().wasm_val_storage = params;
++            scope.as_context_mut().data_mut().wasmtime_wasm_val_storage = params;
+             None
+         }
+         Ok(Err(trap)) => store_err(trap, trap_ret),
+         Err(panic) => {
+             let err = error_from_panic(panic);
+-            *trap_ret = Box::into_raw(Box::new(wasm_trap_t::new(err)));
++            *trap_ret = Box::into_raw(Box::new(wasmtime_wasm_trap_t::new(err)));
+             None
+         }
+     }
+@@ -389,7 +389,7 @@ pub unsafe extern "C" fn wasmtime_func_call_unchecked(
+     func: &Func,
+     args_and_results: *mut ValRaw,
+     args_and_results_len: usize,
+-    trap_ret: &mut *mut wasm_trap_t,
++    trap_ret: &mut *mut wasmtime_wasm_trap_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     match func.call_unchecked(store, args_and_results, args_and_results_len) {
+         Ok(()) => None,
+@@ -397,9 +397,9 @@ pub unsafe extern "C" fn wasmtime_func_call_unchecked(
+     }
+ }
+ 
+-fn store_err(err: Error, trap_ret: &mut *mut wasm_trap_t) -> Option<Box<wasmtime_error_t>> {
++fn store_err(err: Error, trap_ret: &mut *mut wasmtime_wasm_trap_t) -> Option<Box<wasmtime_error_t>> {
+     if err.is::<Trap>() {
+-        *trap_ret = Box::into_raw(Box::new(wasm_trap_t::new(err)));
++        *trap_ret = Box::into_raw(Box::new(wasmtime_wasm_trap_t::new(err)));
+         None
+     } else {
+         Some(Box::new(wasmtime_error_t::from(err)))
+@@ -410,8 +410,8 @@ fn store_err(err: Error, trap_ret: &mut *mut wasm_trap_t) -> Option<Box<wasmtime
+ pub extern "C" fn wasmtime_func_type(
+     store: WasmtimeStoreContext<'_>,
+     func: &Func,
+-) -> Box<wasm_functype_t> {
+-    Box::new(wasm_functype_t::new(func.ty(store)))
++) -> Box<wasmtime_wasm_functype_t> {
++    Box::new(wasmtime_wasm_functype_t::new(func.ty(store)))
+ }
+ 
+ #[no_mangle]
+diff --git a/crates/c-api/src/global.rs b/crates/c-api/src/global.rs
+index 073dfd2172..d21dd707ec 100644
+--- a/crates/c-api/src/global.rs
++++ b/crates/c-api/src/global.rs
+@@ -1,5 +1,5 @@
+ use crate::{
+-    handle_result, wasm_extern_t, wasm_globaltype_t, wasm_store_t, wasm_val_t, wasmtime_error_t,
++    handle_result, wasmtime_wasm_extern_t, wasmtime_wasm_globaltype_t, wasmtime_wasm_store_t, wasmtime_wasm_val_t, wasmtime_error_t,
+     wasmtime_val_t, WasmtimeStoreContext, WasmtimeStoreContextMut,
+ };
+ use std::mem::MaybeUninit;
+@@ -7,14 +7,14 @@ use wasmtime::{Extern, Global, RootScope};
+ 
+ #[derive(Clone)]
+ #[repr(transparent)]
+-pub struct wasm_global_t {
+-    ext: wasm_extern_t,
++pub struct wasmtime_wasm_global_t {
++    ext: wasmtime_wasm_extern_t,
+ }
+ 
+-wasmtime_c_api_macros::declare_ref!(wasm_global_t);
++wasmtime_c_api_macros::declare_ref!(wasmtime_wasm_global_t);
+ 
+-impl wasm_global_t {
+-    pub(crate) fn try_from(e: &wasm_extern_t) -> Option<&wasm_global_t> {
++impl wasmtime_wasm_global_t {
++    pub(crate) fn try_from(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_global_t> {
+         match &e.which {
+             Extern::Global(_) => Some(unsafe { &*(e as *const _ as *const _) }),
+             _ => None,
+@@ -30,14 +30,14 @@ impl wasm_global_t {
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_global_new(
+-    store: &mut wasm_store_t,
+-    gt: &wasm_globaltype_t,
+-    val: &wasm_val_t,
+-) -> Option<Box<wasm_global_t>> {
++pub unsafe extern "C" fn wasmtime_wasm_global_new(
++    store: &mut wasmtime_wasm_store_t,
++    gt: &wasmtime_wasm_globaltype_t,
++    val: &wasmtime_wasm_val_t,
++) -> Option<Box<wasmtime_wasm_global_t>> {
+     match Global::new(store.store.context_mut(), gt.ty().ty.clone(), val.val()) {
+-        Ok(global) => Some(Box::new(wasm_global_t {
+-            ext: wasm_extern_t {
++        Ok(global) => Some(Box::new(wasmtime_wasm_global_t {
++            ext: wasmtime_wasm_extern_t {
+                 store: store.store.clone(),
+                 which: global.into(),
+             },
+@@ -47,32 +47,32 @@ pub unsafe extern "C" fn wasm_global_new(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_global_as_extern(g: &mut wasm_global_t) -> &mut wasm_extern_t {
++pub extern "C" fn wasmtime_wasm_global_as_extern(g: &mut wasmtime_wasm_global_t) -> &mut wasmtime_wasm_extern_t {
+     &mut g.ext
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_global_as_extern_const(g: &wasm_global_t) -> &wasm_extern_t {
++pub extern "C" fn wasmtime_wasm_global_as_extern_const(g: &wasmtime_wasm_global_t) -> &wasmtime_wasm_extern_t {
+     &g.ext
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_global_type(g: &wasm_global_t) -> Box<wasm_globaltype_t> {
++pub unsafe extern "C" fn wasmtime_wasm_global_type(g: &wasmtime_wasm_global_t) -> Box<wasmtime_wasm_globaltype_t> {
+     let globaltype = g.global().ty(&g.ext.store.context());
+-    Box::new(wasm_globaltype_t::new(globaltype))
++    Box::new(wasmtime_wasm_globaltype_t::new(globaltype))
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_global_get(g: &mut wasm_global_t, out: &mut MaybeUninit<wasm_val_t>) {
++pub unsafe extern "C" fn wasmtime_wasm_global_get(g: &mut wasmtime_wasm_global_t, out: &mut MaybeUninit<wasmtime_wasm_val_t>) {
+     let global = g.global();
+     crate::initialize(
+         out,
+-        wasm_val_t::from_val(global.get(g.ext.store.context_mut())),
++        wasmtime_wasm_val_t::from_val(global.get(g.ext.store.context_mut())),
+     );
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_global_set(g: &mut wasm_global_t, val: &wasm_val_t) {
++pub unsafe extern "C" fn wasmtime_wasm_global_set(g: &mut wasmtime_wasm_global_t, val: &wasmtime_wasm_val_t) {
+     let global = g.global();
+     drop(global.set(g.ext.store.context_mut(), val.val()));
+ }
+@@ -80,7 +80,7 @@ pub unsafe extern "C" fn wasm_global_set(g: &mut wasm_global_t, val: &wasm_val_t
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_global_new(
+     mut store: WasmtimeStoreContextMut<'_>,
+-    gt: &wasm_globaltype_t,
++    gt: &wasmtime_wasm_globaltype_t,
+     val: &wasmtime_val_t,
+     ret: &mut Global,
+ ) -> Option<Box<wasmtime_error_t>> {
+@@ -96,8 +96,8 @@ pub unsafe extern "C" fn wasmtime_global_new(
+ pub extern "C" fn wasmtime_global_type(
+     store: WasmtimeStoreContext<'_>,
+     global: &Global,
+-) -> Box<wasm_globaltype_t> {
+-    Box::new(wasm_globaltype_t::new(global.ty(store)))
++) -> Box<wasmtime_wasm_globaltype_t> {
++    Box::new(wasmtime_wasm_globaltype_t::new(global.ty(store)))
+ }
+ 
+ #[no_mangle]
+diff --git a/crates/c-api/src/instance.rs b/crates/c-api/src/instance.rs
+index f38d151d36..ac5b52b2d0 100644
+--- a/crates/c-api/src/instance.rs
++++ b/crates/c-api/src/instance.rs
+@@ -1,31 +1,31 @@
+ use crate::{
+-    wasm_extern_t, wasm_extern_vec_t, wasm_module_t, wasm_store_t, wasm_trap_t, wasmtime_error_t,
++    wasmtime_wasm_extern_t, wasmtime_wasm_extern_vec_t, wasmtime_wasm_module_t, wasmtime_wasm_store_t, wasmtime_wasm_trap_t, wasmtime_error_t,
+     wasmtime_extern_t, wasmtime_module_t, WasmStoreRef, WasmtimeStoreContextMut, WasmtimeStoreData,
+ };
+ use std::mem::MaybeUninit;
+ use wasmtime::{Instance, InstancePre, Trap};
+ 
+ #[derive(Clone)]
+-pub struct wasm_instance_t {
++pub struct wasmtime_wasm_instance_t {
+     store: WasmStoreRef,
+     instance: Instance,
+ }
+ 
+-wasmtime_c_api_macros::declare_ref!(wasm_instance_t);
++wasmtime_c_api_macros::declare_ref!(wasmtime_wasm_instance_t);
+ 
+-impl wasm_instance_t {
+-    pub(crate) fn new(store: WasmStoreRef, instance: Instance) -> wasm_instance_t {
+-        wasm_instance_t { store, instance }
++impl wasmtime_wasm_instance_t {
++    pub(crate) fn new(store: WasmStoreRef, instance: Instance) -> wasmtime_wasm_instance_t {
++        wasmtime_wasm_instance_t { store, instance }
+     }
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_instance_new(
+-    store: &mut wasm_store_t,
+-    wasm_module: &wasm_module_t,
+-    imports: *const wasm_extern_vec_t,
+-    result: Option<&mut *mut wasm_trap_t>,
+-) -> Option<Box<wasm_instance_t>> {
++pub unsafe extern "C" fn wasmtime_wasm_instance_new(
++    store: &mut wasmtime_wasm_store_t,
++    wasmtime_wasm_module: &wasmtime_wasm_module_t,
++    imports: *const wasmtime_wasm_extern_vec_t,
++    result: Option<&mut *mut wasmtime_wasm_trap_t>,
++) -> Option<Box<wasmtime_wasm_instance_t>> {
+     let imports = (*imports)
+         .as_slice()
+         .iter()
+@@ -34,14 +34,14 @@ pub unsafe extern "C" fn wasm_instance_new(
+             None => None,
+         })
+         .collect::<Vec<_>>();
+-    match Instance::new(store.store.context_mut(), &wasm_module.module, &imports) {
+-        Ok(instance) => Some(Box::new(wasm_instance_t::new(
++    match Instance::new(store.store.context_mut(), &wasmtime_wasm_module.module, &imports) {
++        Ok(instance) => Some(Box::new(wasmtime_wasm_instance_t::new(
+             store.store.clone(),
+             instance,
+         ))),
+         Err(e) => {
+             if let Some(ptr) = result {
+-                *ptr = Box::into_raw(Box::new(wasm_trap_t::new(e)));
++                *ptr = Box::into_raw(Box::new(wasmtime_wasm_trap_t::new(e)));
+             }
+             None
+         }
+@@ -49,9 +49,9 @@ pub unsafe extern "C" fn wasm_instance_new(
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_instance_exports(
+-    instance: &mut wasm_instance_t,
+-    out: &mut wasm_extern_vec_t,
++pub unsafe extern "C" fn wasmtime_wasm_instance_exports(
++    instance: &mut wasmtime_wasm_instance_t,
++    out: &mut wasmtime_wasm_extern_vec_t,
+ ) {
+     let store = instance.store.clone();
+     out.set_buffer(
+@@ -59,7 +59,7 @@ pub unsafe extern "C" fn wasm_instance_exports(
+             .instance
+             .exports(instance.store.context_mut())
+             .map(|e| {
+-                Some(Box::new(wasm_extern_t {
++                Some(Box::new(wasmtime_wasm_extern_t {
+                     which: e.into_extern(),
+                     store: store.clone(),
+                 }))
+@@ -75,7 +75,7 @@ pub unsafe extern "C" fn wasmtime_instance_new(
+     imports: *const wasmtime_extern_t,
+     nimports: usize,
+     instance: &mut Instance,
+-    trap_ptr: &mut *mut wasm_trap_t,
++    trap_ptr: &mut *mut wasmtime_wasm_trap_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     let imports = crate::slice_from_raw_parts(imports, nimports)
+         .iter()
+@@ -91,7 +91,7 @@ pub unsafe extern "C" fn wasmtime_instance_new(
+ pub(crate) fn handle_instantiate(
+     instance: anyhow::Result<Instance>,
+     instance_ptr: &mut Instance,
+-    trap_ptr: &mut *mut wasm_trap_t,
++    trap_ptr: &mut *mut wasmtime_wasm_trap_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     match instance {
+         Ok(i) => {
+@@ -100,7 +100,7 @@ pub(crate) fn handle_instantiate(
+         }
+         Err(e) => {
+             if e.is::<Trap>() {
+-                *trap_ptr = Box::into_raw(Box::new(wasm_trap_t::new(e)));
++                *trap_ptr = Box::into_raw(Box::new(wasmtime_wasm_trap_t::new(e)));
+                 None
+             } else {
+                 Some(Box::new(e.into()))
+@@ -165,7 +165,7 @@ pub unsafe extern "C" fn wasmtime_instance_pre_instantiate(
+     instance_pre: &wasmtime_instance_pre_t,
+     store: WasmtimeStoreContextMut<'_>,
+     instance_ptr: &mut Instance,
+-    trap_ptr: &mut *mut wasm_trap_t,
++    trap_ptr: &mut *mut wasmtime_wasm_trap_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     let result = instance_pre.underlying.instantiate(store);
+     handle_instantiate(result, instance_ptr, trap_ptr)
+diff --git a/crates/c-api/src/linker.rs b/crates/c-api/src/linker.rs
+index b20104abcc..9bd9f996ef 100644
+--- a/crates/c-api/src/linker.rs
++++ b/crates/c-api/src/linker.rs
+@@ -1,5 +1,5 @@
+ use crate::{
+-    bad_utf8, handle_result, wasm_engine_t, wasm_functype_t, wasm_trap_t, wasmtime_error_t,
++    bad_utf8, handle_result, wasmtime_wasm_engine_t, wasmtime_wasm_functype_t, wasmtime_wasm_trap_t, wasmtime_error_t,
+     wasmtime_extern_t, wasmtime_instance_pre_t, wasmtime_module_t, WasmtimeStoreContext,
+     WasmtimeStoreContextMut,
+ };
+@@ -16,7 +16,7 @@ pub struct wasmtime_linker_t {
+ wasmtime_c_api_macros::declare_own!(wasmtime_linker_t);
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_linker_new(engine: &wasm_engine_t) -> Box<wasmtime_linker_t> {
++pub extern "C" fn wasmtime_linker_new(engine: &wasmtime_wasm_engine_t) -> Box<wasmtime_linker_t> {
+     Box::new(wasmtime_linker_t {
+         linker: Linker::new(&engine.engine),
+     })
+@@ -72,7 +72,7 @@ pub unsafe extern "C" fn wasmtime_linker_define_func(
+     module_len: usize,
+     name: *const u8,
+     name_len: usize,
+-    ty: &wasm_functype_t,
++    ty: &wasmtime_wasm_functype_t,
+     callback: crate::wasmtime_func_callback_t,
+     data: *mut c_void,
+     finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
+@@ -91,7 +91,7 @@ pub unsafe extern "C" fn wasmtime_linker_define_func_unchecked(
+     module_len: usize,
+     name: *const u8,
+     name_len: usize,
+-    ty: &wasm_functype_t,
++    ty: &wasmtime_wasm_functype_t,
+     callback: crate::wasmtime_func_unchecked_callback_t,
+     data: *mut c_void,
+     finalizer: Option<extern "C" fn(*mut std::ffi::c_void)>,
+@@ -138,7 +138,7 @@ pub extern "C" fn wasmtime_linker_instantiate(
+     store: WasmtimeStoreContextMut<'_>,
+     module: &wasmtime_module_t,
+     instance_ptr: &mut Instance,
+-    trap_ptr: &mut *mut wasm_trap_t,
++    trap_ptr: &mut *mut wasmtime_wasm_trap_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     let result = linker.linker.instantiate(store, &module.module);
+     super::instance::handle_instantiate(result, instance_ptr, trap_ptr)
+diff --git a/crates/c-api/src/memory.rs b/crates/c-api/src/memory.rs
+index 4d2cb82e9b..123fa9b6a4 100644
+--- a/crates/c-api/src/memory.rs
++++ b/crates/c-api/src/memory.rs
+@@ -1,5 +1,5 @@
+ use crate::{
+-    handle_result, wasm_extern_t, wasm_memorytype_t, wasm_store_t, wasmtime_error_t,
++    handle_result, wasmtime_wasm_extern_t, wasmtime_wasm_memorytype_t, wasmtime_wasm_store_t, wasmtime_error_t,
+     WasmtimeStoreContext, WasmtimeStoreContextMut,
+ };
+ use std::convert::TryFrom;
+@@ -7,16 +7,16 @@ use wasmtime::{Extern, Memory};
+ 
+ #[derive(Clone)]
+ #[repr(transparent)]
+-pub struct wasm_memory_t {
+-    ext: wasm_extern_t,
++pub struct wasmtime_wasm_memory_t {
++    ext: wasmtime_wasm_extern_t,
+ }
+ 
+-wasmtime_c_api_macros::declare_ref!(wasm_memory_t);
++wasmtime_c_api_macros::declare_ref!(wasmtime_wasm_memory_t);
+ 
+-pub type wasm_memory_pages_t = u32;
++pub type wasmtime_wasm_memory_pages_t = u32;
+ 
+-impl wasm_memory_t {
+-    pub(crate) fn try_from(e: &wasm_extern_t) -> Option<&wasm_memory_t> {
++impl wasmtime_wasm_memory_t {
++    pub(crate) fn try_from(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_memory_t> {
+         match &e.which {
+             Extern::Memory(_) => Some(unsafe { &*(e as *const _ as *const _) }),
+             _ => None,
+@@ -32,13 +32,13 @@ impl wasm_memory_t {
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_memory_new(
+-    store: &mut wasm_store_t,
+-    mt: &wasm_memorytype_t,
+-) -> Option<Box<wasm_memory_t>> {
++pub unsafe extern "C" fn wasmtime_wasm_memory_new(
++    store: &mut wasmtime_wasm_store_t,
++    mt: &wasmtime_wasm_memorytype_t,
++) -> Option<Box<wasmtime_wasm_memory_t>> {
+     let memory = Memory::new(store.store.context_mut(), mt.ty().ty.clone()).ok()?;
+-    Some(Box::new(wasm_memory_t {
+-        ext: wasm_extern_t {
++    Some(Box::new(wasmtime_wasm_memory_t {
++        ext: wasmtime_wasm_extern_t {
+             store: store.store.clone(),
+             which: memory.into(),
+         },
+@@ -46,40 +46,40 @@ pub unsafe extern "C" fn wasm_memory_new(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_memory_as_extern(m: &mut wasm_memory_t) -> &mut wasm_extern_t {
++pub extern "C" fn wasmtime_wasm_memory_as_extern(m: &mut wasmtime_wasm_memory_t) -> &mut wasmtime_wasm_extern_t {
+     &mut m.ext
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_memory_as_extern_const(m: &wasm_memory_t) -> &wasm_extern_t {
++pub extern "C" fn wasmtime_wasm_memory_as_extern_const(m: &wasmtime_wasm_memory_t) -> &wasmtime_wasm_extern_t {
+     &m.ext
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_memory_type(m: &wasm_memory_t) -> Box<wasm_memorytype_t> {
++pub unsafe extern "C" fn wasmtime_wasm_memory_type(m: &wasmtime_wasm_memory_t) -> Box<wasmtime_wasm_memorytype_t> {
+     let ty = m.memory().ty(m.ext.store.context());
+-    Box::new(wasm_memorytype_t::new(ty))
++    Box::new(wasmtime_wasm_memorytype_t::new(ty))
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_memory_data(m: &wasm_memory_t) -> *mut u8 {
++pub unsafe extern "C" fn wasmtime_wasm_memory_data(m: &wasmtime_wasm_memory_t) -> *mut u8 {
+     m.memory().data_ptr(m.ext.store.context())
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_memory_data_size(m: &wasm_memory_t) -> usize {
++pub unsafe extern "C" fn wasmtime_wasm_memory_data_size(m: &wasmtime_wasm_memory_t) -> usize {
+     m.memory().data_size(m.ext.store.context())
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_memory_size(m: &wasm_memory_t) -> wasm_memory_pages_t {
++pub unsafe extern "C" fn wasmtime_wasm_memory_size(m: &wasmtime_wasm_memory_t) -> wasmtime_wasm_memory_pages_t {
+     u32::try_from(m.memory().size(m.ext.store.context())).unwrap()
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_memory_grow(
+-    m: &mut wasm_memory_t,
+-    delta: wasm_memory_pages_t,
++pub unsafe extern "C" fn wasmtime_wasm_memory_grow(
++    m: &mut wasmtime_wasm_memory_t,
++    delta: wasmtime_wasm_memory_pages_t,
+ ) -> bool {
+     let memory = m.memory();
+     let mut store = m.ext.store.context_mut();
+@@ -89,7 +89,7 @@ pub unsafe extern "C" fn wasm_memory_grow(
+ #[no_mangle]
+ pub extern "C" fn wasmtime_memory_new(
+     store: WasmtimeStoreContextMut<'_>,
+-    ty: &wasm_memorytype_t,
++    ty: &wasmtime_wasm_memorytype_t,
+     ret: &mut Memory,
+ ) -> Option<Box<wasmtime_error_t>> {
+     handle_result(Memory::new(store, ty.ty().ty.clone()), |mem| *ret = mem)
+@@ -99,8 +99,8 @@ pub extern "C" fn wasmtime_memory_new(
+ pub extern "C" fn wasmtime_memory_type(
+     store: WasmtimeStoreContext<'_>,
+     mem: &Memory,
+-) -> Box<wasm_memorytype_t> {
+-    Box::new(wasm_memorytype_t::new(mem.ty(store)))
++) -> Box<wasmtime_wasm_memorytype_t> {
++    Box::new(wasmtime_wasm_memorytype_t::new(mem.ty(store)))
+ }
+ 
+ #[no_mangle]
+diff --git a/crates/c-api/src/module.rs b/crates/c-api/src/module.rs
+index 47250fb710..a9a0757948 100644
+--- a/crates/c-api/src/module.rs
++++ b/crates/c-api/src/module.rs
+@@ -1,6 +1,6 @@
+ use crate::{
+-    handle_result, wasm_byte_vec_t, wasm_engine_t, wasm_exporttype_t, wasm_exporttype_vec_t,
+-    wasm_importtype_t, wasm_importtype_vec_t, wasm_store_t, wasmtime_error_t, CExternType,
++    handle_result, wasmtime_wasm_byte_vec_t, wasmtime_wasm_engine_t, wasmtime_wasm_exporttype_t, wasmtime_wasm_exporttype_vec_t,
++    wasmtime_wasm_importtype_t, wasmtime_wasm_importtype_vec_t, wasmtime_wasm_store_t, wasmtime_error_t, CExternType,
+ };
+ use anyhow::Context;
+ use std::ffi::CStr;
+@@ -8,52 +8,52 @@ use std::os::raw::c_char;
+ use wasmtime::{Engine, Module};
+ 
+ #[derive(Clone)]
+-pub struct wasm_module_t {
++pub struct wasmtime_wasm_module_t {
+     pub(crate) module: Module,
+ }
+ 
+-wasmtime_c_api_macros::declare_ref!(wasm_module_t);
++wasmtime_c_api_macros::declare_ref!(wasmtime_wasm_module_t);
+ 
+-impl wasm_module_t {
+-    pub(crate) fn new(module: Module) -> wasm_module_t {
+-        wasm_module_t { module }
++impl wasmtime_wasm_module_t {
++    pub(crate) fn new(module: Module) -> wasmtime_wasm_module_t {
++        wasmtime_wasm_module_t { module }
+     }
+ }
+ 
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_shared_module_t {
++pub struct wasmtime_wasm_shared_module_t {
+     module: Module,
+ }
+ 
+-wasmtime_c_api_macros::declare_own!(wasm_shared_module_t);
++wasmtime_c_api_macros::declare_own!(wasmtime_wasm_shared_module_t);
+ 
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+-pub unsafe extern "C" fn wasm_module_new(
+-    store: &mut wasm_store_t,
+-    binary: &wasm_byte_vec_t,
+-) -> Option<Box<wasm_module_t>> {
++pub unsafe extern "C" fn wasmtime_wasm_module_new(
++    store: &mut wasmtime_wasm_store_t,
++    binary: &wasmtime_wasm_byte_vec_t,
++) -> Option<Box<wasmtime_wasm_module_t>> {
+     match Module::from_binary(store.store.context().engine(), binary.as_slice()) {
+-        Ok(module) => Some(Box::new(wasm_module_t::new(module))),
++        Ok(module) => Some(Box::new(wasmtime_wasm_module_t::new(module))),
+         Err(_) => None,
+     }
+ }
+ 
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+-pub unsafe extern "C" fn wasm_module_validate(
+-    store: &mut wasm_store_t,
+-    binary: &wasm_byte_vec_t,
++pub unsafe extern "C" fn wasmtime_wasm_module_validate(
++    store: &mut wasmtime_wasm_store_t,
++    binary: &wasmtime_wasm_byte_vec_t,
+ ) -> bool {
+     Module::validate(store.store.context().engine(), binary.as_slice()).is_ok()
+ }
+ 
+-fn fill_exports(module: &Module, out: &mut wasm_exporttype_vec_t) {
++fn fill_exports(module: &Module, out: &mut wasmtime_wasm_exporttype_vec_t) {
+     let exports = module
+         .exports()
+         .map(|e| {
+-            Some(Box::new(wasm_exporttype_t::new(
++            Some(Box::new(wasmtime_wasm_exporttype_t::new(
+                 e.name().to_owned(),
+                 CExternType::new(e.ty()),
+             )))
+@@ -62,11 +62,11 @@ fn fill_exports(module: &Module, out: &mut wasm_exporttype_vec_t) {
+     out.set_buffer(exports);
+ }
+ 
+-fn fill_imports(module: &Module, out: &mut wasm_importtype_vec_t) {
++fn fill_imports(module: &Module, out: &mut wasmtime_wasm_importtype_vec_t) {
+     let imports = module
+         .imports()
+         .map(|i| {
+-            Some(Box::new(wasm_importtype_t::new(
++            Some(Box::new(wasmtime_wasm_importtype_t::new(
+                 i.module().to_owned(),
+                 i.name().to_owned(),
+                 CExternType::new(i.ty()),
+@@ -77,30 +77,30 @@ fn fill_imports(module: &Module, out: &mut wasm_importtype_vec_t) {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_module_exports(module: &wasm_module_t, out: &mut wasm_exporttype_vec_t) {
++pub extern "C" fn wasmtime_wasm_module_exports(module: &wasmtime_wasm_module_t, out: &mut wasmtime_wasm_exporttype_vec_t) {
+     fill_exports(&module.module, out);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_module_imports(module: &wasm_module_t, out: &mut wasm_importtype_vec_t) {
++pub extern "C" fn wasmtime_wasm_module_imports(module: &wasmtime_wasm_module_t, out: &mut wasmtime_wasm_importtype_vec_t) {
+     fill_imports(&module.module, out);
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_module_share(module: &wasm_module_t) -> Box<wasm_shared_module_t> {
+-    Box::new(wasm_shared_module_t {
++pub extern "C" fn wasmtime_wasm_module_share(module: &wasmtime_wasm_module_t) -> Box<wasmtime_wasm_shared_module_t> {
++    Box::new(wasmtime_wasm_shared_module_t {
+         module: module.module.clone(),
+     })
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_module_obtain(
+-    store: &mut wasm_store_t,
+-    shared_module: &wasm_shared_module_t,
+-) -> Option<Box<wasm_module_t>> {
++pub unsafe extern "C" fn wasmtime_wasm_module_obtain(
++    store: &mut wasmtime_wasm_store_t,
++    shared_module: &wasmtime_wasm_shared_module_t,
++) -> Option<Box<wasmtime_wasm_module_t>> {
+     let module = shared_module.module.clone();
+     if Engine::same(store.store.context().engine(), module.engine()) {
+-        Some(Box::new(wasm_module_t::new(module)))
++        Some(Box::new(wasmtime_wasm_module_t::new(module)))
+     } else {
+         None
+     }
+@@ -108,19 +108,19 @@ pub unsafe extern "C" fn wasm_module_obtain(
+ 
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+-pub extern "C" fn wasm_module_serialize(module: &wasm_module_t, ret: &mut wasm_byte_vec_t) {
++pub extern "C" fn wasmtime_wasm_module_serialize(module: &wasmtime_wasm_module_t, ret: &mut wasmtime_wasm_byte_vec_t) {
+     if let Ok(buf) = module.module.serialize() {
+         ret.set_buffer(buf);
+     }
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_module_deserialize(
+-    store: &mut wasm_store_t,
+-    binary: &wasm_byte_vec_t,
+-) -> Option<Box<wasm_module_t>> {
++pub unsafe extern "C" fn wasmtime_wasm_module_deserialize(
++    store: &mut wasmtime_wasm_store_t,
++    binary: &wasmtime_wasm_byte_vec_t,
++) -> Option<Box<wasmtime_wasm_module_t>> {
+     match Module::deserialize(store.store.context().engine(), binary.as_slice()) {
+-        Ok(module) => Some(Box::new(wasm_module_t::new(module))),
++        Ok(module) => Some(Box::new(wasmtime_wasm_module_t::new(module))),
+         Err(_) => None,
+     }
+ }
+@@ -135,7 +135,7 @@ wasmtime_c_api_macros::declare_own!(wasmtime_module_t);
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub unsafe extern "C" fn wasmtime_module_new(
+-    engine: &wasm_engine_t,
++    engine: &wasmtime_wasm_engine_t,
+     wasm: *const u8,
+     len: usize,
+     out: &mut *mut wasmtime_module_t,
+@@ -156,7 +156,7 @@ pub extern "C" fn wasmtime_module_clone(module: &wasmtime_module_t) -> Box<wasmt
+ #[no_mangle]
+ pub extern "C" fn wasmtime_module_exports(
+     module: &wasmtime_module_t,
+-    out: &mut wasm_exporttype_vec_t,
++    out: &mut wasmtime_wasm_exporttype_vec_t,
+ ) {
+     fill_exports(&module.module, out);
+ }
+@@ -164,7 +164,7 @@ pub extern "C" fn wasmtime_module_exports(
+ #[no_mangle]
+ pub extern "C" fn wasmtime_module_imports(
+     module: &wasmtime_module_t,
+-    out: &mut wasm_importtype_vec_t,
++    out: &mut wasmtime_wasm_importtype_vec_t,
+ ) {
+     fill_imports(&module.module, out);
+ }
+@@ -172,7 +172,7 @@ pub extern "C" fn wasmtime_module_imports(
+ #[no_mangle]
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub unsafe extern "C" fn wasmtime_module_validate(
+-    engine: &wasm_engine_t,
++    engine: &wasmtime_wasm_engine_t,
+     wasm: *const u8,
+     len: usize,
+ ) -> Option<Box<wasmtime_error_t>> {
+@@ -184,7 +184,7 @@ pub unsafe extern "C" fn wasmtime_module_validate(
+ #[cfg(any(feature = "cranelift", feature = "winch"))]
+ pub extern "C" fn wasmtime_module_serialize(
+     module: &wasmtime_module_t,
+-    ret: &mut wasm_byte_vec_t,
++    ret: &mut wasmtime_wasm_byte_vec_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     handle_result(module.module.serialize(), |buf| ret.set_buffer(buf))
+ }
+@@ -202,7 +202,7 @@ pub extern "C" fn wasmtime_module_image_range(
+ 
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_module_deserialize(
+-    engine: &wasm_engine_t,
++    engine: &wasmtime_wasm_engine_t,
+     bytes: *const u8,
+     len: usize,
+     out: &mut *mut wasmtime_module_t,
+@@ -215,7 +215,7 @@ pub unsafe extern "C" fn wasmtime_module_deserialize(
+ 
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_module_deserialize_file(
+-    engine: &wasm_engine_t,
++    engine: &wasmtime_wasm_engine_t,
+     path: *const c_char,
+     out: &mut *mut wasmtime_module_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+diff --git a/crates/c-api/src/profiling.rs b/crates/c-api/src/profiling.rs
+index 1b59b6c2e5..5acf78a566 100644
+--- a/crates/c-api/src/profiling.rs
++++ b/crates/c-api/src/profiling.rs
+@@ -1,4 +1,4 @@
+-use crate::{wasm_byte_vec_t, wasm_name_t, wasmtime_error_t, wasmtime_module_t, wasmtime_store_t};
++use crate::{wasm_byte_vec_t, wasmtime_wasm_name_t, wasmtime_error_t, wasmtime_module_t, wasmtime_store_t};
+ use std::slice;
+ use std::str::from_utf8;
+ use std::time::Duration;
+@@ -12,13 +12,13 @@ wasmtime_c_api_macros::declare_own!(wasmtime_guestprofiler_t);
+ 
+ #[repr(C)]
+ pub struct wasmtime_guestprofiler_modules_t<'a> {
+-    name: &'a wasm_name_t,
++    name: &'a wasmtime_wasm_name_t,
+     module: &'a wasmtime_module_t,
+ }
+ 
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_guestprofiler_new(
+-    module_name: &wasm_name_t,
++    module_name: &wasmtime_wasm_name_t,
+     interval_nanos: u64,
+     modules: *const wasmtime_guestprofiler_modules_t,
+     modules_len: usize,
+@@ -54,7 +54,7 @@ pub extern "C" fn wasmtime_guestprofiler_sample(
+ #[no_mangle]
+ pub extern "C" fn wasmtime_guestprofiler_finish(
+     guestprofiler: Box<wasmtime_guestprofiler_t>,
+-    out: &mut wasm_byte_vec_t,
++    out: &mut wasmtime_wasm_byte_vec_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     let mut buf = vec![];
+     match guestprofiler.guest_profiler.finish(&mut buf) {
+diff --git a/crates/c-api/src/ref.rs b/crates/c-api/src/ref.rs
+index 44f14c3f99..5dc671011b 100644
+--- a/crates/c-api/src/ref.rs
++++ b/crates/c-api/src/ref.rs
+@@ -2,63 +2,63 @@ use crate::{abort, WasmtimeStoreContextMut};
+ use std::{mem::MaybeUninit, num::NonZeroU64, os::raw::c_void, ptr};
+ use wasmtime::{AnyRef, ExternRef, ManuallyRooted, Ref, RootScope, Val, I31};
+ 
+-/// `*mut wasm_ref_t` is a reference type (`externref` or `funcref`), as seen by
++/// `*mut wasmtime_wasm_ref_t` is a reference type (`externref` or `funcref`), as seen by
+ /// the C API. Because we do not have a uniform representation for `funcref`s
+-/// and `externref`s, a `*mut wasm_ref_t` is morally a
++/// and `externref`s, a `*mut wasmtime_wasm_ref_t` is morally a
+ /// `Option<Box<Either<ExternRef, Func>>>`.
+ ///
+-/// A null `*mut wasm_ref_t` is either a null `funcref` or a null `externref`
++/// A null `*mut wasmtime_wasm_ref_t` is either a null `funcref` or a null `externref`
+ /// depending on context (e.g. the table's element type that it is going into or
+ /// coming out of).
+ ///
+ /// Note: this is not `#[repr(C)]` because it is an opaque type in the header,
+-/// and only ever referenced as `*mut wasm_ref_t`. This also lets us use a
++/// and only ever referenced as `*mut wasmtime_wasm_ref_t`. This also lets us use a
+ /// regular, non-`repr(C)` `enum` to define `WasmRefInner`.
+ #[derive(Clone)]
+-pub struct wasm_ref_t {
++pub struct wasmtime_wasm_ref_t {
+     pub(crate) r: Ref,
+ }
+ 
+-wasmtime_c_api_macros::declare_own!(wasm_ref_t);
++wasmtime_c_api_macros::declare_own!(wasmtime_wasm_ref_t);
+ 
+-impl wasm_ref_t {
+-    pub(crate) fn new(r: Ref) -> Option<Box<wasm_ref_t>> {
++impl wasmtime_wasm_ref_t {
++    pub(crate) fn new(r: Ref) -> Option<Box<wasmtime_wasm_ref_t>> {
+         if r.is_null() || !r.is_func() {
+             None
+         } else {
+-            Some(Box::new(wasm_ref_t { r }))
++            Some(Box::new(wasmtime_wasm_ref_t { r }))
+         }
+     }
+ }
+ 
+-pub(crate) fn ref_to_val(r: &wasm_ref_t) -> Val {
++pub(crate) fn ref_to_val(r: &wasmtime_wasm_ref_t) -> Val {
+     Val::from(r.r.clone())
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_copy(r: Option<&wasm_ref_t>) -> Option<Box<wasm_ref_t>> {
++pub extern "C" fn wasmtime_wasm_ref_copy(r: Option<&wasmtime_wasm_ref_t>) -> Option<Box<wasmtime_wasm_ref_t>> {
+     r.map(|r| Box::new(r.clone()))
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_same(_a: Option<&wasm_ref_t>, _b: Option<&wasm_ref_t>) -> bool {
++pub extern "C" fn wasmtime_wasm_ref_same(_a: Option<&wasmtime_wasm_ref_t>, _b: Option<&wasmtime_wasm_ref_t>) -> bool {
+     // We need a store to determine whether these are the same reference or not.
+     abort("wasm_ref_same")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_get_host_info(_ref: Option<&wasm_ref_t>) -> *mut c_void {
++pub extern "C" fn wasmtime_wasm_ref_get_host_info(_ref: Option<&wasmtime_wasm_ref_t>) -> *mut c_void {
+     std::ptr::null_mut()
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_set_host_info(_ref: Option<&wasm_ref_t>, _info: *mut c_void) {
++pub extern "C" fn wasmtime_wasm_ref_set_host_info(_ref: Option<&wasmtime_wasm_ref_t>, _info: *mut c_void) {
+     abort("wasm_ref_set_host_info")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_set_host_info_with_finalizer(
+-    _ref: Option<&wasm_ref_t>,
++pub extern "C" fn wasmtime_wasm_ref_set_host_info_with_finalizer(
++    _ref: Option<&wasmtime_wasm_ref_t>,
+     _info: *mut c_void,
+     _finalizer: Option<extern "C" fn(*mut c_void)>,
+ ) {
+@@ -66,119 +66,119 @@ pub extern "C" fn wasm_ref_set_host_info_with_finalizer(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_extern(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_extern_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_extern(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_extern_t> {
+     abort("wasm_ref_as_extern")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_extern_const(
+-    _ref: Option<&wasm_ref_t>,
++pub extern "C" fn wasmtime_wasm_ref_as_extern_const(
++    _ref: Option<&wasmtime_wasm_ref_t>,
+ ) -> Option<&crate::wasm_extern_t> {
+     abort("wasm_ref_as_extern_const")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_foreign(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_foreign_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_foreign(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_foreign_t> {
+     abort("wasm_ref_as_foreign")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_foreign_const(
+-    _ref: Option<&wasm_ref_t>,
++pub extern "C" fn wasmtime_wasm_ref_as_foreign_const(
++    _ref: Option<&wasmtime_wasm_ref_t>,
+ ) -> Option<&crate::wasm_foreign_t> {
+     abort("wasm_ref_as_foreign_const")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_func(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_func_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_func(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_func_t> {
+     abort("wasm_ref_as_func")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_func_const(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_func_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_func_const(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_func_t> {
+     abort("wasm_ref_as_func_const")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_global(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_global_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_global(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_global_t> {
+     abort("wasm_ref_as_global")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_global_const(
+-    _ref: Option<&wasm_ref_t>,
++pub extern "C" fn wasmtime_wasm_ref_as_global_const(
++    _ref: Option<&wasmtime_wasm_ref_t>,
+ ) -> Option<&crate::wasm_global_t> {
+     abort("wasm_ref_as_global_const")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_instance(
+-    _ref: Option<&wasm_ref_t>,
++pub extern "C" fn wasmtime_wasm_ref_as_instance(
++    _ref: Option<&wasmtime_wasm_ref_t>,
+ ) -> Option<&crate::wasm_instance_t> {
+     abort("wasm_ref_as_instance")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_instance_const(
+-    _ref: Option<&wasm_ref_t>,
++pub extern "C" fn wasmtime_wasm_ref_as_instance_const(
++    _ref: Option<&wasmtime_wasm_ref_t>,
+ ) -> Option<&crate::wasm_instance_t> {
+     abort("wasm_ref_as_instance_const")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_memory(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_memory_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_memory(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_memory_t> {
+     abort("wasm_ref_as_memory")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_memory_const(
+-    _ref: Option<&wasm_ref_t>,
++pub extern "C" fn wasmtime_wasm_ref_as_memory_const(
++    _ref: Option<&wasmtime_wasm_ref_t>,
+ ) -> Option<&crate::wasm_memory_t> {
+     abort("wasm_ref_as_memory_const")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_module(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_module_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_module(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_module_t> {
+     abort("wasm_ref_as_module")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_module_const(
+-    _ref: Option<&wasm_ref_t>,
++pub extern "C" fn wasmtime_wasm_ref_as_module_const(
++    _ref: Option<&wasmtime_wasm_ref_t>,
+ ) -> Option<&crate::wasm_module_t> {
+     abort("wasm_ref_as_module_const")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_table(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_table_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_table(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_table_t> {
+     abort("wasm_ref_as_table")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_table_const(
+-    _ref: Option<&wasm_ref_t>,
++pub extern "C" fn wasmtime_wasm_ref_as_table_const(
++    _ref: Option<&wasmtime_wasm_ref_t>,
+ ) -> Option<&crate::wasm_table_t> {
+     abort("wasm_ref_as_table_const")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_trap(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_trap_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_trap(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_trap_t> {
+     abort("wasm_ref_as_trap")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_ref_as_trap_const(_ref: Option<&wasm_ref_t>) -> Option<&crate::wasm_trap_t> {
++pub extern "C" fn wasmtime_wasm_ref_as_trap_const(_ref: Option<&wasmtime_wasm_ref_t>) -> Option<&crate::wasm_trap_t> {
+     abort("wasm_ref_as_trap_const")
+ }
+ 
+ #[derive(Clone)]
+ #[repr(C)]
+-pub struct wasm_foreign_t {}
++pub struct wasmtime_wasm_foreign_t {}
+ 
+-wasmtime_c_api_macros::declare_ref!(wasm_foreign_t);
++wasmtime_c_api_macros::declare_ref!(wasmtime_wasm_foreign_t);
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_foreign_new(_store: &crate::wasm_store_t) -> Box<wasm_foreign_t> {
++pub extern "C" fn wasmtime_wasm_foreign_new(_store: &crate::wasm_store_t) -> Box<wasmtime_wasm_foreign_t> {
+     abort("wasm_foreign_new")
+ }
+ 
+diff --git a/crates/c-api/src/sharedmemory.rs b/crates/c-api/src/sharedmemory.rs
+index 43d5076a93..9ddf8c9328 100644
+--- a/crates/c-api/src/sharedmemory.rs
++++ b/crates/c-api/src/sharedmemory.rs
+@@ -1,4 +1,4 @@
+-use crate::{handle_result, wasm_memorytype_t, wasmtime_error_t};
++use crate::{handle_result, wasmtime_wasm_memorytype_t, wasmtime_error_t};
+ use std::cell::UnsafeCell;
+ use wasmtime::SharedMemory;
+ 
+@@ -10,7 +10,7 @@ wasmtime_c_api_macros::declare_own!(wasmtime_sharedmemory_t);
+ #[cfg(feature = "threads")]
+ pub extern "C" fn wasmtime_sharedmemory_new(
+     engine: &crate::wasm_engine_t,
+-    ty: &wasm_memorytype_t,
++    ty: &wasmtime_wasm_memorytype_t,
+     ret: &mut *mut wasmtime_sharedmemory_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     handle_result(
+@@ -29,8 +29,8 @@ pub extern "C" fn wasmtime_sharedmemory_clone(
+ #[no_mangle]
+ pub extern "C" fn wasmtime_sharedmemory_type(
+     mem: &wasmtime_sharedmemory_t,
+-) -> Box<wasm_memorytype_t> {
+-    Box::new(wasm_memorytype_t::new(mem.ty()))
++) -> Box<wasmtime_wasm_memorytype_t> {
++    Box::new(wasmtime_wasm_memorytype_t::new(mem.ty()))
+ }
+ 
+ #[no_mangle]
+diff --git a/crates/c-api/src/store.rs b/crates/c-api/src/store.rs
+index 6c5953bd85..62214dc1fe 100644
+--- a/crates/c-api/src/store.rs
++++ b/crates/c-api/src/store.rs
+@@ -42,17 +42,17 @@ impl WasmStoreRef {
+ 
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_store_t {
++pub struct wasmtime_wasm_store_t {
+     pub(crate) store: WasmStoreRef,
+ }
+ 
+-wasmtime_c_api_macros::declare_own!(wasm_store_t);
++wasmtime_c_api_macros::declare_own!(wasmtime_wasm_store_t);
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_store_new(engine: &wasm_engine_t) -> Box<wasm_store_t> {
++pub extern "C" fn wasmtime_wasm_store_new(engine: &wasmtime_wasm_engine_t) -> Box<wasmtime_wasm_store_t> {
+     let engine = &engine.engine;
+     let store = Store::new(engine, ());
+-    Box::new(wasm_store_t {
++    Box::new(wasmtime_wasm_store_t {
+         store: WasmStoreRef {
+             store: Arc::new(UnsafeCell::new(store)),
+         },
+@@ -91,7 +91,7 @@ pub struct WasmtimeStoreData {
+ 
+     /// Temporary storage for usage during host->wasm calls, same as above but
+     /// for a different direction.
+-    pub wasm_val_storage: Vec<Val>,
++    pub wasmtime_wasm_val_storage: Vec<Val>,
+ 
+     /// Limits for the store.
+     pub store_limits: StoreLimits,
+@@ -99,7 +99,7 @@ pub struct WasmtimeStoreData {
+ 
+ #[no_mangle]
+ pub extern "C" fn wasmtime_store_new(
+-    engine: &wasm_engine_t,
++    engine: &wasmtime_wasm_engine_t,
+     data: *mut c_void,
+     finalizer: Option<extern "C" fn(*mut c_void)>,
+ ) -> Box<wasmtime_store_t> {
+@@ -111,7 +111,7 @@ pub extern "C" fn wasmtime_store_new(
+                 #[cfg(feature = "wasi")]
+                 wasi: None,
+                 hostcall_val_storage: Vec::new(),
+-                wasm_val_storage: Vec::new(),
++                wasmtime_wasm_val_storage: Vec::new(),
+                 store_limits: StoreLimits::default(),
+             },
+         ),
+diff --git a/crates/c-api/src/table.rs b/crates/c-api/src/table.rs
+index d7ff324580..9947512644 100644
+--- a/crates/c-api/src/table.rs
++++ b/crates/c-api/src/table.rs
+@@ -1,5 +1,5 @@
+ use crate::{
+-    handle_result, wasm_extern_t, wasm_ref_t, wasm_store_t, wasm_tabletype_t, wasmtime_error_t,
++    handle_result, wasmtime_wasm_extern_t, wasmtime_wasm_ref_t, wasmtime_wasm_store_t, wasmtime_wasm_tabletype_t, wasmtime_error_t,
+     wasmtime_val_t, WasmtimeStoreContext, WasmtimeStoreContextMut,
+ };
+ use anyhow::anyhow;
+@@ -8,16 +8,16 @@ use wasmtime::{Extern, Ref, RootScope, Table, TableType};
+ 
+ #[derive(Clone)]
+ #[repr(transparent)]
+-pub struct wasm_table_t {
+-    ext: wasm_extern_t,
++pub struct wasmtime_wasm_table_t {
++    ext: wasmtime_wasm_extern_t,
+ }
+ 
+-wasmtime_c_api_macros::declare_ref!(wasm_table_t);
++wasmtime_c_api_macros::declare_ref!(wasmtime_wasm_table_t);
+ 
+-pub type wasm_table_size_t = u32;
++pub type wasmtime_wasm_table_size_t = u32;
+ 
+-impl wasm_table_t {
+-    pub(crate) fn try_from(e: &wasm_extern_t) -> Option<&wasm_table_t> {
++impl wasmtime_wasm_table_t {
++    pub(crate) fn try_from(e: &wasmtime_wasm_extern_t) -> Option<&wasmtime_wasm_table_t> {
+         match &e.which {
+             Extern::Table(_) => Some(unsafe { &*(e as *const _ as *const _) }),
+             _ => None,
+@@ -32,22 +32,22 @@ impl wasm_table_t {
+     }
+ }
+ 
+-fn option_wasm_ref_t_to_ref(r: Option<&wasm_ref_t>, table_ty: &TableType) -> Ref {
++fn option_wasm_ref_t_to_ref(r: Option<&wasmtime_wasm_ref_t>, table_ty: &TableType) -> Ref {
+     r.map(|r| r.r.clone())
+         .unwrap_or_else(|| Ref::null(table_ty.element().heap_type()))
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_table_new(
+-    store: &mut wasm_store_t,
+-    tt: &wasm_tabletype_t,
+-    init: Option<&wasm_ref_t>,
+-) -> Option<Box<wasm_table_t>> {
++pub unsafe extern "C" fn wasmtime_wasm_table_new(
++    store: &mut wasmtime_wasm_store_t,
++    tt: &wasmtime_wasm_tabletype_t,
++    init: Option<&wasmtime_wasm_ref_t>,
++) -> Option<Box<wasmtime_wasm_table_t>> {
+     let tt = tt.ty().ty.clone();
+     let init = option_wasm_ref_t_to_ref(init, &tt);
+     let table = Table::new(store.store.context_mut(), tt, init).ok()?;
+-    Some(Box::new(wasm_table_t {
+-        ext: wasm_extern_t {
++    Some(Box::new(wasmtime_wasm_table_t {
++        ext: wasmtime_wasm_extern_t {
+             store: store.store.clone(),
+             which: table.into(),
+         },
+@@ -55,27 +55,27 @@ pub unsafe extern "C" fn wasm_table_new(
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_table_type(t: &wasm_table_t) -> Box<wasm_tabletype_t> {
++pub unsafe extern "C" fn wasmtime_wasm_table_type(t: &wasmtime_wasm_table_t) -> Box<wasmtime_wasm_tabletype_t> {
+     let table = t.table();
+     let store = t.ext.store.context();
+-    Box::new(wasm_tabletype_t::new(table.ty(&store)))
++    Box::new(wasmtime_wasm_tabletype_t::new(table.ty(&store)))
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_table_get(
+-    t: &mut wasm_table_t,
+-    index: wasm_table_size_t,
+-) -> Option<Box<wasm_ref_t>> {
++pub unsafe extern "C" fn wasmtime_wasm_table_get(
++    t: &mut wasmtime_wasm_table_t,
++    index: wasmtime_wasm_table_size_t,
++) -> Option<Box<wasmtime_wasm_ref_t>> {
+     let table = t.table();
+     let r = table.get(t.ext.store.context_mut(), index)?;
+-    wasm_ref_t::new(r)
++    wasmtime_wasm_ref_t::new(r)
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_table_set(
+-    t: &mut wasm_table_t,
+-    index: wasm_table_size_t,
+-    r: Option<&wasm_ref_t>,
++pub unsafe extern "C" fn wasmtime_wasm_table_set(
++    t: &mut wasmtime_wasm_table_t,
++    index: wasmtime_wasm_table_size_t,
++    r: Option<&wasmtime_wasm_ref_t>,
+ ) -> bool {
+     let table = t.table();
+     let val = option_wasm_ref_t_to_ref(r, &table.ty(t.ext.store.context()));
+@@ -83,17 +83,17 @@ pub unsafe extern "C" fn wasm_table_set(
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_table_size(t: &wasm_table_t) -> wasm_table_size_t {
++pub unsafe extern "C" fn wasmtime_wasm_table_size(t: &wasmtime_wasm_table_t) -> wasmtime_wasm_table_size_t {
+     let table = t.table();
+     let store = t.ext.store.context();
+     table.size(&store)
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_table_grow(
+-    t: &mut wasm_table_t,
+-    delta: wasm_table_size_t,
+-    init: Option<&wasm_ref_t>,
++pub unsafe extern "C" fn wasmtime_wasm_table_grow(
++    t: &mut wasmtime_wasm_table_t,
++    delta: wasmtime_wasm_table_size_t,
++    init: Option<&wasmtime_wasm_ref_t>,
+ ) -> bool {
+     let table = t.table();
+     let init = option_wasm_ref_t_to_ref(init, &table.ty(t.ext.store.context()));
+@@ -101,19 +101,19 @@ pub unsafe extern "C" fn wasm_table_grow(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_table_as_extern(t: &mut wasm_table_t) -> &mut wasm_extern_t {
++pub extern "C" fn wasmtime_wasm_table_as_extern(t: &mut wasmtime_wasm_table_t) -> &mut wasmtime_wasm_extern_t {
+     &mut t.ext
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_table_as_extern_const(t: &wasm_table_t) -> &wasm_extern_t {
++pub extern "C" fn wasmtime_wasm_table_as_extern_const(t: &wasmtime_wasm_table_t) -> &wasmtime_wasm_extern_t {
+     &t.ext
+ }
+ 
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_table_new(
+     mut store: WasmtimeStoreContextMut<'_>,
+-    tt: &wasm_tabletype_t,
++    tt: &wasmtime_wasm_tabletype_t,
+     init: &wasmtime_val_t,
+     out: &mut Table,
+ ) -> Option<Box<wasmtime_error_t>> {
+@@ -131,8 +131,8 @@ pub unsafe extern "C" fn wasmtime_table_new(
+ pub unsafe extern "C" fn wasmtime_table_type(
+     store: WasmtimeStoreContext<'_>,
+     table: &Table,
+-) -> Box<wasm_tabletype_t> {
+-    Box::new(wasm_tabletype_t::new(table.ty(store)))
++) -> Box<wasmtime_wasm_tabletype_t> {
++    Box::new(wasmtime_wasm_tabletype_t::new(table.ty(store)))
+ }
+ 
+ #[no_mangle]
+diff --git a/crates/c-api/src/trap.rs b/crates/c-api/src/trap.rs
+index f2a4a64b60..fd5238786e 100644
+--- a/crates/c-api/src/trap.rs
++++ b/crates/c-api/src/trap.rs
+@@ -1,10 +1,10 @@
+-use crate::{wasm_frame_vec_t, wasm_instance_t, wasm_name_t, wasm_store_t};
++use crate::{wasm_frame_vec_t, wasmtime_wasm_instance_t, wasmtime_wasm_name_t, wasmtime_wasm_store_t};
+ use anyhow::{anyhow, Error};
+ use once_cell::unsync::OnceCell;
+ use wasmtime::{Trap, WasmBacktrace};
+ 
+ #[repr(C)]
+-pub struct wasm_trap_t {
++pub struct wasmtime_wasm_trap_t {
+     pub(crate) error: Error,
+ }
+ 
+@@ -12,61 +12,61 @@ pub struct wasm_trap_t {
+ //
+ // For now the impl here is "fake it til you make it" since this is losing
+ // context by only cloning the error string.
+-impl Clone for wasm_trap_t {
+-    fn clone(&self) -> wasm_trap_t {
+-        wasm_trap_t {
++impl Clone for wasmtime_wasm_trap_t {
++    fn clone(&self) -> wasmtime_wasm_trap_t {
++        wasmtime_wasm_trap_t {
+             error: anyhow!("{:?}", self.error),
+         }
+     }
+ }
+ 
+-wasmtime_c_api_macros::declare_ref!(wasm_trap_t);
++wasmtime_c_api_macros::declare_ref!(wasmtime_wasm_trap_t);
+ 
+-impl wasm_trap_t {
+-    pub(crate) fn new(error: Error) -> wasm_trap_t {
+-        wasm_trap_t { error }
++impl wasmtime_wasm_trap_t {
++    pub(crate) fn new(error: Error) -> wasmtime_wasm_trap_t {
++        wasmtime_wasm_trap_t { error }
+     }
+ }
+ 
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_frame_t<'a> {
++pub struct wasmtime_wasm_frame_t<'a> {
+     trace: &'a WasmBacktrace,
+     idx: usize,
+-    func_name: OnceCell<Option<wasm_name_t>>,
+-    module_name: OnceCell<Option<wasm_name_t>>,
++    func_name: OnceCell<Option<wasmtime_wasm_name_t>>,
++    module_name: OnceCell<Option<wasmtime_wasm_name_t>>,
+ }
+ 
+-wasmtime_c_api_macros::declare_own!(wasm_frame_t);
++wasmtime_c_api_macros::declare_own!(wasmtime_wasm_frame_t);
+ 
+-pub type wasm_message_t = wasm_name_t;
++pub type wasmtime_wasm_message_t = wasmtime_wasm_name_t;
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_trap_new(
+-    _store: &wasm_store_t,
+-    message: &wasm_message_t,
+-) -> Box<wasm_trap_t> {
++pub extern "C" fn wasmtime_wasm_trap_new(
++    _store: &wasmtime_wasm_store_t,
++    message: &wasmtime_wasm_message_t,
++) -> Box<wasmtime_wasm_trap_t> {
+     let message = message.as_slice();
+     if message[message.len() - 1] != 0 {
+         panic!("wasm_trap_new message stringz expected");
+     }
+     let message = String::from_utf8_lossy(&message[..message.len() - 1]);
+-    Box::new(wasm_trap_t {
++    Box::new(wasmtime_wasm_trap_t {
+         error: Error::msg(message.into_owned()),
+     })
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasmtime_trap_new(message: *const u8, len: usize) -> Box<wasm_trap_t> {
++pub unsafe extern "C" fn wasmtime_trap_new(message: *const u8, len: usize) -> Box<wasmtime_wasm_trap_t> {
+     let bytes = crate::slice_from_raw_parts(message, len);
+     let message = String::from_utf8_lossy(&bytes);
+-    Box::new(wasm_trap_t {
++    Box::new(wasmtime_wasm_trap_t {
+         error: Error::msg(message.into_owned()),
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_trap_message(trap: &wasm_trap_t, out: &mut wasm_message_t) {
++pub extern "C" fn wasmtime_wasm_trap_message(trap: &wasmtime_wasm_trap_t, out: &mut wasmtime_wasm_message_t) {
+     let mut buffer = Vec::new();
+     buffer.extend_from_slice(format!("{:?}", trap.error).as_bytes());
+     buffer.reserve_exact(1);
+@@ -75,13 +75,13 @@ pub extern "C" fn wasm_trap_message(trap: &wasm_trap_t, out: &mut wasm_message_t
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_trap_origin(raw: &wasm_trap_t) -> Option<Box<wasm_frame_t<'_>>> {
++pub extern "C" fn wasmtime_wasm_trap_origin(raw: &wasmtime_wasm_trap_t) -> Option<Box<wasmtime_wasm_frame_t<'_>>> {
+     let trace = match raw.error.downcast_ref::<WasmBacktrace>() {
+         Some(trap) => trap,
+         None => return None,
+     };
+     if trace.frames().len() > 0 {
+-        Some(Box::new(wasm_frame_t {
++        Some(Box::new(wasmtime_wasm_frame_t {
+             trace,
+             idx: 0,
+             func_name: OnceCell::new(),
+@@ -93,18 +93,18 @@ pub extern "C" fn wasm_trap_origin(raw: &wasm_trap_t) -> Option<Box<wasm_frame_t
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_trap_trace<'a>(raw: &'a wasm_trap_t, out: &mut wasm_frame_vec_t<'a>) {
++pub extern "C" fn wasmtime_wasm_trap_trace<'a>(raw: &'a wasmtime_wasm_trap_t, out: &mut wasmtime_wasm_frame_vec_t<'a>) {
+     error_trace(&raw.error, out)
+ }
+ 
+-pub(crate) fn error_trace<'a>(error: &'a Error, out: &mut wasm_frame_vec_t<'a>) {
++pub(crate) fn error_trace<'a>(error: &'a Error, out: &mut wasmtime_wasm_frame_vec_t<'a>) {
+     let trace = match error.downcast_ref::<WasmBacktrace>() {
+         Some(trap) => trap,
+         None => return out.set_buffer(Vec::new()),
+     };
+     let vec = (0..trace.frames().len())
+         .map(|idx| {
+-            Some(Box::new(wasm_frame_t {
++            Some(Box::new(wasmtime_wasm_frame_t {
+                 trace,
+                 idx,
+                 func_name: OnceCell::new(),
+@@ -116,7 +116,7 @@ pub(crate) fn error_trace<'a>(error: &'a Error, out: &mut wasm_frame_vec_t<'a>)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_trap_code(raw: &wasm_trap_t, code: &mut u8) -> bool {
++pub extern "C" fn wasmtime_trap_code(raw: &wasmtime_wasm_trap_t, code: &mut u8) -> bool {
+     let trap = match raw.error.downcast_ref::<Trap>() {
+         Some(trap) => trap,
+         None => return false,
+@@ -141,59 +141,59 @@ pub extern "C" fn wasmtime_trap_code(raw: &wasm_trap_t, code: &mut u8) -> bool {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_frame_func_index(frame: &wasm_frame_t<'_>) -> u32 {
++pub extern "C" fn wasmtime_wasm_frame_func_index(frame: &wasmtime_wasm_frame_t<'_>) -> u32 {
+     frame.trace.frames()[frame.idx].func_index()
+ }
+ 
+ #[no_mangle]
+ pub extern "C" fn wasmtime_frame_func_name<'a>(
+-    frame: &'a wasm_frame_t<'_>,
+-) -> Option<&'a wasm_name_t> {
++    frame: &'a wasmtime_wasm_frame_t<'_>,
++) -> Option<&'a wasmtime_wasm_name_t> {
+     frame
+         .func_name
+         .get_or_init(|| {
+             frame.trace.frames()[frame.idx]
+                 .func_name()
+-                .map(|s| wasm_name_t::from(s.to_string().into_bytes()))
++                .map(|s| wasmtime_wasm_name_t::from(s.to_string().into_bytes()))
+         })
+         .as_ref()
+ }
+ 
+ #[no_mangle]
+ pub extern "C" fn wasmtime_frame_module_name<'a>(
+-    frame: &'a wasm_frame_t<'_>,
+-) -> Option<&'a wasm_name_t> {
++    frame: &'a wasmtime_wasm_frame_t<'_>,
++) -> Option<&'a wasmtime_wasm_name_t> {
+     frame
+         .module_name
+         .get_or_init(|| {
+             frame.trace.frames()[frame.idx]
+                 .module()
+                 .name()
+-                .map(|s| wasm_name_t::from(s.to_string().into_bytes()))
++                .map(|s| wasmtime_wasm_name_t::from(s.to_string().into_bytes()))
+         })
+         .as_ref()
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_frame_func_offset(frame: &wasm_frame_t<'_>) -> usize {
++pub extern "C" fn wasmtime_wasm_frame_func_offset(frame: &wasmtime_wasm_frame_t<'_>) -> usize {
+     frame.trace.frames()[frame.idx]
+         .func_offset()
+         .unwrap_or(usize::MAX)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_frame_instance(_arg1: *const wasm_frame_t<'_>) -> *mut wasm_instance_t {
++pub extern "C" fn wasmtime_wasm_frame_instance(_arg1: *const wasmtime_wasm_frame_t<'_>) -> *mut wasmtime_wasm_instance_t {
+     unimplemented!("wasm_frame_instance")
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_frame_module_offset(frame: &wasm_frame_t<'_>) -> usize {
++pub extern "C" fn wasmtime_wasm_frame_module_offset(frame: &wasmtime_wasm_frame_t<'_>) -> usize {
+     frame.trace.frames()[frame.idx]
+         .module_offset()
+         .unwrap_or(usize::MAX)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_frame_copy<'a>(frame: &wasm_frame_t<'a>) -> Box<wasm_frame_t<'a>> {
++pub extern "C" fn wasmtime_wasm_frame_copy<'a>(frame: &wasmtime_wasm_frame_t<'a>) -> Box<wasmtime_wasm_frame_t<'a>> {
+     Box::new(frame.clone())
+ }
+diff --git a/crates/c-api/src/types.rs b/crates/c-api/src/types.rs
+index 9df1715cf3..4c9d7700ca 100644
+--- a/crates/c-api/src/types.rs
++++ b/crates/c-api/src/types.rs
+@@ -1,11 +1,11 @@
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_limits_t {
++pub struct wasmtime_wasm_limits_t {
+     pub min: u32,
+     pub max: u32,
+ }
+ 
+-impl wasm_limits_t {
++impl wasmtime_wasm_limits_t {
+     pub(crate) fn max(&self) -> Option<u32> {
+         if self.max == u32::max_value() {
+             None
+diff --git a/crates/c-api/src/types/export.rs b/crates/c-api/src/types/export.rs
+index 2eca463d82..bc2daaa2fc 100644
+--- a/crates/c-api/src/types/export.rs
++++ b/crates/c-api/src/types/export.rs
+@@ -1,20 +1,20 @@
+-use crate::{wasm_externtype_t, wasm_name_t, CExternType};
++use crate::{wasm_externtype_t, wasmtime_wasm_name_t, CExternType};
+ use once_cell::unsync::OnceCell;
+ 
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_exporttype_t {
++pub struct wasmtime_wasm_exporttype_t {
+     name: String,
+     ty: CExternType,
+-    name_cache: OnceCell<wasm_name_t>,
+-    type_cache: OnceCell<wasm_externtype_t>,
++    name_cache: OnceCell<wasmtime_wasm_name_t>,
++    type_cache: OnceCell<wasmtime_wasm_externtype_t>,
+ }
+ 
+-wasmtime_c_api_macros::declare_ty!(wasm_exporttype_t);
++wasmtime_c_api_macros::declare_ty!(wasmtime_wasm_exporttype_t);
+ 
+-impl wasm_exporttype_t {
+-    pub(crate) fn new(name: String, ty: CExternType) -> wasm_exporttype_t {
+-        wasm_exporttype_t {
++impl wasmtime_wasm_exporttype_t {
++    pub(crate) fn new(name: String, ty: CExternType) -> wasmtime_wasm_exporttype_t {
++        wasmtime_wasm_exporttype_t {
+             name,
+             ty,
+             name_cache: OnceCell::new(),
+@@ -24,23 +24,23 @@ impl wasm_exporttype_t {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_exporttype_new(
+-    name: &mut wasm_name_t,
+-    ty: Box<wasm_externtype_t>,
+-) -> Option<Box<wasm_exporttype_t>> {
++pub extern "C" fn wasmtime_wasm_exporttype_new(
++    name: &mut wasmtime_wasm_name_t,
++    ty: Box<wasmtime_wasm_externtype_t>,
++) -> Option<Box<wasmtime_wasm_exporttype_t>> {
+     let name = name.take();
+     let name = String::from_utf8(name).ok()?;
+-    Some(Box::new(wasm_exporttype_t::new(name, ty.which.clone())))
++    Some(Box::new(wasmtime_wasm_exporttype_t::new(name, ty.which.clone())))
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_exporttype_name(et: &wasm_exporttype_t) -> &wasm_name_t {
++pub extern "C" fn wasmtime_wasm_exporttype_name(et: &wasmtime_wasm_exporttype_t) -> &wasmtime_wasm_name_t {
+     et.name_cache
+-        .get_or_init(|| wasm_name_t::from_name(et.name.clone()))
++        .get_or_init(|| wasmtime_wasm_name_t::from_name(et.name.clone()))
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_exporttype_type(et: &wasm_exporttype_t) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_exporttype_type(et: &wasmtime_wasm_exporttype_t) -> &wasmtime_wasm_externtype_t {
+     et.type_cache
+-        .get_or_init(|| wasm_externtype_t::from_cextern_type(et.ty.clone()))
++        .get_or_init(|| wasmtime_wasm_externtype_t::from_cextern_type(et.ty.clone()))
+ }
+diff --git a/crates/c-api/src/types/extern.rs b/crates/c-api/src/types/extern.rs
+index c85dcbb25c..e78c4a12a6 100644
+--- a/crates/c-api/src/types/extern.rs
++++ b/crates/c-api/src/types/extern.rs
+@@ -1,14 +1,14 @@
+-use crate::{wasm_functype_t, wasm_globaltype_t, wasm_memorytype_t, wasm_tabletype_t};
++use crate::{wasm_functype_t, wasmtime_wasm_globaltype_t, wasmtime_wasm_memorytype_t, wasmtime_wasm_tabletype_t};
+ use crate::{CFuncType, CGlobalType, CMemoryType, CTableType};
+ use wasmtime::ExternType;
+ 
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_externtype_t {
++pub struct wasmtime_wasm_externtype_t {
+     pub(crate) which: CExternType,
+ }
+ 
+-wasmtime_c_api_macros::declare_ty!(wasm_externtype_t);
++wasmtime_c_api_macros::declare_ty!(wasmtime_wasm_externtype_t);
+ 
+ #[derive(Clone)]
+ pub(crate) enum CExternType {
+@@ -29,27 +29,27 @@ impl CExternType {
+     }
+ }
+ 
+-pub type wasm_externkind_t = u8;
++pub type wasmtime_wasm_externkind_t = u8;
+ 
+-pub const WASM_EXTERN_FUNC: wasm_externkind_t = 0;
+-pub const WASM_EXTERN_GLOBAL: wasm_externkind_t = 1;
+-pub const WASM_EXTERN_TABLE: wasm_externkind_t = 2;
+-pub const WASM_EXTERN_MEMORY: wasm_externkind_t = 3;
++pub const WASM_EXTERN_FUNC: wasmtime_wasm_externkind_t = 0;
++pub const WASM_EXTERN_GLOBAL: wasmtime_wasm_externkind_t = 1;
++pub const WASM_EXTERN_TABLE: wasmtime_wasm_externkind_t = 2;
++pub const WASM_EXTERN_MEMORY: wasmtime_wasm_externkind_t = 3;
+ 
+-impl wasm_externtype_t {
+-    pub(crate) fn from_extern_type(ty: ExternType) -> wasm_externtype_t {
+-        wasm_externtype_t {
++impl wasmtime_wasm_externtype_t {
++    pub(crate) fn from_extern_type(ty: ExternType) -> wasmtime_wasm_externtype_t {
++        wasmtime_wasm_externtype_t {
+             which: CExternType::new(ty),
+         }
+     }
+ 
+-    pub(crate) fn from_cextern_type(ty: CExternType) -> wasm_externtype_t {
+-        wasm_externtype_t { which: ty }
++    pub(crate) fn from_cextern_type(ty: CExternType) -> wasmtime_wasm_externtype_t {
++        wasmtime_wasm_externtype_t { which: ty }
+     }
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_externtype_kind(et: &wasm_externtype_t) -> wasm_externkind_t {
++pub extern "C" fn wasmtime_wasm_externtype_kind(et: &wasmtime_wasm_externtype_t) -> wasmtime_wasm_externkind_t {
+     match &et.which {
+         CExternType::Func(_) => WASM_EXTERN_FUNC,
+         CExternType::Table(_) => WASM_EXTERN_TABLE,
+@@ -59,55 +59,55 @@ pub extern "C" fn wasm_externtype_kind(et: &wasm_externtype_t) -> wasm_externkin
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_externtype_as_functype(et: &wasm_externtype_t) -> Option<&wasm_functype_t> {
+-    wasm_externtype_as_functype_const(et)
++pub extern "C" fn wasmtime_wasm_externtype_as_functype(et: &wasmtime_wasm_externtype_t) -> Option<&wasmtime_wasm_functype_t> {
++    wasmtime_wasm_externtype_as_functype_const(et)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_externtype_as_functype_const(
+-    et: &wasm_externtype_t,
+-) -> Option<&wasm_functype_t> {
+-    wasm_functype_t::try_from(et)
++pub extern "C" fn wasmtime_wasm_externtype_as_functype_const(
++    et: &wasmtime_wasm_externtype_t,
++) -> Option<&wasmtime_wasm_functype_t> {
++    wasmtime_wasm_functype_t::try_from(et)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_externtype_as_globaltype(
+-    et: &wasm_externtype_t,
+-) -> Option<&wasm_globaltype_t> {
+-    wasm_externtype_as_globaltype_const(et)
++pub extern "C" fn wasmtime_wasm_externtype_as_globaltype(
++    et: &wasmtime_wasm_externtype_t,
++) -> Option<&wasmtime_wasm_globaltype_t> {
++    wasmtime_wasm_externtype_as_globaltype_const(et)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_externtype_as_globaltype_const(
+-    et: &wasm_externtype_t,
+-) -> Option<&wasm_globaltype_t> {
+-    wasm_globaltype_t::try_from(et)
++pub extern "C" fn wasmtime_wasm_externtype_as_globaltype_const(
++    et: &wasmtime_wasm_externtype_t,
++) -> Option<&wasmtime_wasm_globaltype_t> {
++    wasmtime_wasm_globaltype_t::try_from(et)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_externtype_as_tabletype(
+-    et: &wasm_externtype_t,
+-) -> Option<&wasm_tabletype_t> {
+-    wasm_externtype_as_tabletype_const(et)
++pub extern "C" fn wasmtime_wasm_externtype_as_tabletype(
++    et: &wasmtime_wasm_externtype_t,
++) -> Option<&wasmtime_wasm_tabletype_t> {
++    wasmtime_wasm_externtype_as_tabletype_const(et)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_externtype_as_tabletype_const(
+-    et: &wasm_externtype_t,
+-) -> Option<&wasm_tabletype_t> {
+-    wasm_tabletype_t::try_from(et)
++pub extern "C" fn wasmtime_wasm_externtype_as_tabletype_const(
++    et: &wasmtime_wasm_externtype_t,
++) -> Option<&wasmtime_wasm_tabletype_t> {
++    wasmtime_wasm_tabletype_t::try_from(et)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_externtype_as_memorytype(
+-    et: &wasm_externtype_t,
+-) -> Option<&wasm_memorytype_t> {
+-    wasm_externtype_as_memorytype_const(et)
++pub extern "C" fn wasmtime_wasm_externtype_as_memorytype(
++    et: &wasmtime_wasm_externtype_t,
++) -> Option<&wasmtime_wasm_memorytype_t> {
++    wasmtime_wasm_externtype_as_memorytype_const(et)
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_externtype_as_memorytype_const(
+-    et: &wasm_externtype_t,
+-) -> Option<&wasm_memorytype_t> {
+-    wasm_memorytype_t::try_from(et)
++pub extern "C" fn wasmtime_wasm_externtype_as_memorytype_const(
++    et: &wasmtime_wasm_externtype_t,
++) -> Option<&wasmtime_wasm_memorytype_t> {
++    wasmtime_wasm_memorytype_t::try_from(et)
+ }
+diff --git a/crates/c-api/src/types/func.rs b/crates/c-api/src/types/func.rs
+index c2158902b2..3f89a495f8 100644
+--- a/crates/c-api/src/types/func.rs
++++ b/crates/c-api/src/types/func.rs
+@@ -1,4 +1,4 @@
+-use crate::{wasm_externtype_t, wasm_valtype_t, wasm_valtype_vec_t, CExternType};
++use crate::{wasm_externtype_t, wasmtime_wasm_valtype_t, wasmtime_wasm_valtype_vec_t, CExternType};
+ use once_cell::unsync::OnceCell;
+ use std::{
+     mem,
+@@ -8,11 +8,11 @@ use wasmtime::{Engine, FuncType, ValType};
+ 
+ #[repr(transparent)]
+ #[derive(Clone)]
+-pub struct wasm_functype_t {
+-    ext: wasm_externtype_t,
++pub struct wasmtime_wasm_functype_t {
++    ext: wasmtime_wasm_externtype_t,
+ }
+ 
+-wasmtime_c_api_macros::declare_ty!(wasm_functype_t);
++wasmtime_c_api_macros::declare_ty!(wasmtime_wasm_functype_t);
+ 
+ #[derive(Clone)]
+ enum LazyFuncType {
+@@ -83,26 +83,26 @@ impl<'a, T> ExactSizeIterator for LazyFuncTypeIter<'a, T> where T: ExactSizeIter
+ #[derive(Clone)]
+ pub(crate) struct CFuncType {
+     ty: Arc<Mutex<LazyFuncType>>,
+-    params_cache: OnceCell<wasm_valtype_vec_t>,
+-    returns_cache: OnceCell<wasm_valtype_vec_t>,
++    params_cache: OnceCell<wasmtime_wasm_valtype_vec_t>,
++    returns_cache: OnceCell<wasmtime_wasm_valtype_vec_t>,
+ }
+ 
+-impl wasm_functype_t {
+-    pub(crate) fn new(ty: FuncType) -> wasm_functype_t {
+-        wasm_functype_t {
+-            ext: wasm_externtype_t::from_extern_type(ty.into()),
++impl wasmtime_wasm_functype_t {
++    pub(crate) fn new(ty: FuncType) -> wasmtime_wasm_functype_t {
++        wasmtime_wasm_functype_t {
++            ext: wasmtime_wasm_externtype_t::from_extern_type(ty.into()),
+         }
+     }
+ 
+-    pub(crate) fn lazy(params: Vec<ValType>, results: Vec<ValType>) -> wasm_functype_t {
+-        wasm_functype_t {
+-            ext: wasm_externtype_t::from_cextern_type(CExternType::Func(CFuncType::lazy(
++    pub(crate) fn lazy(params: Vec<ValType>, results: Vec<ValType>) -> wasmtime_wasm_functype_t {
++        wasmtime_wasm_functype_t {
++            ext: wasmtime_wasm_externtype_t::from_cextern_type(CExternType::Func(CFuncType::lazy(
+                 params, results,
+             ))),
+         }
+     }
+ 
+-    pub(crate) fn try_from(e: &wasm_externtype_t) -> Option<&wasm_functype_t> {
++    pub(crate) fn try_from(e: &wasmtime_wasm_externtype_t) -> Option<&wasmtime_wasm_functype_t> {
+         match &e.which {
+             CExternType::Func(_) => Some(unsafe { &*(e as *const _ as *const _) }),
+             _ => None,
+@@ -141,10 +141,10 @@ impl CFuncType {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_functype_new(
+-    params: &mut wasm_valtype_vec_t,
+-    results: &mut wasm_valtype_vec_t,
+-) -> Box<wasm_functype_t> {
++pub extern "C" fn wasmtime_wasm_functype_new(
++    params: &mut wasmtime_wasm_valtype_vec_t,
++    results: &mut wasmtime_wasm_valtype_vec_t,
++) -> Box<wasmtime_wasm_functype_t> {
+     let params = params
+         .take()
+         .into_iter()
+@@ -155,39 +155,39 @@ pub extern "C" fn wasm_functype_new(
+         .into_iter()
+         .map(|vt| vt.unwrap().ty.clone())
+         .collect();
+-    Box::new(wasm_functype_t::lazy(params, results))
++    Box::new(wasmtime_wasm_functype_t::lazy(params, results))
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_functype_params(ft: &wasm_functype_t) -> &wasm_valtype_vec_t {
++pub extern "C" fn wasmtime_wasm_functype_params(ft: &wasmtime_wasm_functype_t) -> &wasmtime_wasm_valtype_vec_t {
+     let ft = ft.ty();
+     ft.params_cache.get_or_init(|| {
+         let ty = ft.ty.lock().unwrap();
+         ty.params()
+-            .map(|p| Some(Box::new(wasm_valtype_t { ty: p.clone() })))
++            .map(|p| Some(Box::new(wasmtime_wasm_valtype_t { ty: p.clone() })))
+             .collect::<Vec<_>>()
+             .into()
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_functype_results(ft: &wasm_functype_t) -> &wasm_valtype_vec_t {
++pub extern "C" fn wasmtime_wasm_functype_results(ft: &wasmtime_wasm_functype_t) -> &wasmtime_wasm_valtype_vec_t {
+     let ft = ft.ty();
+     ft.returns_cache.get_or_init(|| {
+         let ty = ft.ty.lock().unwrap();
+         ty.results()
+-            .map(|p| Some(Box::new(wasm_valtype_t { ty: p.clone() })))
++            .map(|p| Some(Box::new(wasmtime_wasm_valtype_t { ty: p.clone() })))
+             .collect::<Vec<_>>()
+             .into()
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_functype_as_externtype(ty: &wasm_functype_t) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_functype_as_externtype(ty: &wasmtime_wasm_functype_t) -> &wasmtime_wasm_externtype_t {
+     &ty.ext
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_functype_as_externtype_const(ty: &wasm_functype_t) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_functype_as_externtype_const(ty: &wasmtime_wasm_functype_t) -> &wasmtime_wasm_externtype_t {
+     &ty.ext
+ }
+diff --git a/crates/c-api/src/types/global.rs b/crates/c-api/src/types/global.rs
+index 176c418650..f2eb470445 100644
+--- a/crates/c-api/src/types/global.rs
++++ b/crates/c-api/src/types/global.rs
+@@ -1,34 +1,34 @@
+-use crate::{wasm_externtype_t, wasm_valtype_t, CExternType};
++use crate::{wasm_externtype_t, wasmtime_wasm_valtype_t, CExternType};
+ use once_cell::unsync::OnceCell;
+ use wasmtime::GlobalType;
+ 
+-pub type wasm_mutability_t = u8;
++pub type wasmtime_wasm_mutability_t = u8;
+ 
+-pub const WASM_CONST: wasm_mutability_t = 0;
+-pub const WASM_VAR: wasm_mutability_t = 1;
++pub const WASM_CONST: wasmtime_wasm_mutability_t = 0;
++pub const WASM_VAR: wasmtime_wasm_mutability_t = 1;
+ 
+ #[repr(transparent)]
+ #[derive(Clone)]
+-pub struct wasm_globaltype_t {
+-    ext: wasm_externtype_t,
++pub struct wasmtime_wasm_globaltype_t {
++    ext: wasmtime_wasm_externtype_t,
+ }
+ 
+-wasmtime_c_api_macros::declare_ty!(wasm_globaltype_t);
++wasmtime_c_api_macros::declare_ty!(wasmtime_wasm_globaltype_t);
+ 
+ #[derive(Clone)]
+ pub(crate) struct CGlobalType {
+     pub(crate) ty: GlobalType,
+-    content_cache: OnceCell<wasm_valtype_t>,
++    content_cache: OnceCell<wasmtime_wasm_valtype_t>,
+ }
+ 
+-impl wasm_globaltype_t {
+-    pub(crate) fn new(ty: GlobalType) -> wasm_globaltype_t {
+-        wasm_globaltype_t {
+-            ext: wasm_externtype_t::from_extern_type(ty.into()),
++impl wasmtime_wasm_globaltype_t {
++    pub(crate) fn new(ty: GlobalType) -> wasmtime_wasm_globaltype_t {
++        wasmtime_wasm_globaltype_t {
++            ext: wasmtime_wasm_externtype_t::from_extern_type(ty.into()),
+         }
+     }
+ 
+-    pub(crate) fn try_from(e: &wasm_externtype_t) -> Option<&wasm_globaltype_t> {
++    pub(crate) fn try_from(e: &wasmtime_wasm_externtype_t) -> Option<&wasmtime_wasm_globaltype_t> {
+         match &e.which {
+             CExternType::Global(_) => Some(unsafe { &*(e as *const _ as *const _) }),
+             _ => None,
+@@ -53,10 +53,10 @@ impl CGlobalType {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_globaltype_new(
+-    ty: Box<wasm_valtype_t>,
+-    mutability: wasm_mutability_t,
+-) -> Option<Box<wasm_globaltype_t>> {
++pub extern "C" fn wasmtime_wasm_globaltype_new(
++    ty: Box<wasmtime_wasm_valtype_t>,
++    mutability: wasmtime_wasm_mutability_t,
++) -> Option<Box<wasmtime_wasm_globaltype_t>> {
+     use wasmtime::Mutability::*;
+     let mutability = match mutability {
+         WASM_CONST => Const,
+@@ -64,19 +64,19 @@ pub extern "C" fn wasm_globaltype_new(
+         _ => return None,
+     };
+     let ty = GlobalType::new(ty.ty.clone(), mutability);
+-    Some(Box::new(wasm_globaltype_t::new(ty)))
++    Some(Box::new(wasmtime_wasm_globaltype_t::new(ty)))
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_globaltype_content(gt: &wasm_globaltype_t) -> &wasm_valtype_t {
++pub extern "C" fn wasmtime_wasm_globaltype_content(gt: &wasmtime_wasm_globaltype_t) -> &wasmtime_wasm_valtype_t {
+     let gt = gt.ty();
+-    gt.content_cache.get_or_init(|| wasm_valtype_t {
++    gt.content_cache.get_or_init(|| wasmtime_wasm_valtype_t {
+         ty: gt.ty.content().clone(),
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_globaltype_mutability(gt: &wasm_globaltype_t) -> wasm_mutability_t {
++pub extern "C" fn wasmtime_wasm_globaltype_mutability(gt: &wasmtime_wasm_globaltype_t) -> wasmtime_wasm_mutability_t {
+     use wasmtime::Mutability::*;
+     let gt = gt.ty();
+     match gt.ty.mutability() {
+@@ -86,13 +86,13 @@ pub extern "C" fn wasm_globaltype_mutability(gt: &wasm_globaltype_t) -> wasm_mut
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_globaltype_as_externtype(ty: &wasm_globaltype_t) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_globaltype_as_externtype(ty: &wasmtime_wasm_globaltype_t) -> &wasmtime_wasm_externtype_t {
+     &ty.ext
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_globaltype_as_externtype_const(
+-    ty: &wasm_globaltype_t,
+-) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_globaltype_as_externtype_const(
++    ty: &wasmtime_wasm_globaltype_t,
++) -> &wasmtime_wasm_externtype_t {
+     &ty.ext
+ }
+diff --git a/crates/c-api/src/types/import.rs b/crates/c-api/src/types/import.rs
+index 9484ab5280..a2d96fae9f 100644
+--- a/crates/c-api/src/types/import.rs
++++ b/crates/c-api/src/types/import.rs
+@@ -1,22 +1,22 @@
+-use crate::{wasm_externtype_t, wasm_name_t, CExternType};
++use crate::{wasm_externtype_t, wasmtime_wasm_name_t, CExternType};
+ use once_cell::unsync::OnceCell;
+ 
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_importtype_t {
++pub struct wasmtime_wasm_importtype_t {
+     pub(crate) module: String,
+     pub(crate) name: String,
+     pub(crate) ty: CExternType,
+-    module_cache: OnceCell<wasm_name_t>,
+-    name_cache: OnceCell<wasm_name_t>,
+-    type_cache: OnceCell<wasm_externtype_t>,
++    module_cache: OnceCell<wasmtime_wasm_name_t>,
++    name_cache: OnceCell<wasmtime_wasm_name_t>,
++    type_cache: OnceCell<wasmtime_wasm_externtype_t>,
+ }
+ 
+-wasmtime_c_api_macros::declare_ty!(wasm_importtype_t);
++wasmtime_c_api_macros::declare_ty!(wasmtime_wasm_importtype_t);
+ 
+-impl wasm_importtype_t {
+-    pub(crate) fn new(module: String, name: String, ty: CExternType) -> wasm_importtype_t {
+-        wasm_importtype_t {
++impl wasmtime_wasm_importtype_t {
++    pub(crate) fn new(module: String, name: String, ty: CExternType) -> wasmtime_wasm_importtype_t {
++        wasmtime_wasm_importtype_t {
+             module,
+             name,
+             ty,
+@@ -28,16 +28,16 @@ impl wasm_importtype_t {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_importtype_new(
+-    module: &mut wasm_name_t,
+-    name: &mut wasm_name_t,
+-    ty: Box<wasm_externtype_t>,
+-) -> Option<Box<wasm_importtype_t>> {
++pub extern "C" fn wasmtime_wasm_importtype_new(
++    module: &mut wasmtime_wasm_name_t,
++    name: &mut wasmtime_wasm_name_t,
++    ty: Box<wasmtime_wasm_externtype_t>,
++) -> Option<Box<wasmtime_wasm_importtype_t>> {
+     let module = module.take();
+     let name = name.take();
+     let module = String::from_utf8(module).ok()?;
+     let name = String::from_utf8(name).ok()?;
+-    Some(Box::new(wasm_importtype_t::new(
++    Some(Box::new(wasmtime_wasm_importtype_t::new(
+         module,
+         name,
+         ty.which.clone(),
+@@ -45,19 +45,19 @@ pub extern "C" fn wasm_importtype_new(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_importtype_module(it: &wasm_importtype_t) -> &wasm_name_t {
++pub extern "C" fn wasmtime_wasm_importtype_module(it: &wasmtime_wasm_importtype_t) -> &wasmtime_wasm_name_t {
+     it.module_cache
+-        .get_or_init(|| wasm_name_t::from_name(it.module.clone()))
++        .get_or_init(|| wasmtime_wasm_name_t::from_name(it.module.clone()))
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_importtype_name(it: &wasm_importtype_t) -> &wasm_name_t {
++pub extern "C" fn wasmtime_wasm_importtype_name(it: &wasmtime_wasm_importtype_t) -> &wasmtime_wasm_name_t {
+     it.name_cache
+-        .get_or_init(|| wasm_name_t::from_name(it.name.to_string()))
++        .get_or_init(|| wasmtime_wasm_name_t::from_name(it.name.to_string()))
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_importtype_type(it: &wasm_importtype_t) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_importtype_type(it: &wasmtime_wasm_importtype_t) -> &wasmtime_wasm_externtype_t {
+     it.type_cache
+-        .get_or_init(|| wasm_externtype_t::from_cextern_type(it.ty.clone()))
++        .get_or_init(|| wasmtime_wasm_externtype_t::from_cextern_type(it.ty.clone()))
+ }
+diff --git a/crates/c-api/src/types/memory.rs b/crates/c-api/src/types/memory.rs
+index bcdb933d7c..8dc23e7a9f 100644
+--- a/crates/c-api/src/types/memory.rs
++++ b/crates/c-api/src/types/memory.rs
+@@ -1,30 +1,30 @@
+-use crate::{wasm_externtype_t, wasm_limits_t, CExternType};
++use crate::{wasm_externtype_t, wasmtime_wasm_limits_t, CExternType};
+ use once_cell::unsync::OnceCell;
+ use std::convert::TryFrom;
+ use wasmtime::MemoryType;
+ 
+ #[repr(transparent)]
+ #[derive(Clone)]
+-pub struct wasm_memorytype_t {
+-    ext: wasm_externtype_t,
++pub struct wasmtime_wasm_memorytype_t {
++    ext: wasmtime_wasm_externtype_t,
+ }
+ 
+-wasmtime_c_api_macros::declare_ty!(wasm_memorytype_t);
++wasmtime_c_api_macros::declare_ty!(wasmtime_wasm_memorytype_t);
+ 
+ #[derive(Clone)]
+ pub(crate) struct CMemoryType {
+     pub(crate) ty: MemoryType,
+-    limits_cache: OnceCell<wasm_limits_t>,
++    limits_cache: OnceCell<wasmtime_wasm_limits_t>,
+ }
+ 
+-impl wasm_memorytype_t {
+-    pub(crate) fn new(ty: MemoryType) -> wasm_memorytype_t {
+-        wasm_memorytype_t {
+-            ext: wasm_externtype_t::from_extern_type(ty.into()),
++impl wasmtime_wasm_memorytype_t {
++    pub(crate) fn new(ty: MemoryType) -> wasmtime_wasm_memorytype_t {
++        wasmtime_wasm_memorytype_t {
++            ext: wasmtime_wasm_externtype_t::from_extern_type(ty.into()),
+         }
+     }
+ 
+-    pub(crate) fn try_from(e: &wasm_externtype_t) -> Option<&wasm_memorytype_t> {
++    pub(crate) fn try_from(e: &wasmtime_wasm_externtype_t) -> Option<&wasmtime_wasm_memorytype_t> {
+         match &e.which {
+             CExternType::Memory(_) => Some(unsafe { &*(e as *const _ as *const _) }),
+             _ => None,
+@@ -49,17 +49,17 @@ impl CMemoryType {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_memorytype_new(limits: &wasm_limits_t) -> Box<wasm_memorytype_t> {
+-    Box::new(wasm_memorytype_t::new(MemoryType::new(
++pub extern "C" fn wasmtime_wasm_memorytype_new(limits: &wasmtime_wasm_limits_t) -> Box<wasmtime_wasm_memorytype_t> {
++    Box::new(wasmtime_wasm_memorytype_t::new(MemoryType::new(
+         limits.min,
+         limits.max(),
+     )))
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_memorytype_limits(mt: &wasm_memorytype_t) -> &wasm_limits_t {
++pub extern "C" fn wasmtime_wasm_memorytype_limits(mt: &wasmtime_wasm_memorytype_t) -> &wasmtime_wasm_limits_t {
+     let mt = mt.ty();
+-    mt.limits_cache.get_or_init(|| wasm_limits_t {
++    mt.limits_cache.get_or_init(|| wasmtime_wasm_limits_t {
+         min: u32::try_from(mt.ty.minimum()).unwrap(),
+         max: u32::try_from(mt.ty.maximum().unwrap_or(u64::from(u32::max_value()))).unwrap(),
+     })
+@@ -71,13 +71,13 @@ pub extern "C" fn wasmtime_memorytype_new(
+     maximum_specified: bool,
+     maximum: u64,
+     memory64: bool,
+-) -> Box<wasm_memorytype_t> {
++) -> Box<wasmtime_wasm_memorytype_t> {
+     let maximum = if maximum_specified {
+         Some(maximum)
+     } else {
+         None
+     };
+-    Box::new(wasm_memorytype_t::new(if memory64 {
++    Box::new(wasmtime_wasm_memorytype_t::new(if memory64 {
+         MemoryType::new64(minimum, maximum)
+     } else {
+         MemoryType::new(
+@@ -88,12 +88,12 @@ pub extern "C" fn wasmtime_memorytype_new(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_memorytype_minimum(mt: &wasm_memorytype_t) -> u64 {
++pub extern "C" fn wasmtime_memorytype_minimum(mt: &wasmtime_wasm_memorytype_t) -> u64 {
+     mt.ty().ty.minimum()
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_memorytype_maximum(mt: &wasm_memorytype_t, out: &mut u64) -> bool {
++pub extern "C" fn wasmtime_memorytype_maximum(mt: &wasmtime_wasm_memorytype_t, out: &mut u64) -> bool {
+     match mt.ty().ty.maximum() {
+         Some(max) => {
+             *out = max;
+@@ -104,23 +104,23 @@ pub extern "C" fn wasmtime_memorytype_maximum(mt: &wasm_memorytype_t, out: &mut
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_memorytype_is64(mt: &wasm_memorytype_t) -> bool {
++pub extern "C" fn wasmtime_memorytype_is64(mt: &wasmtime_wasm_memorytype_t) -> bool {
+     mt.ty().ty.is_64()
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasmtime_memorytype_isshared(mt: &wasm_memorytype_t) -> bool {
++pub extern "C" fn wasmtime_memorytype_isshared(mt: &wasmtime_wasm_memorytype_t) -> bool {
+     mt.ty().ty.is_shared()
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_memorytype_as_externtype(ty: &wasm_memorytype_t) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_memorytype_as_externtype(ty: &wasmtime_wasm_memorytype_t) -> &wasmtime_wasm_externtype_t {
+     &ty.ext
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_memorytype_as_externtype_const(
+-    ty: &wasm_memorytype_t,
+-) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_memorytype_as_externtype_const(
++    ty: &wasmtime_wasm_memorytype_t,
++) -> &wasmtime_wasm_externtype_t {
+     &ty.ext
+ }
+diff --git a/crates/c-api/src/types/table.rs b/crates/c-api/src/types/table.rs
+index a31b5ef107..0b7d041c9c 100644
+--- a/crates/c-api/src/types/table.rs
++++ b/crates/c-api/src/types/table.rs
+@@ -1,30 +1,30 @@
+-use crate::{wasm_externtype_t, wasm_limits_t, wasm_valtype_t, CExternType};
++use crate::{wasm_externtype_t, wasmtime_wasm_limits_t, wasmtime_wasm_valtype_t, CExternType};
+ use once_cell::unsync::OnceCell;
+ use wasmtime::{TableType, ValType};
+ 
+ #[repr(transparent)]
+ #[derive(Clone)]
+-pub struct wasm_tabletype_t {
+-    ext: wasm_externtype_t,
++pub struct wasmtime_wasm_tabletype_t {
++    ext: wasmtime_wasm_externtype_t,
+ }
+ 
+-wasmtime_c_api_macros::declare_ty!(wasm_tabletype_t);
++wasmtime_c_api_macros::declare_ty!(wasmtime_wasm_tabletype_t);
+ 
+ #[derive(Clone)]
+ pub(crate) struct CTableType {
+     pub(crate) ty: TableType,
+-    element_cache: OnceCell<wasm_valtype_t>,
+-    limits_cache: OnceCell<wasm_limits_t>,
++    element_cache: OnceCell<wasmtime_wasm_valtype_t>,
++    limits_cache: OnceCell<wasmtime_wasm_limits_t>,
+ }
+ 
+-impl wasm_tabletype_t {
+-    pub(crate) fn new(ty: TableType) -> wasm_tabletype_t {
+-        wasm_tabletype_t {
+-            ext: wasm_externtype_t::from_extern_type(ty.into()),
++impl wasmtime_wasm_tabletype_t {
++    pub(crate) fn new(ty: TableType) -> wasmtime_wasm_tabletype_t {
++        wasmtime_wasm_tabletype_t {
++            ext: wasmtime_wasm_externtype_t::from_extern_type(ty.into()),
+         }
+     }
+ 
+-    pub(crate) fn try_from(e: &wasm_externtype_t) -> Option<&wasm_tabletype_t> {
++    pub(crate) fn try_from(e: &wasmtime_wasm_externtype_t) -> Option<&wasmtime_wasm_tabletype_t> {
+         match &e.which {
+             CExternType::Table(_) => Some(unsafe { &*(e as *const _ as *const _) }),
+             _ => None,
+@@ -50,12 +50,12 @@ impl CTableType {
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_tabletype_new(
+-    ty: Box<wasm_valtype_t>,
+-    limits: &wasm_limits_t,
+-) -> Option<Box<wasm_tabletype_t>> {
++pub extern "C" fn wasmtime_wasm_tabletype_new(
++    ty: Box<wasmtime_wasm_valtype_t>,
++    limits: &wasmtime_wasm_limits_t,
++) -> Option<Box<wasmtime_wasm_tabletype_t>> {
+     let ty = ty.ty.as_ref()?.clone();
+-    Some(Box::new(wasm_tabletype_t::new(TableType::new(
++    Some(Box::new(wasmtime_wasm_tabletype_t::new(TableType::new(
+         ty,
+         limits.min,
+         limits.max(),
+@@ -63,28 +63,28 @@ pub extern "C" fn wasm_tabletype_new(
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_tabletype_element(tt: &wasm_tabletype_t) -> &wasm_valtype_t {
++pub extern "C" fn wasmtime_wasm_tabletype_element(tt: &wasmtime_wasm_tabletype_t) -> &wasmtime_wasm_valtype_t {
+     let tt = tt.ty();
+-    tt.element_cache.get_or_init(|| wasm_valtype_t {
++    tt.element_cache.get_or_init(|| wasmtime_wasm_valtype_t {
+         ty: ValType::Ref(tt.ty.element().clone()),
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_tabletype_limits(tt: &wasm_tabletype_t) -> &wasm_limits_t {
++pub extern "C" fn wasmtime_wasm_tabletype_limits(tt: &wasmtime_wasm_tabletype_t) -> &wasmtime_wasm_limits_t {
+     let tt = tt.ty();
+-    tt.limits_cache.get_or_init(|| wasm_limits_t {
++    tt.limits_cache.get_or_init(|| wasmtime_wasm_limits_t {
+         min: tt.ty.minimum(),
+         max: tt.ty.maximum().unwrap_or(u32::max_value()),
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_tabletype_as_externtype(ty: &wasm_tabletype_t) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_tabletype_as_externtype(ty: &wasmtime_wasm_tabletype_t) -> &wasmtime_wasm_externtype_t {
+     &ty.ext
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_tabletype_as_externtype_const(ty: &wasm_tabletype_t) -> &wasm_externtype_t {
++pub extern "C" fn wasmtime_wasm_tabletype_as_externtype_const(ty: &wasmtime_wasm_tabletype_t) -> &wasmtime_wasm_externtype_t {
+     &ty.ext
+ }
+diff --git a/crates/c-api/src/types/val.rs b/crates/c-api/src/types/val.rs
+index 8fac9aed64..6b54b889cf 100644
+--- a/crates/c-api/src/types/val.rs
++++ b/crates/c-api/src/types/val.rs
+@@ -2,33 +2,33 @@ use wasmtime::{HeapType, ValType};
+ 
+ #[repr(C)]
+ #[derive(Clone)]
+-pub struct wasm_valtype_t {
++pub struct wasmtime_wasm_valtype_t {
+     pub(crate) ty: ValType,
+ }
+ 
+-wasmtime_c_api_macros::declare_ty!(wasm_valtype_t);
++wasmtime_c_api_macros::declare_ty!(wasmtime_wasm_valtype_t);
+ 
+-pub type wasm_valkind_t = u8;
+-pub const WASM_I32: wasm_valkind_t = 0;
+-pub const WASM_I64: wasm_valkind_t = 1;
+-pub const WASM_F32: wasm_valkind_t = 2;
+-pub const WASM_F64: wasm_valkind_t = 3;
+-pub const WASM_EXTERNREF: wasm_valkind_t = 128;
+-pub const WASM_FUNCREF: wasm_valkind_t = 129;
++pub type wasmtime_wasm_valkind_t = u8;
++pub const WASM_I32: wasmtime_wasm_valkind_t = 0;
++pub const WASM_I64: wasmtime_wasm_valkind_t = 1;
++pub const WASM_F32: wasmtime_wasm_valkind_t = 2;
++pub const WASM_F64: wasmtime_wasm_valkind_t = 3;
++pub const WASM_EXTERNREF: wasmtime_wasm_valkind_t = 128;
++pub const WASM_FUNCREF: wasmtime_wasm_valkind_t = 129;
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_valtype_new(kind: wasm_valkind_t) -> Box<wasm_valtype_t> {
+-    Box::new(wasm_valtype_t {
++pub extern "C" fn wasmtime_wasm_valtype_new(kind: wasmtime_wasm_valkind_t) -> Box<wasmtime_wasm_valtype_t> {
++    Box::new(wasmtime_wasm_valtype_t {
+         ty: into_valtype(kind),
+     })
+ }
+ 
+ #[no_mangle]
+-pub extern "C" fn wasm_valtype_kind(vt: &wasm_valtype_t) -> wasm_valkind_t {
++pub extern "C" fn wasmtime_wasm_valtype_kind(vt: &wasmtime_wasm_valtype_t) -> wasmtime_wasm_valkind_t {
+     from_valtype(&vt.ty)
+ }
+ 
+-pub(crate) fn into_valtype(kind: wasm_valkind_t) -> ValType {
++pub(crate) fn into_valtype(kind: wasmtime_wasm_valkind_t) -> ValType {
+     match kind {
+         WASM_I32 => ValType::I32,
+         WASM_I64 => ValType::I64,
+@@ -41,7 +41,7 @@ pub(crate) fn into_valtype(kind: wasm_valkind_t) -> ValType {
+     }
+ }
+ 
+-pub(crate) fn from_valtype(ty: &ValType) -> wasm_valkind_t {
++pub(crate) fn from_valtype(ty: &ValType) -> wasmtime_wasm_valkind_t {
+     match ty {
+         ValType::I32 => WASM_I32,
+         ValType::I64 => WASM_I64,
+diff --git a/crates/c-api/src/val.rs b/crates/c-api/src/val.rs
+index 070462d636..6e61480b94 100644
+--- a/crates/c-api/src/val.rs
++++ b/crates/c-api/src/val.rs
+@@ -1,6 +1,6 @@
+ use crate::r#ref::ref_to_val;
+ use crate::{
+-    from_valtype, into_valtype, wasm_ref_t, wasm_valkind_t, wasmtime_anyref_t,
++    from_valtype, into_valtype, wasmtime_wasm_ref_t, wasmtime_wasm_valkind_t, wasmtime_anyref_t,
+     wasmtime_externref_t, wasmtime_valkind_t, WasmtimeStoreContextMut, WASM_I32,
+ };
+ use std::mem::{ManuallyDrop, MaybeUninit};
+@@ -8,24 +8,24 @@ use std::ptr;
+ use wasmtime::{AsContextMut, Func, HeapType, Ref, RootScope, Val, ValType};
+ 
+ #[repr(C)]
+-pub struct wasm_val_t {
+-    pub kind: wasm_valkind_t,
+-    pub of: wasm_val_union,
++pub struct wasmtime_wasm_val_t {
++    pub kind: wasmtime_wasm_valkind_t,
++    pub of: wasmtime_wasm_val_union,
+ }
+ 
+ #[repr(C)]
+ #[derive(Copy, Clone)]
+-pub union wasm_val_union {
++pub union wasmtime_wasm_val_union {
+     pub i32: i32,
+     pub i64: i64,
+     pub u32: u32,
+     pub u64: u64,
+     pub f32: f32,
+     pub f64: f64,
+-    pub ref_: *mut wasm_ref_t,
++    pub ref_: *mut wasmtime_wasm_ref_t,
+ }
+ 
+-impl Drop for wasm_val_t {
++impl Drop for wasmtime_wasm_val_t {
+     fn drop(&mut self) {
+         match into_valtype(self.kind) {
+             ValType::Ref(_) => unsafe {
+@@ -38,9 +38,9 @@ impl Drop for wasm_val_t {
+     }
+ }
+ 
+-impl Clone for wasm_val_t {
++impl Clone for wasmtime_wasm_val_t {
+     fn clone(&self) -> Self {
+-        let mut ret = wasm_val_t {
++        let mut ret = wasmtime_wasm_val_t {
+             kind: self.kind,
+             of: self.of,
+         };
+@@ -56,47 +56,47 @@ impl Clone for wasm_val_t {
+     }
+ }
+ 
+-impl Default for wasm_val_t {
++impl Default for wasmtime_wasm_val_t {
+     fn default() -> Self {
+-        wasm_val_t {
++        wasmtime_wasm_val_t {
+             kind: WASM_I32,
+-            of: wasm_val_union { i32: 0 },
++            of: wasmtime_wasm_val_union { i32: 0 },
+         }
+     }
+ }
+ 
+-impl wasm_val_t {
+-    pub fn from_val(val: Val) -> wasm_val_t {
++impl wasmtime_wasm_val_t {
++    pub fn from_val(val: Val) -> wasmtime_wasm_val_t {
+         match val {
+-            Val::I32(i) => wasm_val_t {
++            Val::I32(i) => wasmtime_wasm_val_t {
+                 kind: from_valtype(&ValType::I32),
+-                of: wasm_val_union { i32: i },
++                of: wasmtime_wasm_val_union { i32: i },
+             },
+-            Val::I64(i) => wasm_val_t {
++            Val::I64(i) => wasmtime_wasm_val_t {
+                 kind: from_valtype(&ValType::I64),
+-                of: wasm_val_union { i64: i },
++                of: wasmtime_wasm_val_union { i64: i },
+             },
+-            Val::F32(f) => wasm_val_t {
++            Val::F32(f) => wasmtime_wasm_val_t {
+                 kind: from_valtype(&ValType::F32),
+-                of: wasm_val_union { u32: f },
++                of: wasmtime_wasm_val_union { u32: f },
+             },
+-            Val::F64(f) => wasm_val_t {
++            Val::F64(f) => wasmtime_wasm_val_t {
+                 kind: from_valtype(&ValType::F64),
+-                of: wasm_val_union { u64: f },
++                of: wasmtime_wasm_val_union { u64: f },
+             },
+-            Val::FuncRef(f) => wasm_val_t {
++            Val::FuncRef(f) => wasmtime_wasm_val_t {
+                 kind: from_valtype(&ValType::FUNCREF),
+-                of: wasm_val_union {
++                of: wasmtime_wasm_val_union {
+                     ref_: f.map_or(ptr::null_mut(), |f| {
+-                        Box::into_raw(Box::new(wasm_ref_t {
++                        Box::into_raw(Box::new(wasmtime_wasm_ref_t {
+                             r: Ref::Func(Some(f)),
+                         }))
+                     }),
+                 },
+             },
+-            Val::AnyRef(_) => crate::abort("creating a wasm_val_t from an anyref"),
+-            Val::ExternRef(_) => crate::abort("creating a wasm_val_t from an externref"),
+-            Val::V128(_) => crate::abort("creating a wasm_val_t from a v128"),
++            Val::AnyRef(_) => crate::abort("creating a wasmtime_wasm_val_t from an anyref"),
++            Val::ExternRef(_) => crate::abort("creating a wasmtime_wasm_val_t from an externref"),
++            Val::V128(_) => crate::abort("creating a wasmtime_wasm_val_t from a v128"),
+         }
+     }
+ 
+@@ -123,12 +123,12 @@ impl wasm_val_t {
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_val_copy(out: &mut MaybeUninit<wasm_val_t>, source: &wasm_val_t) {
++pub unsafe extern "C" fn wasmtime_wasm_val_copy(out: &mut MaybeUninit<wasmtime_wasm_val_t>, source: &wasmtime_wasm_val_t) {
+     crate::initialize(out, source.clone());
+ }
+ 
+ #[no_mangle]
+-pub unsafe extern "C" fn wasm_val_delete(val: *mut wasm_val_t) {
++pub unsafe extern "C" fn wasmtime_wasm_val_delete(val: *mut wasmtime_wasm_val_t) {
+     ptr::drop_in_place(val);
+ }
+ 
+diff --git a/crates/c-api/src/vec.rs b/crates/c-api/src/vec.rs
+index 7a5aae734f..3108e1b730 100644
+--- a/crates/c-api/src/vec.rs
++++ b/crates/c-api/src/vec.rs
+@@ -1,17 +1,17 @@
+ use crate::{
+-    wasm_exporttype_t, wasm_extern_t, wasm_externtype_t, wasm_frame_t, wasm_functype_t,
+-    wasm_globaltype_t, wasm_importtype_t, wasm_memorytype_t, wasm_tabletype_t, wasm_val_t,
+-    wasm_valtype_t,
++    wasmtime_wasm_exporttype_t, wasmtime_wasm_extern_t, wasmtime_wasm_externtype_t, wasmtime_wasm_frame_t, wasmtime_wasm_functype_t,
++    wasmtime_wasm_globaltype_t, wasmtime_wasm_importtype_t, wasmtime_wasm_memorytype_t, wasmtime_wasm_tabletype_t, wasmtime_wasm_val_t,
++    wasmtime_wasm_valtype_t,
+ };
+ use std::mem;
+ use std::mem::MaybeUninit;
+ use std::ptr;
+ use std::slice;
+ 
+-pub type wasm_name_t = wasm_byte_vec_t;
++pub type wasmtime_wasm_name_t = wasmtime_wasm_byte_vec_t;
+ 
+-impl wasm_name_t {
+-    pub(crate) fn from_name(name: String) -> wasm_name_t {
++impl wasmtime_wasm_name_t {
++    pub(crate) fn from_name(name: String) -> wasmtime_wasm_name_t {
+         name.into_bytes().into()
+     }
+ }
+@@ -141,111 +141,111 @@ macro_rules! declare_vecs {
+ 
+ declare_vecs! {
+     (
+-        name: wasm_byte_vec_t,
++        name: wasmtime_wasm_byte_vec_t,
+         ty: u8,
+-        new: wasm_byte_vec_new,
+-        empty: wasm_byte_vec_new_empty,
+-        uninit: wasm_byte_vec_new_uninitialized,
+-        copy: wasm_byte_vec_copy,
+-        delete: wasm_byte_vec_delete,
++        new: wasmtime_wasm_byte_vec_new,
++        empty: wasmtime_wasm_byte_vec_new_empty,
++        uninit: wasmtime_wasm_byte_vec_new_uninitialized,
++        copy: wasmtime_wasm_byte_vec_copy,
++        delete: wasmtime_wasm_byte_vec_delete,
+     )
+     (
+-        name: wasm_valtype_vec_t,
+-        ty: Option<Box<wasm_valtype_t>>,
+-        new: wasm_valtype_vec_new,
+-        empty: wasm_valtype_vec_new_empty,
+-        uninit: wasm_valtype_vec_new_uninitialized,
+-        copy: wasm_valtype_vec_copy,
+-        delete: wasm_valtype_vec_delete,
++        name: wasmtime_wasm_valtype_vec_t,
++        ty: Option<Box<wasmtime_wasm_valtype_t>>,
++        new: wasmtime_wasm_valtype_vec_new,
++        empty: wasmtime_wasm_valtype_vec_new_empty,
++        uninit: wasmtime_wasm_valtype_vec_new_uninitialized,
++        copy: wasmtime_wasm_valtype_vec_copy,
++        delete: wasmtime_wasm_valtype_vec_delete,
+     )
+     (
+-        name: wasm_functype_vec_t,
+-        ty: Option<Box<wasm_functype_t>>,
+-        new: wasm_functype_vec_new,
+-        empty: wasm_functype_vec_new_empty,
+-        uninit: wasm_functype_vec_new_uninitialized,
+-        copy: wasm_functype_vec_copy,
+-        delete: wasm_functype_vec_delete,
++        name: wasmtime_wasm_functype_vec_t,
++        ty: Option<Box<wasmtime_wasm_functype_t>>,
++        new: wasmtime_wasm_functype_vec_new,
++        empty: wasmtime_wasm_functype_vec_new_empty,
++        uninit: wasmtime_wasm_functype_vec_new_uninitialized,
++        copy: wasmtime_wasm_functype_vec_copy,
++        delete: wasmtime_wasm_functype_vec_delete,
+     )
+     (
+-        name: wasm_globaltype_vec_t,
+-        ty: Option<Box<wasm_globaltype_t>>,
+-        new: wasm_globaltype_vec_new,
+-        empty: wasm_globaltype_vec_new_empty,
+-        uninit: wasm_globaltype_vec_new_uninitialized,
+-        copy: wasm_globaltype_vec_copy,
+-        delete: wasm_globaltype_vec_delete,
++        name: wasmtime_wasm_globaltype_vec_t,
++        ty: Option<Box<wasmtime_wasm_globaltype_t>>,
++        new: wasmtime_wasm_globaltype_vec_new,
++        empty: wasmtime_wasm_globaltype_vec_new_empty,
++        uninit: wasmtime_wasm_globaltype_vec_new_uninitialized,
++        copy: wasmtime_wasm_globaltype_vec_copy,
++        delete: wasmtime_wasm_globaltype_vec_delete,
+     )
+     (
+-        name: wasm_tabletype_vec_t,
+-        ty: Option<Box<wasm_tabletype_t>>,
+-        new: wasm_tabletype_vec_new,
+-        empty: wasm_tabletype_vec_new_empty,
+-        uninit: wasm_tabletype_vec_new_uninitialized,
+-        copy: wasm_tabletype_vec_copy,
+-        delete: wasm_tabletype_vec_delete,
++        name: wasmtime_wasm_tabletype_vec_t,
++        ty: Option<Box<wasmtime_wasm_tabletype_t>>,
++        new: wasmtime_wasm_tabletype_vec_new,
++        empty: wasmtime_wasm_tabletype_vec_new_empty,
++        uninit: wasmtime_wasm_tabletype_vec_new_uninitialized,
++        copy: wasmtime_wasm_tabletype_vec_copy,
++        delete: wasmtime_wasm_tabletype_vec_delete,
+     )
+     (
+-        name: wasm_memorytype_vec_t,
+-        ty: Option<Box<wasm_memorytype_t>>,
+-        new: wasm_memorytype_vec_new,
+-        empty: wasm_memorytype_vec_new_empty,
+-        uninit: wasm_memorytype_vec_new_uninitialized,
+-        copy: wasm_memorytype_vec_copy,
+-        delete: wasm_memorytype_vec_delete,
++        name: wasmtime_wasm_memorytype_vec_t,
++        ty: Option<Box<wasmtime_wasm_memorytype_t>>,
++        new: wasmtime_wasm_memorytype_vec_new,
++        empty: wasmtime_wasm_memorytype_vec_new_empty,
++        uninit: wasmtime_wasm_memorytype_vec_new_uninitialized,
++        copy: wasmtime_wasm_memorytype_vec_copy,
++        delete: wasmtime_wasm_memorytype_vec_delete,
+     )
+     (
+-        name: wasm_externtype_vec_t,
+-        ty: Option<Box<wasm_externtype_t>>,
+-        new: wasm_externtype_vec_new,
+-        empty: wasm_externtype_vec_new_empty,
+-        uninit: wasm_externtype_vec_new_uninitialized,
+-        copy: wasm_externtype_vec_copy,
+-        delete: wasm_externtype_vec_delete,
++        name: wasmtime_wasm_externtype_vec_t,
++        ty: Option<Box<wasmtime_wasm_externtype_t>>,
++        new: wasmtime_wasm_externtype_vec_new,
++        empty: wasmtime_wasm_externtype_vec_new_empty,
++        uninit: wasmtime_wasm_externtype_vec_new_uninitialized,
++        copy: wasmtime_wasm_externtype_vec_copy,
++        delete: wasmtime_wasm_externtype_vec_delete,
+     )
+     (
+-        name: wasm_importtype_vec_t,
+-        ty: Option<Box<wasm_importtype_t>>,
+-        new: wasm_importtype_vec_new,
+-        empty: wasm_importtype_vec_new_empty,
+-        uninit: wasm_importtype_vec_new_uninitialized,
+-        copy: wasm_importtype_vec_copy,
+-        delete: wasm_importtype_vec_delete,
++        name: wasmtime_wasm_importtype_vec_t,
++        ty: Option<Box<wasmtime_wasm_importtype_t>>,
++        new: wasmtime_wasm_importtype_vec_new,
++        empty: wasmtime_wasm_importtype_vec_new_empty,
++        uninit: wasmtime_wasm_importtype_vec_new_uninitialized,
++        copy: wasmtime_wasm_importtype_vec_copy,
++        delete: wasmtime_wasm_importtype_vec_delete,
+     )
+     (
+-        name: wasm_exporttype_vec_t,
+-        ty: Option<Box<wasm_exporttype_t>>,
+-        new: wasm_exporttype_vec_new,
+-        empty: wasm_exporttype_vec_new_empty,
+-        uninit: wasm_exporttype_vec_new_uninitialized,
+-        copy: wasm_exporttype_vec_copy,
+-        delete: wasm_exporttype_vec_delete,
++        name: wasmtime_wasm_exporttype_vec_t,
++        ty: Option<Box<wasmtime_wasm_exporttype_t>>,
++        new: wasmtime_wasm_exporttype_vec_new,
++        empty: wasmtime_wasm_exporttype_vec_new_empty,
++        uninit: wasmtime_wasm_exporttype_vec_new_uninitialized,
++        copy: wasmtime_wasm_exporttype_vec_copy,
++        delete: wasmtime_wasm_exporttype_vec_delete,
+     )
+     (
+-        name: wasm_val_vec_t,
+-        ty: wasm_val_t,
+-        new: wasm_val_vec_new,
+-        empty: wasm_val_vec_new_empty,
+-        uninit: wasm_val_vec_new_uninitialized,
+-        copy: wasm_val_vec_copy,
+-        delete: wasm_val_vec_delete,
++        name: wasmtime_wasm_val_vec_t,
++        ty: wasmtime_wasm_val_t,
++        new: wasmtime_wasm_val_vec_new,
++        empty: wasmtime_wasm_val_vec_new_empty,
++        uninit: wasmtime_wasm_val_vec_new_uninitialized,
++        copy: wasmtime_wasm_val_vec_copy,
++        delete: wasmtime_wasm_val_vec_delete,
+     )
+     (
+-        name: wasm_frame_vec_t<'a>,
+-        ty: Option<Box<wasm_frame_t<'a>>>,
+-        new: wasm_frame_vec_new,
+-        empty: wasm_frame_vec_new_empty,
+-        uninit: wasm_frame_vec_new_uninitialized,
+-        copy: wasm_frame_vec_copy,
+-        delete: wasm_frame_vec_delete,
++        name: wasmtime_wasm_frame_vec_t<'a>,
++        ty: Option<Box<wasmtime_wasm_frame_t<'a>>>,
++        new: wasmtime_wasm_frame_vec_new,
++        empty: wasmtime_wasm_frame_vec_new_empty,
++        uninit: wasmtime_wasm_frame_vec_new_uninitialized,
++        copy: wasmtime_wasm_frame_vec_copy,
++        delete: wasmtime_wasm_frame_vec_delete,
+     )
+     (
+-        name: wasm_extern_vec_t,
+-        ty: Option<Box<wasm_extern_t>>,
+-        new: wasm_extern_vec_new,
+-        empty: wasm_extern_vec_new_empty,
+-        uninit: wasm_extern_vec_new_uninitialized,
+-        copy: wasm_extern_vec_copy,
+-        delete: wasm_extern_vec_delete,
++        name: wasmtime_wasm_extern_vec_t,
++        ty: Option<Box<wasmtime_wasm_extern_t>>,
++        new: wasmtime_wasm_extern_vec_new,
++        empty: wasmtime_wasm_extern_vec_new_empty,
++        uninit: wasmtime_wasm_extern_vec_new_uninitialized,
++        copy: wasmtime_wasm_extern_vec_copy,
++        delete: wasmtime_wasm_extern_vec_delete,
+     )
+ }
+diff --git a/crates/c-api/src/wasi.rs b/crates/c-api/src/wasi.rs
+index 3f638cd5bf..c165c0d87e 100644
+--- a/crates/c-api/src/wasi.rs
++++ b/crates/c-api/src/wasi.rs
+@@ -115,7 +115,7 @@ pub unsafe extern "C" fn wasi_config_set_stdin_file(
+ #[no_mangle]
+ pub unsafe extern "C" fn wasi_config_set_stdin_bytes(
+     config: &mut wasi_config_t,
+-    binary: &mut wasm_byte_vec_t,
++    binary: &mut wasmtime_wasm_byte_vec_t,
+ ) {
+     let binary = binary.take();
+     let binary = wasmtime_wasi::pipe::MemoryInputPipe::new(binary);
+diff --git a/crates/c-api/src/wat2wasm.rs b/crates/c-api/src/wat2wasm.rs
+index 3d0b7ae5ab..7257b33f4f 100644
+--- a/crates/c-api/src/wat2wasm.rs
++++ b/crates/c-api/src/wat2wasm.rs
+@@ -1,10 +1,10 @@
+-use crate::{bad_utf8, handle_result, wasm_byte_vec_t, wasmtime_error_t};
++use crate::{bad_utf8, handle_result, wasmtime_wasm_byte_vec_t, wasmtime_error_t};
+ 
+ #[no_mangle]
+ pub unsafe extern "C" fn wasmtime_wat2wasm(
+     wat: *const u8,
+     wat_len: usize,
+-    ret: &mut wasm_byte_vec_t,
++    ret: &mut wasmtime_wasm_byte_vec_t,
+ ) -> Option<Box<wasmtime_error_t>> {
+     let wat = crate::slice_from_raw_parts(wat, wat_len);
+     let wat = match std::str::from_utf8(wat) {
+diff --git a/src/lib.rs b/src/lib.rs
+index 296c75d858..834b9d2ab5 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -1,10 +1 @@
+-//! The Wasmtime command line interface (CLI) crate.
+-//!
+-//! This crate implements the Wasmtime command line tools.
+-
+-#![deny(missing_docs)]
+-
+-pub mod commands;
+-
+-#[cfg(feature = "run")]
+-pub(crate) mod common;
++pub use wasmtime_c_api;
+-- 
+2.53.0.880.g73c4285caa-goog
+
diff --git a/bazel/external/wasmtime.BUILD b/bazel/external/wasmtime.BUILD
index f359d9361..67ccf7457 100644
--- a/bazel/external/wasmtime.BUILD
+++ b/bazel/external/wasmtime.BUILD
@@ -21,73 +21,61 @@ package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "wasmtime_lib",
-    hdrs = [
-        "crates/c-api/include/wasm.h",
-    ],
-    deps = [
-        ":rust_c_api",
+    srcs = [
+        ":prefixed_wasmtime_c_api_lib",
     ],
+    hdrs = glob(["crates/c-api/include/**"]) + [":wasmtime_conf.h"],
+    includes = ["crates/c-api/include/"],
 )
 
-genrule(
-    name = "prefixed_wasmtime_c_api_headers",
+# Wrap wasmtime-c-api-impl in a rust_static_library so it can be used as a cc_library.
+rust_static_library(
+    name = "wasmtime_lib_staticlib",
     srcs = [
-        "crates/c-api/include/wasm.h",
+        "src/lib.rs",
     ],
-    outs = [
-        "crates/c-api/include/prefixed_wasm.h",
+    edition = "2021",
+    deps = [
+        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:wasmtime-c-api-impl",
     ],
-    cmd = """
-        sed -e 's/\\ wasm_/\\ wasmtime_wasm_/g' \
-            -e 's/\\*wasm_/\\*wasmtime_wasm_/g' \
-            -e 's/(wasm_/(wasmtime_wasm_/g'     \
-        $(<) >$@
-        """,
 )
 
 genrule(
     name = "prefixed_wasmtime_c_api_lib",
     srcs = [
-        ":rust_c_api",
+        ":wasmtime_lib_staticlib",
     ],
     outs = [
         "prefixed_wasmtime_c_api.a",
     ],
     cmd = """
         for symbol in $$(nm -P $(<) 2>/dev/null | grep -E ^_?wasm_ | cut -d" " -f1); do
-            echo $$symbol | sed -r 's/^(_?)(wasm_[a-z_]+)$$/\\1\\2 \\1wasmtime_\\2/' >>prefixed
+            echo $$symbol | perl -p -e 's!^(_?)(wasm_[a-z_0-9.:-]+)$$!\\1\\2 \\1wasmtime_\\2!' >>prefixed
         done
-        # This should be OBJCOPY, but bazel-zig-cc doesn't define it.
-        objcopy --redefine-syms=prefixed $(<) $@
+        $(OBJCOPY) --redefine-syms=prefixed $(<) $@ 
         """,
     toolchains = ["@bazel_tools//tools/cpp:current_cc_toolchain"],
 )
 
-cc_library(
-    name = "prefixed_wasmtime_lib",
-    srcs = [
-        ":prefixed_wasmtime_c_api_lib",
-    ],
-    hdrs = [
-        ":prefixed_wasmtime_c_api_headers",
-    ],
-    linkstatic = 1,
-)
+# This must match the features defined in `bazel/cargo/wasmtime/Cargo.toml` for
+# the C/C++ API to expose the right set of methods.
+features = [
+    "cranelift",
+]
 
-rust_static_library(
-    name = "rust_c_api",
-    srcs = glob(["crates/c-api/src/**/*.rs"]),
-    crate_features = ["cranelift"],
-    crate_root = "crates/c-api/src/lib.rs",
-    edition = "2021",
-    proc_macro_deps = [
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:wasmtime-c-api-macros",
-    ],
-    deps = [
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:anyhow",
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:env_logger",
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:once_cell",
-        # buildifier: leave-alone
-        "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:wasmtime",
-    ],
+# Wasmtime C-api headers use cmakedefines to generate the config file.
+# This does the same as CMake's configure_file, but using the crate features array above.
+genrule(
+    name = "wasmtime_conf.h",
+    srcs = ["crates/c-api/include/wasmtime/conf.h.in"],
+    outs = ["crates/c-api/include/wasmtime/conf.h"],
+    cmd = """
+      TMPDIR=$${{TMPDIR:-"$$(mktemp -d)"}}
+      cat < $< > $$TMPDIR/working_file
+      for enabled_feature in $$(echo "{}"); do
+        perl -pi -e "s/#cmakedefine WASMTIME_FEATURE_$$enabled_feature/#define WASMTIME_FEATURE_$$enabled_feature 1/" $$TMPDIR/working_file
+      done
+      perl -pi -e 's?#cmakedefine (.*)?// \\1 is not defined.?' $$TMPDIR/working_file
+      cp $$TMPDIR/working_file $@
+      """.format(" ".join([f.upper() for f in features])),
 )
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 67527bc49..bf6ced6af 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -376,4 +376,6 @@ def proxy_wasm_cpp_host_repositories():
         sha256 = "2ccb49bb3bfa4d86907ad4c80d1147aef6156c7b6e3f7f14ed02a39de9761155",
         strip_prefix = "wasmtime-24.0.0",
         url = "https://github.com/bytecodealliance/wasmtime/archive/v24.0.0.tar.gz",
+        patches = ["@proxy_wasm_cpp_host//bazel/external:prefixed_wasmtime.patch"],
+        patch_args = ["-p1"],
     )
diff --git a/bazel/select.bzl b/bazel/select.bzl
index cc4da38d1..400d7f447 100644
--- a/bazel/select.bzl
+++ b/bazel/select.bzl
@@ -34,10 +34,10 @@ def proxy_wasm_select_engine_wamr(xs):
         "//conditions:default": [],
     })
 
-def proxy_wasm_select_engine_wasmtime(xs, xp):
+def proxy_wasm_select_engine_wasmtime(xs):
     return select({
         "@proxy_wasm_cpp_host//bazel:engine_wasmtime": xs,
-        "@proxy_wasm_cpp_host//bazel:multiengine": xp,
+        "@proxy_wasm_cpp_host//bazel:multiengine": xs,
         "//conditions:default": [],
     })