diff --git a/.styleguide b/.styleguide
index 1a60b8f..9b7250a 100644
--- a/.styleguide
+++ b/.styleguide
@@ -24,6 +24,8 @@ generatedFileExclude {
   BUILD.bazel
   \.jinja2$
   generate/vendor_dep.json$
+  \.dll$
+  \.patch$
 }
 
 repoRootNameOverride {
diff --git a/maven_deps.bzl b/maven_deps.bzl
index 9d0f766..a0de874 100644
--- a/maven_deps.bzl
+++ b/maven_deps.bzl
@@ -53,6 +53,21 @@ def __setup_jdk_dependencies(mctx):
         strip_prefix = "jdk-17.0.12+7/Contents/Home",
     )
 
+    runtime_files = [
+        "concrt140.dll",
+        "msvcp140.dll",
+        "msvcp140_1.dll",
+        "msvcp140_2.dll",
+        "msvcp140_atomic_wait.dll",
+        "msvcp140_codecvt_ids.dll",
+        "vccorlib140.dll",
+        "vcruntime140.dll",
+        "vcruntime140_1.dll",
+        "vcruntime140_threads.dll",
+    ]
+
+    runtime_labels = [Label("@rules_bzlmodrio_jdk//msvc_runtime:" + f) for f in runtime_files]
+    win_patch_cmds = ["cp ../" + lbl.repo_name + "/msvc_runtime/" + lbl.name + " bin/" + lbl.name for lbl in runtime_labels]
     remote_java_repository(
         name = "roboriojdk_windows",
         prefix = "roboriojdk",
@@ -64,6 +79,7 @@ def __setup_jdk_dependencies(mctx):
         sha256 = "052049d687ebfda6a4032d54afcd0da6549a23bc2ed04cfaa509746eeacbae71",
         urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.zip"],
         strip_prefix = "jdk-17.0.12+7",
+        patch_cmds = win_patch_cmds
     )
 
 def setup_legacy_setup_jdk_dependencies():
diff --git a/msvc_runtime/concrt140.dll b/msvc_runtime/concrt140.dll
new file mode 100644
index 0000000..235eced
Binary files /dev/null and b/msvc_runtime/concrt140.dll differ
diff --git a/msvc_runtime/msvcp140.dll b/msvc_runtime/msvcp140.dll
new file mode 100644
index 0000000..0a50239
Binary files /dev/null and b/msvc_runtime/msvcp140.dll differ
diff --git a/msvc_runtime/msvcp140_1.dll b/msvc_runtime/msvcp140_1.dll
new file mode 100644
index 0000000..02ae0f8
Binary files /dev/null and b/msvc_runtime/msvcp140_1.dll differ
diff --git a/msvc_runtime/msvcp140_2.dll b/msvc_runtime/msvcp140_2.dll
new file mode 100644
index 0000000..3283732
Binary files /dev/null and b/msvc_runtime/msvcp140_2.dll differ
diff --git a/msvc_runtime/msvcp140_atomic_wait.dll b/msvc_runtime/msvcp140_atomic_wait.dll
new file mode 100644
index 0000000..2ca26ca
Binary files /dev/null and b/msvc_runtime/msvcp140_atomic_wait.dll differ
diff --git a/msvc_runtime/msvcp140_codecvt_ids.dll b/msvc_runtime/msvcp140_codecvt_ids.dll
new file mode 100644
index 0000000..8eb1254
Binary files /dev/null and b/msvc_runtime/msvcp140_codecvt_ids.dll differ
diff --git a/msvc_runtime/vccorlib140.dll b/msvc_runtime/vccorlib140.dll
new file mode 100644
index 0000000..b0eff49
Binary files /dev/null and b/msvc_runtime/vccorlib140.dll differ
diff --git a/msvc_runtime/vcruntime140.dll b/msvc_runtime/vcruntime140.dll
new file mode 100644
index 0000000..524092d
Binary files /dev/null and b/msvc_runtime/vcruntime140.dll differ
diff --git a/msvc_runtime/vcruntime140_1.dll b/msvc_runtime/vcruntime140_1.dll
new file mode 100644
index 0000000..4e3760e
Binary files /dev/null and b/msvc_runtime/vcruntime140_1.dll differ
diff --git a/msvc_runtime/vcruntime140_threads.dll b/msvc_runtime/vcruntime140_threads.dll
new file mode 100644
index 0000000..c01bb8a
Binary files /dev/null and b/msvc_runtime/vcruntime140_threads.dll differ
diff --git a/tests/MODULE.bazel.lock b/tests/MODULE.bazel.lock
index 3677be4..aa7f058 100644
--- a/tests/MODULE.bazel.lock
+++ b/tests/MODULE.bazel.lock
@@ -139,7 +139,7 @@
     },
     "@@rules_bzlmodrio_jdk~//:maven_deps.bzl%deps": {
       "general": {
-        "bzlTransitiveDigest": "7ioqtKce/6QadqNFBEuf5tiz23b1dU71qDrtAVwozkE=",
+        "bzlTransitiveDigest": "peyObOsAjevTVPgKd5FlyL5aFMQ+F60yQkGHVq1Gtw0=",
         "usagesDigest": "U+tCKAYT563wXiw5hz8oK2Hf7s4NG7RTkarVy+SX5mQ=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
@@ -206,7 +206,19 @@
               "urls": [
                 "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.zip"
               ],
-              "strip_prefix": "jdk-17.0.12+7"
+              "strip_prefix": "jdk-17.0.12+7",
+              "patch_cmds": [
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/concrt140.dll bin/concrt140.dll",
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140.dll bin/msvcp140.dll",
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_1.dll bin/msvcp140_1.dll",
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_2.dll bin/msvcp140_2.dll",
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_atomic_wait.dll bin/msvcp140_atomic_wait.dll",
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_codecvt_ids.dll bin/msvcp140_codecvt_ids.dll",
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vccorlib140.dll bin/vccorlib140.dll",
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vcruntime140.dll bin/vcruntime140.dll",
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vcruntime140_1.dll bin/vcruntime140_1.dll",
+                "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vcruntime140_threads.dll bin/vcruntime140_threads.dll"
+              ]
             }
           },
           "roboriojdk_linux": {
@@ -242,6 +254,11 @@
           }
         },
         "recordedRepoMappingEntries": [
+          [
+            "rules_bzlmodrio_jdk~",
+            "rules_bzlmodrio_jdk",
+            "rules_bzlmodrio_jdk~"
+          ],
           [
             "rules_bzlmodrio_jdk~",
             "rules_java",
@@ -345,6 +362,132 @@
         "recordedRepoMappingEntries": []
       }
     },
