diff --git a/MODULE.bazel b/MODULE.bazel
index 9449e265..c0e84568 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -20,6 +20,8 @@ bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_pkg", version = "1.1.0")
 bazel_dep(name = "rules_oci", version = "1.8.0")
+bazel_dep(name = "rules_shell", version = "0.6.1")
+bazel_dep(name = "rules_python", version = "1.6.3")
 
 # Register module extensions
 swift_cc_toolchain_ext = use_extension("@rules_swiftnav//cc:extensions.bzl", "swift_cc_toolchain_extension")
@@ -67,6 +69,6 @@ use_repo(yocto_generic_ext, "yocto_generic")
 # Register the buildifier toolchain
 bazel_dep(
     name = "buildifier_prebuilt",
-    version = "8.2.0.2",
+    version = "8.2.1",
     dev_dependency = True,
 )
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 2695a6ed..1b865039 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -36,10 +36,11 @@
     "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917",
     "https://bcr.bazel.build/modules/bazel_skylib/1.7.0/MODULE.bazel": "0db596f4563de7938de764cc8deeabec291f55e8ec15299718b93c4423e9796d",
     "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.8.1/MODULE.bazel": "88ade7293becda963e0e3ea33e7d54d3425127e0a326e0d17da085a5f1f03ff6",
     "https://bcr.bazel.build/modules/bazel_skylib/1.8.2/MODULE.bazel": "69ad6927098316848b34a9142bcc975e018ba27f08c4ff403f50c1b6e646ca67",
     "https://bcr.bazel.build/modules/bazel_skylib/1.8.2/source.json": "34a3c8bcf233b835eb74be9d628899bb32999d3e0eadef1947a0a562a2b16ffb",
-    "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.0.2/MODULE.bazel": "a9b689711d5b69f9db741649b218c119b9fdf82924ba390415037e09798edd03",
-    "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.0.2/source.json": "51eb0a4b38aaaeab7fa64361576d616c4d8bfd0f17a0a10184aeab7084d79f8e",
+    "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.1/MODULE.bazel": "57f2736616367163651d9d3e918cddfd6c67ec7a541d924f2c4544d3fae8630e",
+    "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.1/source.json": "a3e79a347f9d8256d83eba2b621b5b6affa17c8b3236127f030db03b72a44a91",
     "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
     "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
     "https://bcr.bazel.build/modules/container_structure_test/1.16.0/MODULE.bazel": "5bf2659d7724e232c10435e7ef3d5b3d3bc4bfc7825060e408b4a5e7d165ddf7",
@@ -138,9 +139,11 @@
     "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
     "https://bcr.bazel.build/modules/rules_python/0.40.0/MODULE.bazel": "9d1a3cd88ed7d8e39583d9ffe56ae8a244f67783ae89b60caafc9f5cf318ada7",
     "https://bcr.bazel.build/modules/rules_python/1.0.0/MODULE.bazel": "898a3d999c22caa585eb062b600f88654bf92efb204fa346fb55f6f8edffca43",
-    "https://bcr.bazel.build/modules/rules_python/1.0.0/source.json": "b0162a65c6312e45e7912e39abd1a7f8856c2c7e41ecc9b6dc688a6f6400a917",
+    "https://bcr.bazel.build/modules/rules_python/1.6.3/MODULE.bazel": "a7b80c42cb3de5ee2a5fa1abc119684593704fcd2fec83165ebe615dec76574f",
+    "https://bcr.bazel.build/modules/rules_python/1.6.3/source.json": "f0be74977e5604a6526c8a416cda22985093ff7d5d380d41722d7e44015cc419",
     "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c",
-    "https://bcr.bazel.build/modules/rules_shell/0.2.0/source.json": "7f27af3c28037d9701487c4744b5448d26537cc66cdef0d8df7ae85411f8de95",
+    "https://bcr.bazel.build/modules/rules_shell/0.6.1/MODULE.bazel": "72e76b0eea4e81611ef5452aa82b3da34caca0c8b7b5c0c9584338aa93bae26b",
+    "https://bcr.bazel.build/modules/rules_shell/0.6.1/source.json": "20ec05cd5e592055e214b2da8ccb283c7f2a421ea0dc2acbf1aa792e11c03d0c",
     "https://bcr.bazel.build/modules/stardoc/0.5.0/MODULE.bazel": "f9f1f46ba8d9c3362648eea571c6f9100680efc44913618811b58cc9c02cd678",
     "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
     "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c",
