diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 66ec91bf..13264d48 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -260,13 +260,6 @@ jobs:
           os: macos-13
           arch: x86_64
           action: test
-        - name: 'Wasmtime on Windows/x86_64'
-          engine: 'wasmtime'
-          repo: 'com_github_bytecodealliance_wasmtime'
-          os: windows-2019
-          arch: x86_64
-          action: test
-          targets: -//test/fuzz/...
         - name: 'WAVM on Linux/x86_64'
           engine: 'wavm'
           repo: 'com_github_wavm_wavm'
diff --git a/WORKSPACE b/WORKSPACE
index dad42c2f..2f0601c5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,8 +1,20 @@
 workspace(name = "proxy_wasm_cpp_host")
 
-load("@proxy_wasm_cpp_host//bazel:repositories.bzl", "proxy_wasm_cpp_host_repositories")
+load("@proxy_wasm_cpp_host//bazel:repositories.bzl", "proxy_wasm_cpp_host_base_repositories", "proxy_wasm_cpp_host_engine_repositories")
 
-proxy_wasm_cpp_host_repositories()
+proxy_wasm_cpp_host_base_repositories()
+
+# Now that rules_foreign_cc was loaded above, we can pull in all of the dependencies we need
+load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
+
+rules_foreign_cc_dependencies()
+
+# Need to load bazel_features deps as well (now that we've pulled in rules_foreign_cc_deps)
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+proxy_wasm_cpp_host_engine_repositories()
 
 load("@proxy_wasm_cpp_host//bazel:dependencies.bzl", "proxy_wasm_cpp_host_dependencies")
 
diff --git a/bazel/dependencies_import.bzl b/bazel/dependencies_import.bzl
index 1f23f7d0..c801055c 100644
--- a/bazel/dependencies_import.bzl
+++ b/bazel/dependencies_import.bzl
@@ -13,12 +13,10 @@
 # limitations under the License.
 
 load("@fuzzing_py_deps//:requirements.bzl", pip_fuzzing_dependencies = "install_deps")
-load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
 load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
 load("@v8_python_deps//:requirements.bzl", pip_v8_dependencies = "install_deps")
 
 def proxy_wasm_cpp_host_dependencies_import():
-    rules_foreign_cc_dependencies()
     rules_fuzzing_dependencies()
 
     pip_fuzzing_dependencies()
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 2586ed21..7646a170 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -16,7 +16,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_r
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-def proxy_wasm_cpp_host_repositories():
+def proxy_wasm_cpp_host_base_repositories():
     # Bazel extensions.
 
     # Update platforms for crate_universe. Can remove when we update Bazel version.
@@ -69,9 +69,9 @@ def proxy_wasm_cpp_host_repositories():
     maybe(
         http_archive,
         name = "rules_foreign_cc",
-        sha256 = "bcd0c5f46a49b85b384906daae41d277b3dc0ff27c7c752cc51e43048a58ec83",
-        strip_prefix = "rules_foreign_cc-0.7.1",
-        url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.7.1.tar.gz",
+        sha256 = "a2e6fb56e649c1ee79703e99aa0c9d13c6cc53c8d7a0cbb8797ab2888bbc99a3",
+        strip_prefix = "rules_foreign_cc-0.12.0",
+        url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.12.0.tar.gz",
     )
 
     maybe(
@@ -157,6 +157,7 @@ def proxy_wasm_cpp_host_repositories():
         url = "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-all-3.17.3.tar.gz",
     )
 
+def proxy_wasm_cpp_host_engine_repositories():
     # V8 with dependencies.
 
     maybe(