+    "@@rules_bzlmodrio_toolchains~//:maven_deps.bzl%deps": {
+      "general": {
+        "bzlTransitiveDigest": "IsdTRkB5rD4kJUJu7gbepDG5f6yi89qRpZUHu4NSwS4=",
+        "usagesDigest": "zzfpjG57qd7tWDs6MQBVgpF7M47j1UlgPOeBTBDqOIc=",
+        "recordedFileInputs": {},
+        "recordedDirentsInputs": {},
+        "envVariables": {},
+        "generatedRepoSpecs": {
+          "bazelrio_raspi_32_toolchain_linux": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-raspi-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz",
+              "sha256": "a8b19b6068fcedcae033d3bbefac9ae4a26139ab276304fe49302e4a992a9f7d",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_bullseye_32_toolchain_windows": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-bullseye-2024-x86_64-w64-mingw32-Toolchain-10.2.0.zip",
+              "sha256": "acc64f989c73c72a15e2296a6deee553458a1580e484e93b8ecd02cbf83e6af8",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_roborio_toolchain_macos": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/cortexa9_vfpv3-roborio-academic-2024-x86_64-apple-darwin-Toolchain-12.1.0.tgz",
+              "sha256": "95eed7503f92e17f0e93ed6e5412d3ac6297b6a15773c90ef1a590f47f6fa467",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_bullseye_32_toolchain_linux": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz",
+              "sha256": "0e3544b9cd8602f160e47c4b1593199ac6a600bce0dd9028be78a3ee7cc211fe",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_raspi_32_toolchain_windows": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-raspi-bullseye-2024-x86_64-w64-mingw32-Toolchain-10.2.0.zip",
+              "sha256": "69429dc49f2571b2c933e751b8a25f7a3a45b285b3ae49bc6e9b01e065fc8630",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_roborio_toolchain_linux": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/cortexa9_vfpv3-roborio-academic-2024-x86_64-linux-gnu-Toolchain-12.1.0.tgz",
+              "sha256": "10349791e4f9fa33100ee52a84e7f9ba4df581963818334771253369b0d12061",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_roborio_toolchain_windows": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/cortexa9_vfpv3-roborio-academic-2024-x86_64-w64-mingw32-Toolchain-12.1.0.zip",
+              "sha256": "b367ab5d451603a97cd18a76193e860640230013a99baf216bb97dda1c353990",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_bullseye_64_toolchain_macos": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/arm64-bullseye-2024-x86_64-apple-darwin-Toolchain-10.2.0.tgz",
+              "sha256": "2774f894c59f1c390c4990ffaa6412776ea6a9dafc01accb50b8def72b8e6dbe",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_bullseye_64_toolchain_windows": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/arm64-bullseye-2024-x86_64-w64-mingw32-Toolchain-10.2.0.zip",
+              "sha256": "6ef1c81fe3fbc5578db111087a3715746bcdc59e67f10a50788c363ab5fb1368",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_raspi_32_toolchain_macos": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-raspi-bullseye-2024-x86_64-apple-darwin-Toolchain-10.2.0.tgz",
+              "sha256": "2725fd7d1582d8503a2fdd1f7402e579cbbd1091b820b0fd50100d2205b78ba7",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_bullseye_32_toolchain_macos": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/armhf-bullseye-2024-x86_64-apple-darwin-Toolchain-10.2.0.tgz",
+              "sha256": "c7febfdb1f01ad7fd7876f8482f50ab4a875aeee77b12818fb97c4a76da789bd",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          },
+          "bazelrio_bullseye_64_toolchain_linux": {
+            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+            "ruleClassName": "http_archive",
+            "attributes": {
+              "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2024-1/arm64-bullseye-2024-x86_64-linux-gnu-Toolchain-10.2.0.tgz",
+              "sha256": "2cd4345315f165f273e21bbcf04638947fb7530a2859b728a564b6b97a7bea69",
+              "build_file_content": "filegroup(\n    name = \"all\",\n    srcs = glob([\"**\"]),\n    visibility = [\"//visibility:public\"],\n)\n"
+            }
+          }
+        },
+        "recordedRepoMappingEntries": [
+          [
+            "rules_bzlmodrio_toolchains~",
+            "bazel_tools",
+            "bazel_tools"
+          ]
+        ]
+      }
+    },
     "@@rules_jvm_external~//:extensions.bzl%maven": {
       "general": {
         "bzlTransitiveDigest": "Pq3YnJEflPAALx/UMykUnN3aA5bve0fNm/cuLvt/zvI=",