@@ -1109,6 +1112,47 @@
           ]
         ]
       }
+    },
+    "@@rules_python+//python/uv:uv.bzl%uv": {
+      "general": {
+        "bzlTransitiveDigest": "bGHlxez0Lkvq2VwrlfCLraKHiJIRHSIJb432X2+pky8=",
+        "usagesDigest": "icnInV8HDGrRQf9x8RMfxWfBHgT3OgRlYovS/9POEJw=",
+        "recordedFileInputs": {},
+        "recordedDirentsInputs": {},
+        "envVariables": {},
+        "generatedRepoSpecs": {
+          "uv": {
+            "repoRuleId": "@@rules_python+//python/uv/private:uv_toolchains_repo.bzl%uv_toolchains_repo",
+            "attributes": {
+              "toolchain_type": "'@@rules_python+//python/uv:uv_toolchain_type'",
+              "toolchain_names": [
+                "none"
+              ],
+              "toolchain_implementations": {
+                "none": "'@@rules_python+//python:none'"
+              },
+              "toolchain_compatible_with": {
+                "none": [
+                  "@platforms//:incompatible"
+                ]
+              },
+              "toolchain_target_settings": {}
+            }
+          }
+        },
+        "recordedRepoMappingEntries": [
+          [
+            "rules_python+",
+            "bazel_tools",
+            "bazel_tools"
+          ],
+          [
+            "rules_python+",
+            "platforms",
+            "platforms"
+          ]
+        ]
+      }
     }
   }
 }
diff --git a/cc/BUILD.bazel b/cc/BUILD.bazel
index d914840c..76616d81 100644
--- a/cc/BUILD.bazel
+++ b/cc/BUILD.bazel
@@ -10,6 +10,7 @@
 
 load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
+load("@rules_python//python:py_binary.bzl", "py_binary")
 
 exports_files(
     glob(["*.bzl"]),
diff --git a/cc/cc_static_library.bzl b/cc/cc_static_library.bzl
index fdf635e0..1f50ff13 100644
--- a/cc/cc_static_library.bzl
+++ b/cc/cc_static_library.bzl
@@ -132,5 +132,4 @@ cc_static_library = rule(
         ),
     },
     toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
-    incompatible_use_toolchain_transition = True,
 )
diff --git a/cc/defs.bzl b/cc/defs.bzl
index 3236612a..e6af2336 100644
--- a/cc/defs.bzl
+++ b/cc/defs.bzl
@@ -10,6 +10,7 @@
 
 """Swift wrappers for native cc rules."""
 
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load("//stamp:stamp_file.bzl", "stamp_file")
 load(":cc_static_library.bzl", _cc_static_library = "cc_static_library")
 load(":copts.bzl", "DEFAULT_COPTS", "GCC5_COPTS", "GCC6_COPTS")
@@ -246,7 +247,7 @@ def swift_c_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_cc_library(**kwargs):
     """Wraps cc_library to enforce standards for a production c++ library.
@@ -299,7 +300,7 @@ def swift_cc_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_c_tool_library(**kwargs):
     """Wraps cc_library to enforce standards for a non-production c library.
@@ -343,7 +344,7 @@ def swift_c_tool_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_cc_tool_library(**kwargs):
     """Wraps cc_library to enforce standards for a non-production c++ library.
@@ -390,7 +391,7 @@ def swift_cc_tool_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_c_binary(**kwargs):
     """Wraps cc_binary to enforce standards for a production c binary.
@@ -438,7 +439,7 @@ def swift_c_binary(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_binary(**kwargs)
+    cc_binary(**kwargs)
 
 def swift_cc_binary(**kwargs):
     """Wraps cc_binary to enforce standards for a production c++ binary.
@@ -488,7 +489,7 @@ def swift_cc_binary(**kwargs):
 
     kwargs["tags"] = [BINARY] + kwargs.get("tags", [])
 
-    native.cc_binary(**kwargs)
+    cc_binary(**kwargs)
 
 def swift_c_tool(**kwargs):
     """Wraps cc_binary to enforce standards for a non-production c binary.
@@ -531,7 +532,7 @@ def swift_c_tool(**kwargs):
 
     kwargs["env"] = _symbolizer_env(kwargs.get("env", {}))
 
-    native.cc_binary(**kwargs)
+    cc_binary(**kwargs)
 
 def swift_cc_tool(**kwargs):
     """Wraps cc_binary to enforce standards for a non-production c++ binary.
@@ -577,7 +578,7 @@ def swift_cc_tool(**kwargs):
 
     kwargs["env"] = _symbolizer_env(kwargs.get("env", {}))
 
-    native.cc_binary(**kwargs)
+    cc_binary(**kwargs)
 
 def swift_c_test_library(**kwargs):
     """Wraps cc_library to enforce Swift test library conventions.
@@ -604,7 +605,7 @@ def swift_c_test_library(**kwargs):
     kwargs["tags"] = [TEST_LIBRARY] + kwargs.get("tags", [])
     kwargs["target_compatible_with"] = kwargs.get("target_compatible_with", []) + _test_compatible_with()
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_cc_test_library(**kwargs):
     """Wraps cc_library to enforce Swift test library conventions.
@@ -635,7 +636,7 @@ def swift_cc_test_library(**kwargs):
 
     kwargs["linkstatic"] = _link_static(kwargs.get("linkstatic", True))
 
-    native.cc_library(**kwargs)
+    cc_library(**kwargs)
 
 def swift_c_test(name, type, **kwargs):
     """Wraps cc_test to enforce Swift testing conventions for C code.
@@ -690,7 +691,7 @@ def swift_c_test(name, type, **kwargs):
     kwargs["tags"] = [TEST, type] + kwargs.get("tags", [])
     kwargs["target_compatible_with"] = kwargs.get("target_compatible_with", []) + _test_compatible_with()
 
-    native.cc_test(**kwargs)
+    cc_test(**kwargs)
 
 def swift_cc_test(name, type, **kwargs):
     """Wraps cc_test to enforce Swift testing conventions.
@@ -742,4 +743,4 @@ def swift_cc_test(name, type, **kwargs):
     kwargs["tags"] = [TEST, type] + kwargs.get("tags", [])
     kwargs["target_compatible_with"] = kwargs.get("target_compatible_with", []) + _test_compatible_with()
 
-    native.cc_test(**kwargs)
+    cc_test(**kwargs)
diff --git a/cc/toolchains/gcc_arm_embedded/BUILD.bazel b/cc/toolchains/gcc_arm_embedded/BUILD.bazel
index dd30d432..b236b794 100644
--- a/cc/toolchains/gcc_arm_embedded/BUILD.bazel
+++ b/cc/toolchains/gcc_arm_embedded/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load(":config.bzl", "config")
 
 filegroup(name = "empty")
diff --git a/cc/toolchains/gcc_arm_gnu_8_3/BUILD.bazel b/cc/toolchains/gcc_arm_gnu_8_3/BUILD.bazel
index c0caeb28..b1bffdf2 100644
--- a/cc/toolchains/gcc_arm_gnu_8_3/BUILD.bazel
+++ b/cc/toolchains/gcc_arm_gnu_8_3/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load(":config.bzl", "config")
 
 filegroup(name = "empty")
diff --git a/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel b/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel
index d064422d..d82ad9da 100644
--- a/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel
+++ b/cc/toolchains/llvm/aarch64-darwin/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_DARWIN")
 
diff --git a/cc/toolchains/llvm/aarch64-linux/BUILD.bazel b/cc/toolchains/llvm/aarch64-linux/BUILD.bazel
index 5c22c0f6..3b6d40c2 100644
--- a/cc/toolchains/llvm/aarch64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm/aarch64-linux/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_LINUX")
 
diff --git a/cc/toolchains/llvm/unix_cc_toolchain_config.bzl b/cc/toolchains/llvm/unix_cc_toolchain_config.bzl
index 2689564a..d01ab740 100644
--- a/cc/toolchains/llvm/unix_cc_toolchain_config.bzl
+++ b/cc/toolchains/llvm/unix_cc_toolchain_config.bzl
@@ -28,6 +28,7 @@ load(
     "variable_with_value",
     "with_feature_set",
 )
+load("@rules_cc//cc:defs.bzl", "CcToolchainConfigInfo")
 load(
     "swift_custom_features.bzl",
     "c11_standard_feature",
diff --git a/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel b/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel
index 44dca896..bf492512 100644
--- a/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm/x86_64-aarch64-linux/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "AARCH64_LINUX", "X86_64_LINUX")
 
diff --git a/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel b/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel
index b48e4fbf..c62e7a71 100644
--- a/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel
+++ b/cc/toolchains/llvm/x86_64-darwin/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "X86_64_DARWIN")
 
diff --git a/cc/toolchains/llvm/x86_64-linux/BUILD.bazel b/cc/toolchains/llvm/x86_64-linux/BUILD.bazel
index 27ee4488..cdaab5ea 100644
--- a/cc/toolchains/llvm/x86_64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm/x86_64-linux/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm:target_triplets.bzl", "X86_64_LINUX")
 
diff --git a/cc/toolchains/llvm20/aarch64-darwin/BUILD.bazel b/cc/toolchains/llvm20/aarch64-darwin/BUILD.bazel
index 66fc17e4..34f5a4a1 100644
--- a/cc/toolchains/llvm20/aarch64-darwin/BUILD.bazel
+++ b/cc/toolchains/llvm20/aarch64-darwin/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "AARCH64_DARWIN")
 
diff --git a/cc/toolchains/llvm20/aarch64-linux/BUILD.bazel b/cc/toolchains/llvm20/aarch64-linux/BUILD.bazel
index f6ed319d..91d2f7b6 100644
--- a/cc/toolchains/llvm20/aarch64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm20/aarch64-linux/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "AARCH64_LINUX")
 
diff --git a/cc/toolchains/llvm20/unix_cc_toolchain_config.bzl b/cc/toolchains/llvm20/unix_cc_toolchain_config.bzl
index 2689564a..d01ab740 100644
--- a/cc/toolchains/llvm20/unix_cc_toolchain_config.bzl
+++ b/cc/toolchains/llvm20/unix_cc_toolchain_config.bzl
@@ -28,6 +28,7 @@ load(
     "variable_with_value",
     "with_feature_set",
 )
+load("@rules_cc//cc:defs.bzl", "CcToolchainConfigInfo")
 load(
     "swift_custom_features.bzl",
     "c11_standard_feature",
diff --git a/cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel b/cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel
index 76b6000f..0e87b8dc 100644
--- a/cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm20/x86_64-aarch64-linux/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "AARCH64_LINUX", "X86_64_LINUX")
 
diff --git a/cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel b/cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel
index b32237ec..a178ebcc 100644
--- a/cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel
+++ b/cc/toolchains/llvm20/x86_64-darwin/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "X86_64_DARWIN")
 
diff --git a/cc/toolchains/llvm20/x86_64-linux/BUILD.bazel b/cc/toolchains/llvm20/x86_64-linux/BUILD.bazel
index e9b9c433..645d4d86 100644
--- a/cc/toolchains/llvm20/x86_64-linux/BUILD.bazel
+++ b/cc/toolchains/llvm20/x86_64-linux/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_swiftnav//cc/toolchains/llvm20:cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_swiftnav//cc/toolchains/llvm20:target_triplets.bzl", "X86_64_LINUX")
 
diff --git a/cc/toolchains/llvm_x86_64_windows/BUILD.bazel b/cc/toolchains/llvm_x86_64_windows/BUILD.bazel
index 6120cfb6..a8322749 100644
--- a/cc/toolchains/llvm_x86_64_windows/BUILD.bazel
+++ b/cc/toolchains/llvm_x86_64_windows/BUILD.bazel
@@ -8,6 +8,7 @@
 # EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
 
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load(":config.bzl", "config")
 
 filegroup(name = "empty")
diff --git a/cc/toolchains/musl/aarch64/BUILD.bazel b/cc/toolchains/musl/aarch64/BUILD.bazel
index 2394f037..0c52269b 100644
--- a/cc/toolchains/musl/aarch64/BUILD.bazel
+++ b/cc/toolchains/musl/aarch64/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load(":config.bzl", "config")
 
 filegroup(name = "empty")
diff --git a/cc/toolchains/musl/armhf/BUILD.bazel b/cc/toolchains/musl/armhf/BUILD.bazel
index be6bb70d..1f0e0f9e 100644
--- a/cc/toolchains/musl/armhf/BUILD.bazel
+++ b/cc/toolchains/musl/armhf/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load(":config.bzl", "config")
 
 filegroup(name = "empty")
diff --git a/cc/toolchains/musl/x86_64/BUILD.bazel b/cc/toolchains/musl/x86_64/BUILD.bazel
index d42e5f51..ad9e4018 100644
--- a/cc/toolchains/musl/x86_64/BUILD.bazel
+++ b/cc/toolchains/musl/x86_64/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load(":config.bzl", "config")
 
 filegroup(name = "empty")
diff --git a/cc/toolchains/system_gcc/gcc11_x86_64-linux/BUILD.bazel b/cc/toolchains/system_gcc/gcc11_x86_64-linux/BUILD.bazel
index 8fb82d61..a92e4ba2 100644
--- a/cc/toolchains/system_gcc/gcc11_x86_64-linux/BUILD.bazel
+++ b/cc/toolchains/system_gcc/gcc11_x86_64-linux/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_cc//cc/private/toolchain:unix_cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_cc//cc/toolchains:cc_toolchain.bzl", "cc_toolchain")
 
diff --git a/cc/toolchains/system_gcc/gcc12_x86_64-linux/BUILD.bazel b/cc/toolchains/system_gcc/gcc12_x86_64-linux/BUILD.bazel
index a9282cf1..df472cb9 100644
--- a/cc/toolchains/system_gcc/gcc12_x86_64-linux/BUILD.bazel
+++ b/cc/toolchains/system_gcc/gcc12_x86_64-linux/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load("@rules_cc//cc/private/toolchain:unix_cc_toolchain_config.bzl", "cc_toolchain_config")
 load("@rules_cc//cc/toolchains:cc_toolchain.bzl", "cc_toolchain")
 
diff --git a/cc/toolchains/yocto_generic/BUILD.bazel b/cc/toolchains/yocto_generic/BUILD.bazel
index 7693977c..4a3282cf 100644
--- a/cc/toolchains/yocto_generic/BUILD.bazel
+++ b/cc/toolchains/yocto_generic/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_toolchain")
 load(":config.bzl", "config")
 
 filegroup(name = "empty")
diff --git a/cc_files/BUILD.bazel b/cc_files/BUILD.bazel
index 1cec5e9b..3d2a341f 100644
--- a/cc_files/BUILD.bazel
+++ b/cc_files/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@bazel_skylib//rules:common_settings.bzl", "string_list_flag")
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load("@rules_swiftnav//tools:string_list_file.bzl", "string_list_file")
 
 sh_binary(
diff --git a/clang_format/BUILD.bazel b/clang_format/BUILD.bazel
index 7b8bb057..07117fb9 100644
--- a/clang_format/BUILD.bazel
+++ b/clang_format/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(":choose_clang_format.bzl", "choose_clang_format")
 
 filegroup(
diff --git a/clang_tidy/BUILD.bazel b/clang_tidy/BUILD.bazel
index e747f832..d1bd69bb 100644
--- a/clang_tidy/BUILD.bazel
+++ b/clang_tidy/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 load(":choose_clang_tidy.bzl", "choose_clang_tidy")
 
 choose_clang_tidy(
diff --git a/examples/small_world/MODULE.bazel b/examples/small_world/MODULE.bazel
index fb34d6c2..7f053001 100644
--- a/examples/small_world/MODULE.bazel
+++ b/examples/small_world/MODULE.bazel
@@ -1,6 +1,7 @@
 module(name = "small_world")
 
 bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_cc", version = "0.2.4")
 bazel_dep(name = "rules_swiftnav")
 local_path_override(
     module_name = "rules_swiftnav",
@@ -40,7 +41,7 @@ bazel_dep(name = "eigen", version = "5.0.0")
 # Register the buildifier toolchain
 bazel_dep(
     name = "buildifier_prebuilt",
-    version = "8.2.0.2",
+    version = "8.2.1",
     dev_dependency = True,
 )
 
diff --git a/examples/small_world/MODULE.bazel.lock b/examples/small_world/MODULE.bazel.lock
index e3dc87cd..df404e96 100644
--- a/examples/small_world/MODULE.bazel.lock
+++ b/examples/small_world/MODULE.bazel.lock
@@ -40,10 +40,11 @@
     "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917",
     "https://bcr.bazel.build/modules/bazel_skylib/1.7.0/MODULE.bazel": "0db596f4563de7938de764cc8deeabec291f55e8ec15299718b93c4423e9796d",
     "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b",
+    "https://bcr.bazel.build/modules/bazel_skylib/1.8.1/MODULE.bazel": "88ade7293becda963e0e3ea33e7d54d3425127e0a326e0d17da085a5f1f03ff6",
     "https://bcr.bazel.build/modules/bazel_skylib/1.8.2/MODULE.bazel": "69ad6927098316848b34a9142bcc975e018ba27f08c4ff403f50c1b6e646ca67",
     "https://bcr.bazel.build/modules/bazel_skylib/1.8.2/source.json": "34a3c8bcf233b835eb74be9d628899bb32999d3e0eadef1947a0a562a2b16ffb",
-    "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.0.2/MODULE.bazel": "a9b689711d5b69f9db741649b218c119b9fdf82924ba390415037e09798edd03",
-    "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.0.2/source.json": "51eb0a4b38aaaeab7fa64361576d616c4d8bfd0f17a0a10184aeab7084d79f8e",
+    "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.1/MODULE.bazel": "57f2736616367163651d9d3e918cddfd6c67ec7a541d924f2c4544d3fae8630e",
+    "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.1/source.json": "a3e79a347f9d8256d83eba2b621b5b6affa17c8b3236127f030db03b72a44a91",
     "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
     "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
     "https://bcr.bazel.build/modules/container_structure_test/1.16.0/MODULE.bazel": "5bf2659d7724e232c10435e7ef3d5b3d3bc4bfc7825060e408b4a5e7d165ddf7",
@@ -102,6 +103,7 @@
     "https://bcr.bazel.build/modules/rules_cc/0.1.1/MODULE.bazel": "2f0222a6f229f0bf44cd711dc13c858dad98c62d52bd51d8fc3a764a83125513",
     "https://bcr.bazel.build/modules/rules_cc/0.2.14/MODULE.bazel": "353c99ed148887ee89c54a17d4100ae7e7e436593d104b668476019023b58df8",
     "https://bcr.bazel.build/modules/rules_cc/0.2.14/source.json": "55d0a4587c5592fad350f6e698530f4faf0e7dd15e69d43f8d87e220c78bea54",
+    "https://bcr.bazel.build/modules/rules_cc/0.2.4/MODULE.bazel": "1ff1223dfd24f3ecf8f028446d4a27608aa43c3f41e346d22838a4223980b8cc",
     "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6",
     "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8",
     "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/source.json": "c8b1e2c717646f1702290959a3302a178fb639d987ab61d548105019f11e527e",
@@ -156,10 +158,12 @@
     "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
     "https://bcr.bazel.build/modules/rules_python/0.40.0/MODULE.bazel": "9d1a3cd88ed7d8e39583d9ffe56ae8a244f67783ae89b60caafc9f5cf318ada7",
     "https://bcr.bazel.build/modules/rules_python/1.0.0/MODULE.bazel": "898a3d999c22caa585eb062b600f88654bf92efb204fa346fb55f6f8edffca43",
-    "https://bcr.bazel.build/modules/rules_python/1.0.0/source.json": "b0162a65c6312e45e7912e39abd1a7f8856c2c7e41ecc9b6dc688a6f6400a917",
+    "https://bcr.bazel.build/modules/rules_python/1.6.3/MODULE.bazel": "a7b80c42cb3de5ee2a5fa1abc119684593704fcd2fec83165ebe615dec76574f",
+    "https://bcr.bazel.build/modules/rules_python/1.6.3/source.json": "f0be74977e5604a6526c8a416cda22985093ff7d5d380d41722d7e44015cc419",
     "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c",
     "https://bcr.bazel.build/modules/rules_shell/0.4.0/MODULE.bazel": "0f8f11bb3cd11755f0b48c1de0bbcf62b4b34421023aa41a2fc74ef68d9584f0",
-    "https://bcr.bazel.build/modules/rules_shell/0.4.0/source.json": "1d7fa7f941cd41dc2704ba5b4edc2e2230eea1cc600d80bd2b65838204c50b95",
+    "https://bcr.bazel.build/modules/rules_shell/0.6.1/MODULE.bazel": "72e76b0eea4e81611ef5452aa82b3da34caca0c8b7b5c0c9584338aa93bae26b",
+    "https://bcr.bazel.build/modules/rules_shell/0.6.1/source.json": "20ec05cd5e592055e214b2da8ccb283c7f2a421ea0dc2acbf1aa792e11c03d0c",
     "https://bcr.bazel.build/modules/stardoc/0.5.0/MODULE.bazel": "f9f1f46ba8d9c3362648eea571c6f9100680efc44913618811b58cc9c02cd678",
     "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
     "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c",
@@ -946,6 +950,47 @@
         ]
       }
     },
+    "@@rules_python+//python/uv:uv.bzl%uv": {
+      "general": {
+        "bzlTransitiveDigest": "bGHlxez0Lkvq2VwrlfCLraKHiJIRHSIJb432X2+pky8=",
+        "usagesDigest": "icnInV8HDGrRQf9x8RMfxWfBHgT3OgRlYovS/9POEJw=",
+        "recordedFileInputs": {},
+        "recordedDirentsInputs": {},
+        "envVariables": {},
+        "generatedRepoSpecs": {
+          "uv": {
+            "repoRuleId": "@@rules_python+//python/uv/private:uv_toolchains_repo.bzl%uv_toolchains_repo",
+            "attributes": {
+              "toolchain_type": "'@@rules_python+//python/uv:uv_toolchain_type'",
+              "toolchain_names": [
+                "none"
+              ],
+              "toolchain_implementations": {
+                "none": "'@@rules_python+//python:none'"
+              },
+              "toolchain_compatible_with": {
+                "none": [
+                  "@platforms//:incompatible"
+                ]
+              },
+              "toolchain_target_settings": {}
+            }
+          }
+        },
+        "recordedRepoMappingEntries": [
+          [
+            "rules_python+",
+            "bazel_tools",
+            "bazel_tools"
+          ],
+          [
+            "rules_python+",
+            "platforms",
+            "platforms"
+          ]
+        ]
+      }
+    },
     "@@rules_swiftnav+//cc:extensions.bzl%swift_cc_toolchain_extension": {
       "general": {
         "bzlTransitiveDigest": "12yxB33CfN0W3lUInFcfNacHnoMCa5xr0Kc+SXv/k4o=",
diff --git a/examples/small_world/src/old_folder_structure/BUILD.bazel b/examples/small_world/src/old_folder_structure/BUILD.bazel
index d985ed22..9c16b3f8 100644
--- a/examples/small_world/src/old_folder_structure/BUILD.bazel
+++ b/examples/small_world/src/old_folder_structure/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_swiftnav//cc:defs.bzl", "UNIT", "swift_cc_test")
 
 cc_library(
diff --git a/stamp/BUILD.bazel b/stamp/BUILD.bazel
index dd048805..4a72025f 100644
--- a/stamp/BUILD.bazel
+++ b/stamp/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_python//python:py_binary.bzl", "py_binary")
+
 exports_files(
     glob(["*.bzl"]) + glob(["*.py"]),
     visibility = ["//visibility:public"],