diff --git a/bazel/BUILD.bazel b/bazel/BUILD.bazel
index ff093d40..f5b5c5ad 100644
--- a/bazel/BUILD.bazel
+++ b/bazel/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_python//python:defs.bzl", "py_binary")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/bazel/defs.bzl b/bazel/defs.bzl
index 888f59ce..920c4c56 100644
--- a/bazel/defs.bzl
+++ b/bazel/defs.bzl
@@ -1,5 +1,7 @@
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 def _pico_generate_pio_header_impl(ctx):
     generated_headers = []
diff --git a/bazel/pico_btstack_make_gatt_header.bzl b/bazel/pico_btstack_make_gatt_header.bzl
index e9468fbf..1e5eb224 100644
--- a/bazel/pico_btstack_make_gatt_header.bzl
+++ b/bazel/pico_btstack_make_gatt_header.bzl
@@ -1,4 +1,6 @@
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cpp_toolchain", "use_cc_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 def _pico_btstack_make_gatt_header_impl(ctx):
     cc_toolchain = find_cpp_toolchain(ctx)
@@ -21,7 +23,6 @@ def _pico_btstack_make_gatt_header_impl(ctx):
             "-I",
             ctx.file._btstack_hdr.dirname,
         ] + [
-
         ],
         inputs = [
             ctx.file.src,
@@ -37,7 +38,7 @@ def _pico_btstack_make_gatt_header_impl(ctx):
 
     return [
         DefaultInfo(files = depset(direct = [out])),
-        CcInfo(compilation_context = cc_ctx)
+        CcInfo(compilation_context = cc_ctx),
     ]
 
 pico_btstack_make_gatt_header = rule(
diff --git a/bazel/toolchain/BUILD.bazel b/bazel/toolchain/BUILD.bazel
index dacd3538..59faba27 100644
--- a/bazel/toolchain/BUILD.bazel
+++ b/bazel/toolchain/BUILD.bazel
@@ -100,7 +100,7 @@ cc_args(
             "-Og",
             "-g3",
         ],
-    })
+    }),
 )
 
 cc_args(
@@ -115,7 +115,7 @@ cc_args(
             "-O2",
             "-DNDEBUG",
         ],
-    })
+    }),
 )
 
 cc_args(
@@ -128,7 +128,7 @@ cc_args(
         "//bazel/constraint:pico_compilation_no_fastbuild_args_set": [],
         # The conditions default are kept as nothing here, The bazel docs default are -gmlt -Wl,-S.
         "//conditions:default": [],
-    })
+    }),
 )
 
 configurable_toolchain_feature(
@@ -163,7 +163,6 @@ configurable_toolchain_feature(
     linkopts = ["-Wl,-z,max-page-size=4096"],
 )
 
-
 cc_feature(
     name = "dbg",
     args = [":debug_args"],
@@ -203,7 +202,6 @@ _HOST_CPU_CONSTRAINTS = {
 
 [cc_toolchain(
     name = "arm_gcc_{}-{}_toolchain_cortex-m".format(host_os, host_cpu),
-    tool_map = "@arm_gcc_{}-{}//:all_tools".format(host_os, host_cpu),
     args = select({
         "//bazel/constraint:rp2040": [":cortex-m0"],
         "//bazel/constraint:rp2350": [":cortex-m33"],
@@ -211,22 +209,6 @@ _HOST_CPU_CONSTRAINTS = {
     }) + [
         ":bazel_no_absolute_paths",
     ],
-    exec_compatible_with = [
-        _HOST_CPU_CONSTRAINTS[host_cpu],
-        _HOST_OS_CONSTRAINTS[host_os],
-    ],
-    tags = ["manual"],  # Don't try to build this in wildcard builds.
-    known_features = [
-        "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
-        "@pico-sdk//bazel/toolchain:dbg",
-        "@pico-sdk//bazel/toolchain:opt",
-        "@pico-sdk//bazel/toolchain:fastbuild",
-        "@pico-sdk//bazel/toolchain:gc_sections",
-        "@pico-sdk//bazel/toolchain:cxx_no_exceptions",
-        "@pico-sdk//bazel/toolchain:cxx_no_rtti",
-        "@pico-sdk//bazel/toolchain:cxx_no_cxa_atexit",
-        "@pico-sdk//bazel/toolchain:override_max_page_size",
-    ],
     enabled_features = [
         "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
     ] + select({
@@ -245,11 +227,27 @@ _HOST_CPU_CONSTRAINTS = {
         "//bazel/constraint:pico_use_default_max_page_size_enabled": [],
         "//conditions:default": [":override_max_page_size"],
     }),
+    exec_compatible_with = [
+        _HOST_CPU_CONSTRAINTS[host_cpu],
+        _HOST_OS_CONSTRAINTS[host_os],
+    ],
+    known_features = [
+        "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
+        "@pico-sdk//bazel/toolchain:dbg",
+        "@pico-sdk//bazel/toolchain:opt",
+        "@pico-sdk//bazel/toolchain:fastbuild",
+        "@pico-sdk//bazel/toolchain:gc_sections",
+        "@pico-sdk//bazel/toolchain:cxx_no_exceptions",
+        "@pico-sdk//bazel/toolchain:cxx_no_rtti",
+        "@pico-sdk//bazel/toolchain:cxx_no_cxa_atexit",
+        "@pico-sdk//bazel/toolchain:override_max_page_size",
+    ],
+    tags = ["manual"],  # Don't try to build this in wildcard builds.
+    tool_map = "@arm_gcc_{}-{}//:all_tools".format(host_os, host_cpu),
 ) for host_os, host_cpu in HOSTS]
 
 [cc_toolchain(
     name = "clang_{}-{}_toolchain_cortex-m".format(host_os, host_cpu),
-    tool_map = "@clang_{}-{}//:all_tools".format(host_os, host_cpu),
     args = select({
         "//bazel/constraint:rp2040": [
             ":armv6m-none-eabi",
@@ -264,22 +262,6 @@ _HOST_CPU_CONSTRAINTS = {
         ":bazel_no_absolute_paths",
         ":llvm-libc_args",
     ],
-    exec_compatible_with = [
-        _HOST_CPU_CONSTRAINTS[host_cpu],
-        _HOST_OS_CONSTRAINTS[host_os],
-    ],
-    tags = ["manual"],  # Don't try to build this in wildcard builds.
-    known_features = [
-        "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
-        "@pico-sdk//bazel/toolchain:dbg",
-        "@pico-sdk//bazel/toolchain:opt",
-        "@pico-sdk//bazel/toolchain:fastbuild",
-        "@pico-sdk//bazel/toolchain:gc_sections",
-        "@pico-sdk//bazel/toolchain:cxx_no_exceptions",
-        "@pico-sdk//bazel/toolchain:cxx_no_rtti",
-        "@pico-sdk//bazel/toolchain:cxx_no_cxa_atexit",
-        "@pico-sdk//bazel/toolchain:override_max_page_size",
-    ],
     enabled_features = [
         "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
     ] + select({
@@ -298,6 +280,23 @@ _HOST_CPU_CONSTRAINTS = {
         "//bazel/constraint:pico_use_default_max_page_size_enabled": [],
         "//conditions:default": [":override_max_page_size"],
     }),
+    exec_compatible_with = [
+        _HOST_CPU_CONSTRAINTS[host_cpu],
+        _HOST_OS_CONSTRAINTS[host_os],
+    ],
+    known_features = [
+        "@rules_cc//cc/toolchains/args:experimental_replace_legacy_action_config_features",
+        "@pico-sdk//bazel/toolchain:dbg",
+        "@pico-sdk//bazel/toolchain:opt",
+        "@pico-sdk//bazel/toolchain:fastbuild",
+        "@pico-sdk//bazel/toolchain:gc_sections",
+        "@pico-sdk//bazel/toolchain:cxx_no_exceptions",
+        "@pico-sdk//bazel/toolchain:cxx_no_rtti",
+        "@pico-sdk//bazel/toolchain:cxx_no_cxa_atexit",
+        "@pico-sdk//bazel/toolchain:override_max_page_size",
+    ],
+    tags = ["manual"],  # Don't try to build this in wildcard builds.
+    tool_map = "@clang_{}-{}//:all_tools".format(host_os, host_cpu),
 ) for host_os, host_cpu in HOSTS]
 
 [toolchain(
diff --git a/bazel/toolchain/configurable_feature.bzl b/bazel/toolchain/configurable_feature.bzl
index 98f9d8a2..67bdd1c0 100644
--- a/bazel/toolchain/configurable_feature.bzl
+++ b/bazel/toolchain/configurable_feature.bzl
@@ -3,7 +3,6 @@ load("@rules_cc//cc/toolchains:args_list.bzl", "cc_args_list")
 load("@rules_cc//cc/toolchains:feature.bzl", "cc_feature")
 
 def configurable_toolchain_feature(name, copts = [], cxxopts = [], linkopts = []):
-
     all_args = []
 
     if copts:
diff --git a/bazel/toolchain/objcopy.bzl b/bazel/toolchain/objcopy.bzl
index c1ba06a3..15653cdd 100644
--- a/bazel/toolchain/objcopy.bzl
+++ b/bazel/toolchain/objcopy.bzl
@@ -1,5 +1,6 @@
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "OBJ_COPY_ACTION_NAME")
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cpp_toolchain", "use_cc_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 
 def _objcopy_to_bin_impl(ctx):
     cc_toolchain = find_cpp_toolchain(ctx)
diff --git a/bazel/util/label_flag_matches.bzl b/bazel/util/label_flag_matches.bzl
index a8375843..e704ea52 100644
--- a/bazel/util/label_flag_matches.bzl
+++ b/bazel/util/label_flag_matches.bzl
@@ -1,7 +1,6 @@
 """A wrapper that enables a `config_setting` matcher for label_flag flags."""
 
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
 
 def _match_label_flag_impl(ctx):
     matches = str(ctx.attr.expected_value.label) == str(ctx.attr.flag.label)
diff --git a/bazel/util/sdk_define.bzl b/bazel/util/sdk_define.bzl
index cd9b499f..713825db 100644
--- a/bazel/util/sdk_define.bzl
+++ b/bazel/util/sdk_define.bzl
@@ -1,4 +1,6 @@
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 def _pico_sdk_define_impl(ctx):
     val = ctx.attr.from_flag[BuildSettingInfo].value
diff --git a/bazel/util/transition.bzl b/bazel/util/transition.bzl
index aa943d60..d0104635 100644
--- a/bazel/util/transition.bzl
+++ b/bazel/util/transition.bzl
@@ -93,7 +93,7 @@ rp2040_bootloader_binary = declare_transtion(
         "_allowlist_function_transition": attr.label(
             default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
         ),
-	"_link_extra_libs": attr.label(default = "//bazel:empty_cc_lib"),
+        "_link_extra_libs": attr.label(default = "//bazel:empty_cc_lib"),
     },
     flag_overrides = {
         # We don't want --custom_malloc to ever apply to the bootloader, so
@@ -104,7 +104,7 @@ rp2040_bootloader_binary = declare_transtion(
         # binary via `link_extra_libs`, so we must drop these deps when
         # building the bootloader binaries themselves in order to avoid a
         # circular dependency.
-	"@bazel_tools//tools/cpp:link_extra_libs": "_link_extra_libs",
+        "@bazel_tools//tools/cpp:link_extra_libs": "_link_extra_libs",
     },
 )
 
diff --git a/src/boards/BUILD.bazel b/src/boards/BUILD.bazel
index 797f753c..531d26ed 100644
--- a/src/boards/BUILD.bazel
+++ b/src/boards/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "pico_board_config")
 load("//bazel/util:multiple_choice_flag.bzl", "declare_flag_choices", "flag_choice")
 
diff --git a/src/common/boot_picobin_headers/BUILD.bazel b/src/common/boot_picobin_headers/BUILD.bazel
index 2adc5569..234bdc74 100644
--- a/src/common/boot_picobin_headers/BUILD.bazel
+++ b/src/common/boot_picobin_headers/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/common/boot_picoboot_headers/BUILD.bazel b/src/common/boot_picoboot_headers/BUILD.bazel
index 7be4b958..53a88361 100644
--- a/src/common/boot_picoboot_headers/BUILD.bazel
+++ b/src/common/boot_picoboot_headers/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 # This needs to remain compatible with the host build since it's used by
diff --git a/src/common/boot_uf2_headers/BUILD.bazel b/src/common/boot_uf2_headers/BUILD.bazel
index e0df04f7..78373e61 100644
--- a/src/common/boot_uf2_headers/BUILD.bazel
+++ b/src/common/boot_uf2_headers/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/common/hardware_claim/BUILD.bazel b/src/common/hardware_claim/BUILD.bazel
index e8ca0f39..38631aa7 100644
--- a/src/common/hardware_claim/BUILD.bazel
+++ b/src/common/hardware_claim/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/common/pico_base_headers/BUILD.bazel b/src/common/pico_base_headers/BUILD.bazel
index cb043d20..d7058ee8 100644
--- a/src/common/pico_base_headers/BUILD.bazel
+++ b/src/common/pico_base_headers/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@bazel_skylib//rules:run_binary.bzl", "run_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/src/common/pico_binary_info/BUILD.bazel b/src/common/pico_binary_info/BUILD.bazel
index fa660e70..a9fac453 100644
--- a/src/common/pico_binary_info/BUILD.bazel
+++ b/src/common/pico_binary_info/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel/util:sdk_define.bzl", "pico_sdk_define")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/common/pico_bit_ops_headers/BUILD.bazel b/src/common/pico_bit_ops_headers/BUILD.bazel
index 5e6eca22..ecc6892b 100644
--- a/src/common/pico_bit_ops_headers/BUILD.bazel
+++ b/src/common/pico_bit_ops_headers/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 # This exists to break dependency cycles between
diff --git a/src/common/pico_divider_headers/BUILD.bazel b/src/common/pico_divider_headers/BUILD.bazel
index 9d27f355..240aa206 100644
--- a/src/common/pico_divider_headers/BUILD.bazel
+++ b/src/common/pico_divider_headers/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/common/pico_stdlib_headers/BUILD.bazel b/src/common/pico_stdlib_headers/BUILD.bazel
index e20a6560..c93caf45 100644
--- a/src/common/pico_stdlib_headers/BUILD.bazel
+++ b/src/common/pico_stdlib_headers/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 # Use //host/pico_stdlib or //rp2_common/pico_stdlib to get the
diff --git a/src/common/pico_sync/BUILD.bazel b/src/common/pico_sync/BUILD.bazel
index 4b65e892..3fcbdef6 100644
--- a/src/common/pico_sync/BUILD.bazel
+++ b/src/common/pico_sync/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@pico-sdk//bazel:defs.bzl", "incompatible_with_config")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/src/common/pico_time/BUILD.bazel b/src/common/pico_time/BUILD.bazel
index acf87748..052e5d25 100644
--- a/src/common/pico_time/BUILD.bazel
+++ b/src/common/pico_time/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@pico-sdk//bazel:defs.bzl", "incompatible_with_config")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/src/common/pico_usb_reset_interface_headers/BUILD.bazel b/src/common/pico_usb_reset_interface_headers/BUILD.bazel
index 880792dd..6e827437 100644
--- a/src/common/pico_usb_reset_interface_headers/BUILD.bazel
+++ b/src/common/pico_usb_reset_interface_headers/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/common/pico_util/BUILD.bazel b/src/common/pico_util/BUILD.bazel
index 6ee64a31..d1e73c0c 100644
--- a/src/common/pico_util/BUILD.bazel
+++ b/src/common/pico_util/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@pico-sdk//bazel:defs.bzl", "incompatible_with_config")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/src/host/BUILD.bazel b/src/host/BUILD.bazel
index 6dbf9555..34811f1e 100644
--- a/src/host/BUILD.bazel
+++ b/src/host/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+
 package(default_visibility = ["//visibility:public"])
 
 # This is currently unused in Bazel.
diff --git a/src/host/hardware_divider/BUILD.bazel b/src/host/hardware_divider/BUILD.bazel
index 023340bf..1d3160aa 100644
--- a/src/host/hardware_divider/BUILD.bazel
+++ b/src/host/hardware_divider/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/hardware_gpio/BUILD.bazel b/src/host/hardware_gpio/BUILD.bazel
index ee9ab82b..daa75dca 100644
--- a/src/host/hardware_gpio/BUILD.bazel
+++ b/src/host/hardware_gpio/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/hardware_irq/BUILD.bazel b/src/host/hardware_irq/BUILD.bazel
index 6a53f8de..e747c087 100644
--- a/src/host/hardware_irq/BUILD.bazel
+++ b/src/host/hardware_irq/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/hardware_sync/BUILD.bazel b/src/host/hardware_sync/BUILD.bazel
index 0e42fca2..560ee615 100644
--- a/src/host/hardware_sync/BUILD.bazel
+++ b/src/host/hardware_sync/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/hardware_timer/BUILD.bazel b/src/host/hardware_timer/BUILD.bazel
index 4c255a92..a367e903 100644
--- a/src/host/hardware_timer/BUILD.bazel
+++ b/src/host/hardware_timer/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 _DEFINES = [
diff --git a/src/host/hardware_uart/BUILD.bazel b/src/host/hardware_uart/BUILD.bazel
index 1e0c4968..20228bf9 100644
--- a/src/host/hardware_uart/BUILD.bazel
+++ b/src/host/hardware_uart/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_bit_ops/BUILD.bazel b/src/host/pico_bit_ops/BUILD.bazel
index 2b2419f6..040b3b8d 100644
--- a/src/host/pico_bit_ops/BUILD.bazel
+++ b/src/host/pico_bit_ops/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_divider/BUILD.bazel b/src/host/pico_divider/BUILD.bazel
index e97563fd..dd80923d 100644
--- a/src/host/pico_divider/BUILD.bazel
+++ b/src/host/pico_divider/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_multicore/BUILD.bazel b/src/host/pico_multicore/BUILD.bazel
index b837fb5d..07c256a3 100644
--- a/src/host/pico_multicore/BUILD.bazel
+++ b/src/host/pico_multicore/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_platform/BUILD.bazel b/src/host/pico_platform/BUILD.bazel
index c29a5bba..776b570c 100644
--- a/src/host/pico_platform/BUILD.bazel
+++ b/src/host/pico_platform/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_printf/BUILD.bazel b/src/host/pico_printf/BUILD.bazel
index b6a4bb75..14f175a5 100644
--- a/src/host/pico_printf/BUILD.bazel
+++ b/src/host/pico_printf/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_rand/BUILD.bazel b/src/host/pico_rand/BUILD.bazel
index ce71b11b..22daadad 100644
--- a/src/host/pico_rand/BUILD.bazel
+++ b/src/host/pico_rand/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_runtime/BUILD.bazel b/src/host/pico_runtime/BUILD.bazel
index a988f00e..80fe6bb6 100644
--- a/src/host/pico_runtime/BUILD.bazel
+++ b/src/host/pico_runtime/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_status_led/BUILD.bazel b/src/host/pico_status_led/BUILD.bazel
index 8c4cf325..ef184c6f 100644
--- a/src/host/pico_status_led/BUILD.bazel
+++ b/src/host/pico_status_led/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
@@ -10,4 +12,3 @@ cc_library(
         "//src/host/hardware_gpio",
     ],
 )
-
diff --git a/src/host/pico_stdio/BUILD.bazel b/src/host/pico_stdio/BUILD.bazel
index 2866130b..33214f02 100644
--- a/src/host/pico_stdio/BUILD.bazel
+++ b/src/host/pico_stdio/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_stdlib/BUILD.bazel b/src/host/pico_stdlib/BUILD.bazel
index 225cb881..0668606b 100644
--- a/src/host/pico_stdlib/BUILD.bazel
+++ b/src/host/pico_stdlib/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_time_adapter/BUILD.bazel b/src/host/pico_time_adapter/BUILD.bazel
index 9b4b963b..5a5241c3 100644
--- a/src/host/pico_time_adapter/BUILD.bazel
+++ b/src/host/pico_time_adapter/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/host/pico_unique_id/BUILD.bazel b/src/host/pico_unique_id/BUILD.bazel
index 111de598..a4d2705c 100644
--- a/src/host/pico_unique_id/BUILD.bazel
+++ b/src/host/pico_unique_id/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/rp2040/boot_stage2/BUILD.bazel b/src/rp2040/boot_stage2/BUILD.bazel
index 56ed5f3c..2f391ab6 100644
--- a/src/rp2040/boot_stage2/BUILD.bazel
+++ b/src/rp2040/boot_stage2/BUILD.bazel
@@ -3,6 +3,8 @@
 
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 load("@bazel_skylib//rules:run_binary.bzl", "run_binary")
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_python//python:defs.bzl", "py_binary")
 load("//bazel/toolchain:objcopy.bzl", "objcopy_to_bin")
 load("//bazel/util:multiple_choice_flag.bzl", "declare_flag_choices", "flag_choice")
diff --git a/src/rp2040/hardware_regs/BUILD.bazel b/src/rp2040/hardware_regs/BUILD.bazel
index cb19e284..71701925 100644
--- a/src/rp2040/hardware_regs/BUILD.bazel
+++ b/src/rp2040/hardware_regs/BUILD.bazel
@@ -1,6 +1,8 @@
 # Always include these libraries through //src/rp2_common:*!
 # This ensures that you'll get the right headers for the MCU you're targeting.
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(
     default_visibility = [
         "//src/rp2040:__subpackages__",
diff --git a/src/rp2040/hardware_structs/BUILD.bazel b/src/rp2040/hardware_structs/BUILD.bazel
index 75240454..c82a33d9 100644
--- a/src/rp2040/hardware_structs/BUILD.bazel
+++ b/src/rp2040/hardware_structs/BUILD.bazel
@@ -1,6 +1,8 @@
 # Always include these libraries through //src/rp2_common:*!
 # This ensures that you'll get the right headers for the MCU you're targeting.
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(
     default_visibility = [
         "//src/rp2040:__subpackages__",
diff --git a/src/rp2040/pico_platform/BUILD.bazel b/src/rp2040/pico_platform/BUILD.bazel
index 47b90e43..dd4412b0 100644
--- a/src/rp2040/pico_platform/BUILD.bazel
+++ b/src/rp2040/pico_platform/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(
     default_visibility = [
         "//src/rp2040:__subpackages__",
diff --git a/src/rp2350/boot_stage2/BUILD.bazel b/src/rp2350/boot_stage2/BUILD.bazel
index 42e4249d..5bf5aa2d 100644
--- a/src/rp2350/boot_stage2/BUILD.bazel
+++ b/src/rp2350/boot_stage2/BUILD.bazel
@@ -3,6 +3,8 @@
 
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 load("@bazel_skylib//rules:run_binary.bzl", "run_binary")
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_python//python:defs.bzl", "py_binary")
 load("//bazel/toolchain:objcopy.bzl", "objcopy_to_bin")
 load("//bazel/util:multiple_choice_flag.bzl", "declare_flag_choices", "flag_choice")
diff --git a/src/rp2350/hardware_regs/BUILD.bazel b/src/rp2350/hardware_regs/BUILD.bazel
index b665bbbe..5a8c5e8d 100644
--- a/src/rp2350/hardware_regs/BUILD.bazel
+++ b/src/rp2350/hardware_regs/BUILD.bazel
@@ -1,6 +1,8 @@
 # Always include these libraries through //src/rp2_common:*!
 # This ensures that you'll get the right headers for the MCU you're targeting.
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(
     default_visibility = [
         "//src/rp2350:__subpackages__",
diff --git a/src/rp2350/hardware_structs/BUILD.bazel b/src/rp2350/hardware_structs/BUILD.bazel
index 518cab21..723f75ee 100644
--- a/src/rp2350/hardware_structs/BUILD.bazel
+++ b/src/rp2350/hardware_structs/BUILD.bazel
@@ -1,6 +1,8 @@
 # Always include these libraries through //src/rp2_common:*!
 # This ensures that you'll get the right headers for the MCU you're targeting.
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(
     default_visibility = [
         "//src/rp2350:__subpackages__",
diff --git a/src/rp2350/pico_platform/BUILD.bazel b/src/rp2350/pico_platform/BUILD.bazel
index b24291a2..f6182b90 100644
--- a/src/rp2350/pico_platform/BUILD.bazel
+++ b/src/rp2350/pico_platform/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(
     default_visibility = [
         "//src/rp2350:__subpackages__",
diff --git a/src/rp2_common/boot_bootrom_headers/BUILD.bazel b/src/rp2_common/boot_bootrom_headers/BUILD.bazel
index 51b5f7b7..69538ed0 100644
--- a/src/rp2_common/boot_bootrom_headers/BUILD.bazel
+++ b/src/rp2_common/boot_bootrom_headers/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/rp2_common/cmsis/BUILD.bazel b/src/rp2_common/cmsis/BUILD.bazel
index 4af320e1..a5407124 100644
--- a/src/rp2_common/cmsis/BUILD.bazel
+++ b/src/rp2_common/cmsis/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_adc/BUILD.bazel b/src/rp2_common/hardware_adc/BUILD.bazel
index a94c62ca..80e99cd8 100644
--- a/src/rp2_common/hardware_adc/BUILD.bazel
+++ b/src/rp2_common/hardware_adc/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_base/BUILD.bazel b/src/rp2_common/hardware_base/BUILD.bazel
index 0e17e6c8..8015af2d 100644
--- a/src/rp2_common/hardware_base/BUILD.bazel
+++ b/src/rp2_common/hardware_base/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_boot_lock/BUILD.bazel b/src/rp2_common/hardware_boot_lock/BUILD.bazel
index 96cb7827..39c4661b 100644
--- a/src/rp2_common/hardware_boot_lock/BUILD.bazel
+++ b/src/rp2_common/hardware_boot_lock/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
@@ -8,8 +9,8 @@ cc_library(
     hdrs = ["include/hardware/boot_lock.h"],
     includes = ["include"],
     tags = ["manual"],
-    deps = ["//src:pico_platform_internal"],
     visibility = ["//src/rp2_common/pico_bootrom:__pkg__"],
+    deps = ["//src:pico_platform_internal"],
 )
 
 cc_library(
diff --git a/src/rp2_common/hardware_clocks/BUILD.bazel b/src/rp2_common/hardware_clocks/BUILD.bazel
index 2c2ffe24..29c1bb10 100644
--- a/src/rp2_common/hardware_clocks/BUILD.bazel
+++ b/src/rp2_common/hardware_clocks/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_dcp/BUILD.bazel b/src/rp2_common/hardware_dcp/BUILD.bazel
index 2a267c23..8b64a7b2 100644
--- a/src/rp2_common/hardware_dcp/BUILD.bazel
+++ b/src/rp2_common/hardware_dcp/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_divider/BUILD.bazel b/src/rp2_common/hardware_divider/BUILD.bazel
index 30b4b8ee..39b154da 100644
--- a/src/rp2_common/hardware_divider/BUILD.bazel
+++ b/src/rp2_common/hardware_divider/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_dma/BUILD.bazel b/src/rp2_common/hardware_dma/BUILD.bazel
index 7adbd39f..0798bf3d 100644
--- a/src/rp2_common/hardware_dma/BUILD.bazel
+++ b/src/rp2_common/hardware_dma/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_exception/BUILD.bazel b/src/rp2_common/hardware_exception/BUILD.bazel
index ddbc0f67..c97766ee 100644
--- a/src/rp2_common/hardware_exception/BUILD.bazel
+++ b/src/rp2_common/hardware_exception/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_flash/BUILD.bazel b/src/rp2_common/hardware_flash/BUILD.bazel
index d50d0c73..3e063188 100644
--- a/src/rp2_common/hardware_flash/BUILD.bazel
+++ b/src/rp2_common/hardware_flash/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
@@ -11,8 +12,8 @@ cc_library(
     target_compatible_with = compatible_with_rp2(),
     deps = [
         "//src/rp2_common:hardware_structs",
-        "//src/rp2_common/hardware_xip_cache",
         "//src/rp2_common:pico_platform",
+        "//src/rp2_common/hardware_xip_cache",
         "//src/rp2_common/pico_bootrom",
         "//src/rp2_common/pico_multicore",
     ],
diff --git a/src/rp2_common/hardware_gpio/BUILD.bazel b/src/rp2_common/hardware_gpio/BUILD.bazel
index c6646b62..afa96079 100644
--- a/src/rp2_common/hardware_gpio/BUILD.bazel
+++ b/src/rp2_common/hardware_gpio/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_hazard3/BUILD.bazel b/src/rp2_common/hardware_hazard3/BUILD.bazel
index 963d38f1..c9417be8 100644
--- a/src/rp2_common/hardware_hazard3/BUILD.bazel
+++ b/src/rp2_common/hardware_hazard3/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_i2c/BUILD.bazel b/src/rp2_common/hardware_i2c/BUILD.bazel
index 877add95..288713b9 100644
--- a/src/rp2_common/hardware_i2c/BUILD.bazel
+++ b/src/rp2_common/hardware_i2c/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_interp/BUILD.bazel b/src/rp2_common/hardware_interp/BUILD.bazel
index e26b2a0b..a6cad471 100644
--- a/src/rp2_common/hardware_interp/BUILD.bazel
+++ b/src/rp2_common/hardware_interp/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_irq/BUILD.bazel b/src/rp2_common/hardware_irq/BUILD.bazel
index 498fd22a..ea5d4103 100644
--- a/src/rp2_common/hardware_irq/BUILD.bazel
+++ b/src/rp2_common/hardware_irq/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_pio/BUILD.bazel b/src/rp2_common/hardware_pio/BUILD.bazel
index 74fc0668..0943aeb7 100644
--- a/src/rp2_common/hardware_pio/BUILD.bazel
+++ b/src/rp2_common/hardware_pio/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_pll/BUILD.bazel b/src/rp2_common/hardware_pll/BUILD.bazel
index 3f3a08ae..cb47663f 100644
--- a/src/rp2_common/hardware_pll/BUILD.bazel
+++ b/src/rp2_common/hardware_pll/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_powman/BUILD.bazel b/src/rp2_common/hardware_powman/BUILD.bazel
index 28350d34..8c8971e4 100644
--- a/src/rp2_common/hardware_powman/BUILD.bazel
+++ b/src/rp2_common/hardware_powman/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/rp2_common/hardware_pwm/BUILD.bazel b/src/rp2_common/hardware_pwm/BUILD.bazel
index c5c5cd40..4407759e 100644
--- a/src/rp2_common/hardware_pwm/BUILD.bazel
+++ b/src/rp2_common/hardware_pwm/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_rcp/BUILD.bazel b/src/rp2_common/hardware_rcp/BUILD.bazel
index 6f8be1be..a855c9a4 100644
--- a/src/rp2_common/hardware_rcp/BUILD.bazel
+++ b/src/rp2_common/hardware_rcp/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_resets/BUILD.bazel b/src/rp2_common/hardware_resets/BUILD.bazel
index 56c8cdfd..82be67cf 100644
--- a/src/rp2_common/hardware_resets/BUILD.bazel
+++ b/src/rp2_common/hardware_resets/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_riscv/BUILD.bazel b/src/rp2_common/hardware_riscv/BUILD.bazel
index 3532490d..75b15a6f 100644
--- a/src/rp2_common/hardware_riscv/BUILD.bazel
+++ b/src/rp2_common/hardware_riscv/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_riscv_platform_timer/BUILD.bazel b/src/rp2_common/hardware_riscv_platform_timer/BUILD.bazel
index 1ced3e3c..790be1e4 100644
--- a/src/rp2_common/hardware_riscv_platform_timer/BUILD.bazel
+++ b/src/rp2_common/hardware_riscv_platform_timer/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_rtc/BUILD.bazel b/src/rp2_common/hardware_rtc/BUILD.bazel
index 847798ce..f239f8d8 100644
--- a/src/rp2_common/hardware_rtc/BUILD.bazel
+++ b/src/rp2_common/hardware_rtc/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/rp2_common/hardware_sha256/BUILD.bazel b/src/rp2_common/hardware_sha256/BUILD.bazel
index 41dde098..129b8270 100644
--- a/src/rp2_common/hardware_sha256/BUILD.bazel
+++ b/src/rp2_common/hardware_sha256/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/src/rp2_common/hardware_spi/BUILD.bazel b/src/rp2_common/hardware_spi/BUILD.bazel
index a9f0d905..83c75ce1 100644
--- a/src/rp2_common/hardware_spi/BUILD.bazel
+++ b/src/rp2_common/hardware_spi/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_sync/BUILD.bazel b/src/rp2_common/hardware_sync/BUILD.bazel
index dda15731..02b06f83 100644
--- a/src/rp2_common/hardware_sync/BUILD.bazel
+++ b/src/rp2_common/hardware_sync/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_sync_spin_lock/BUILD.bazel b/src/rp2_common/hardware_sync_spin_lock/BUILD.bazel
index 87a1edc5..5ac6e4b6 100644
--- a/src/rp2_common/hardware_sync_spin_lock/BUILD.bazel
+++ b/src/rp2_common/hardware_sync_spin_lock/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_ticks/BUILD.bazel b/src/rp2_common/hardware_ticks/BUILD.bazel
index df486945..e3503656 100644
--- a/src/rp2_common/hardware_ticks/BUILD.bazel
+++ b/src/rp2_common/hardware_ticks/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_timer/BUILD.bazel b/src/rp2_common/hardware_timer/BUILD.bazel
index 2cdfe62b..ea7586d3 100644
--- a/src/rp2_common/hardware_timer/BUILD.bazel
+++ b/src/rp2_common/hardware_timer/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_uart/BUILD.bazel b/src/rp2_common/hardware_uart/BUILD.bazel
index fe5a3457..29ef6b59 100644
--- a/src/rp2_common/hardware_uart/BUILD.bazel
+++ b/src/rp2_common/hardware_uart/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 load("//bazel/util:sdk_define.bzl", "pico_sdk_define")
 
diff --git a/src/rp2_common/hardware_vreg/BUILD.bazel b/src/rp2_common/hardware_vreg/BUILD.bazel
index d8f092be..d986f5d3 100644
--- a/src/rp2_common/hardware_vreg/BUILD.bazel
+++ b/src/rp2_common/hardware_vreg/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_watchdog/BUILD.bazel b/src/rp2_common/hardware_watchdog/BUILD.bazel
index 01907957..93184bd0 100644
--- a/src/rp2_common/hardware_watchdog/BUILD.bazel
+++ b/src/rp2_common/hardware_watchdog/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_xip_cache/BUILD.bazel b/src/rp2_common/hardware_xip_cache/BUILD.bazel
index df81b8e3..86660317 100644
--- a/src/rp2_common/hardware_xip_cache/BUILD.bazel
+++ b/src/rp2_common/hardware_xip_cache/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/hardware_xosc/BUILD.bazel b/src/rp2_common/hardware_xosc/BUILD.bazel
index d4996c61..d85735ba 100644
--- a/src/rp2_common/hardware_xosc/BUILD.bazel
+++ b/src/rp2_common/hardware_xosc/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_aon_timer/BUILD.bazel b/src/rp2_common/pico_aon_timer/BUILD.bazel
index 45ef4f3c..5049bdde 100644
--- a/src/rp2_common/pico_aon_timer/BUILD.bazel
+++ b/src/rp2_common/pico_aon_timer/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
@@ -12,8 +13,8 @@ cc_library(
     includes = ["include"],
     target_compatible_with = compatible_with_rp2(),
     deps = [
-        "//src/common/pico_util",
         "//src/common/pico_time",
+        "//src/common/pico_util",
         "//src/rp2_common:hardware_regs",
         "//src/rp2_common:pico_platform",
         "//src/rp2_common/hardware_irq",
diff --git a/src/rp2_common/pico_async_context/BUILD.bazel b/src/rp2_common/pico_async_context/BUILD.bazel
index a2de0acd..739d517b 100644
--- a/src/rp2_common/pico_async_context/BUILD.bazel
+++ b/src/rp2_common/pico_async_context/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2", "incompatible_with_config")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_atomic/BUILD.bazel b/src/rp2_common/pico_atomic/BUILD.bazel
index 98dae547..0d3394f8 100644
--- a/src/rp2_common/pico_atomic/BUILD.bazel
+++ b/src/rp2_common/pico_atomic/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_bit_ops/BUILD.bazel b/src/rp2_common/pico_bit_ops/BUILD.bazel
index dcfe1a67..623132db 100644
--- a/src/rp2_common/pico_bit_ops/BUILD.bazel
+++ b/src/rp2_common/pico_bit_ops/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_bootrom/BUILD.bazel b/src/rp2_common/pico_bootrom/BUILD.bazel
index 1463216d..f3191aa5 100644
--- a/src/rp2_common/pico_bootrom/BUILD.bazel
+++ b/src/rp2_common/pico_bootrom/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
@@ -17,8 +18,8 @@ cc_library(
     deps = [
         "//src/rp2_common/boot_bootrom_headers",
         "//src/rp2_common/hardware_boot_lock:hardware_boot_lock_headers",
-        "//src/rp2_common/pico_flash:pico_flash_headers",
         "//src/rp2_common/hardware_rcp:hardware_rcp_headers",
+        "//src/rp2_common/pico_flash:pico_flash_headers",
     ] + select({
         "//bazel/constraint:host": ["//src/host/hardware_sync"],
         "//conditions:default": ["//src/rp2_common/hardware_sync"],
diff --git a/src/rp2_common/pico_bootsel_via_double_reset/BUILD.bazel b/src/rp2_common/pico_bootsel_via_double_reset/BUILD.bazel
index 90d65ada..190fcacd 100644
--- a/src/rp2_common/pico_bootsel_via_double_reset/BUILD.bazel
+++ b/src/rp2_common/pico_bootsel_via_double_reset/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_btstack/BUILD.bazel b/src/rp2_common/pico_btstack/BUILD.bazel
index 5d88ad69..73bdb952 100644
--- a/src/rp2_common/pico_btstack/BUILD.bazel
+++ b/src/rp2_common/pico_btstack/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_pico_w", "incompatible_with_config")
 
 package(default_visibility = ["//visibility:public"])
@@ -11,6 +12,7 @@ package(default_visibility = ["//visibility:public"])
 #   --@pico-sdk//bazel/constraint:PICO_BT_ENABLE_MESH
 cc_library(
     name = "pico_btstack",
+    target_compatible_with = incompatible_with_config("//bazel/constraint:pico_btstack_config_unset"),
     deps = ["pico_btstack_base"] + select({
         "//bazel/constraint:pico_bt_enable_ble_enabled": [":pico_btstack_ble"],
         "//conditions:default": [],
@@ -21,7 +23,6 @@ cc_library(
         "//bazel/constraint:pico_bt_enable_mesh_enabled": [":pico_btstack_mesh"],
         "//conditions:default": [],
     }),
-    target_compatible_with = incompatible_with_config("//bazel/constraint:pico_btstack_config_unset"),
 )
 
 # Prefer these aliases to directly referencing @btstack, as it's possible that
diff --git a/src/rp2_common/pico_clib_interface/BUILD.bazel b/src/rp2_common/pico_clib_interface/BUILD.bazel
index 9bb05a99..de77a9be 100644
--- a/src/rp2_common/pico_clib_interface/BUILD.bazel
+++ b/src/rp2_common/pico_clib_interface/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_crt0/BUILD.bazel b/src/rp2_common/pico_crt0/BUILD.bazel
index e9d5fa83..b47b9c6c 100644
--- a/src/rp2_common/pico_crt0/BUILD.bazel
+++ b/src/rp2_common/pico_crt0/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_crt0/rp2040/BUILD.bazel b/src/rp2_common/pico_crt0/rp2040/BUILD.bazel
index dcf727cc..44912f0c 100644
--- a/src/rp2_common/pico_crt0/rp2040/BUILD.bazel
+++ b/src/rp2_common/pico_crt0/rp2040/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(
@@ -6,7 +8,7 @@ exports_files(
         "memmap_copy_to_ram.ld",
         "memmap_default.ld",
         "memmap_no_flash.ld",
-    ]
+    ],
 )
 
 # It's possible to set linker scripts globally or on a per-binary basis.
diff --git a/src/rp2_common/pico_crt0/rp2350/BUILD.bazel b/src/rp2_common/pico_crt0/rp2350/BUILD.bazel
index 88cbd103..b0f1ca7d 100644
--- a/src/rp2_common/pico_crt0/rp2350/BUILD.bazel
+++ b/src/rp2_common/pico_crt0/rp2350/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 exports_files(
@@ -5,7 +7,7 @@ exports_files(
         "memmap_copy_to_ram.ld",
         "memmap_default.ld",
         "memmap_no_flash.ld",
-    ]
+    ],
 )
 
 # It's possible to set linker scripts globally or on a per-binary basis.
diff --git a/src/rp2_common/pico_cxx_options/BUILD.bazel b/src/rp2_common/pico_cxx_options/BUILD.bazel
index cef710c8..61ef0c3a 100644
--- a/src/rp2_common/pico_cxx_options/BUILD.bazel
+++ b/src/rp2_common/pico_cxx_options/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 load("//bazel/util:sdk_define.bzl", "pico_sdk_define")
 
diff --git a/src/rp2_common/pico_cyw43_arch/BUILD.bazel b/src/rp2_common/pico_cyw43_arch/BUILD.bazel
index 286184e7..b541196c 100644
--- a/src/rp2_common/pico_cyw43_arch/BUILD.bazel
+++ b/src/rp2_common/pico_cyw43_arch/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_pico_w", "incompatible_with_config")
 
 package(default_visibility = ["//visibility:public"])
@@ -7,7 +8,7 @@ alias(
     actual = select({
         "//bazel/constraint:pico_lwip_config_unset": ":select_no_lwip",
         "//conditions:default": ":select_lwip",
-    })
+    }),
 )
 
 alias(
diff --git a/src/rp2_common/pico_cyw43_driver/BUILD.bazel b/src/rp2_common/pico_cyw43_driver/BUILD.bazel
index 3810b27c..a79bc150 100644
--- a/src/rp2_common/pico_cyw43_driver/BUILD.bazel
+++ b/src/rp2_common/pico_cyw43_driver/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_pico_w", "pico_generate_pio_header")
 
 package(default_visibility = ["//visibility:public"])
@@ -40,7 +41,7 @@ cc_library(
     ] + select({
         "//bazel/constraint:pico_btstack_config_unset": [],
         "//conditions:default": [
-            "//src/rp2_common/pico_btstack:pico_btstack",
+            "//src/rp2_common/pico_btstack",
         ],
     }),
     alwayslink = True,
@@ -51,8 +52,8 @@ cc_library(
     srcs = select({
         "//bazel/constraint:pico_btstack_config_unset": [],
         "//conditions:default": [
-            "btstack_cyw43.c",
             "btstack_chipset_cyw43.c",
+            "btstack_cyw43.c",
             "btstack_hci_transport_cyw43.c",
         ],
     }),
@@ -70,10 +71,10 @@ cc_library(
         "//bazel/constraint:pico_btstack_config_unset": [],
         "//conditions:default": [
             "//bazel/config:PICO_BTSTACK_CONFIG",
-            "//src/rp2_common/pico_cyw43_driver/cybt_shared_bus:cybt_shared_bus_driver",
+            "//src/rp2_common/pico_btstack",
             "//src/rp2_common/pico_btstack:btstack_run_loop_async_context",
-            "//src/rp2_common/pico_btstack:pico_btstack",
             "//src/rp2_common/pico_btstack:pico_btstack_flash_bank",
+            "//src/rp2_common/pico_cyw43_driver/cybt_shared_bus:cybt_shared_bus_driver",
         ],
     }),
     alwayslink = True,
@@ -89,7 +90,7 @@ pico_generate_pio_header(
 filegroup(
     name = "pico_use_partition_firmware",
     srcs = [
-        "wifi_firmware.S",
         "include/cyw43_partition_firmware.h",
-    ]
+        "wifi_firmware.S",
+    ],
 )
diff --git a/src/rp2_common/pico_cyw43_driver/cybt_shared_bus/BUILD.bazel b/src/rp2_common/pico_cyw43_driver/cybt_shared_bus/BUILD.bazel
index 7ade7c78..bff4753d 100644
--- a/src/rp2_common/pico_cyw43_driver/cybt_shared_bus/BUILD.bazel
+++ b/src/rp2_common/pico_cyw43_driver/cybt_shared_bus/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
@@ -6,7 +8,10 @@ cc_library(
         "cybt_shared_bus.c",
         "cybt_shared_bus_driver.c",
     ],
-    hdrs = ["cybt_shared_bus_driver.h", "cybt_logging.h"],
+    hdrs = [
+        "cybt_logging.h",
+        "cybt_shared_bus_driver.h",
+    ],
     includes = ["."],
     deps = [
         "@cyw43-driver//:cyw43_driver",
diff --git a/src/rp2_common/pico_divider/BUILD.bazel b/src/rp2_common/pico_divider/BUILD.bazel
index efd295a5..dfd0d726 100644
--- a/src/rp2_common/pico_divider/BUILD.bazel
+++ b/src/rp2_common/pico_divider/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 alias(
diff --git a/src/rp2_common/pico_double/BUILD.bazel b/src/rp2_common/pico_double/BUILD.bazel
index 5e5f73e3..f9bc97e9 100644
--- a/src/rp2_common/pico_double/BUILD.bazel
+++ b/src/rp2_common/pico_double/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2", "incompatible_with_config")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_fix/BUILD.bazel b/src/rp2_common/pico_fix/BUILD.bazel
index 7909e5f0..0c742997 100644
--- a/src/rp2_common/pico_fix/BUILD.bazel
+++ b/src/rp2_common/pico_fix/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/BUILD.bazel b/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/BUILD.bazel
index 9a1b0936..8bebae9c 100644
--- a/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/BUILD.bazel
+++ b/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_flash/BUILD.bazel b/src/rp2_common/pico_flash/BUILD.bazel
index 0a1b3f1e..2315c864 100644
--- a/src/rp2_common/pico_flash/BUILD.bazel
+++ b/src/rp2_common/pico_flash/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_float/BUILD.bazel b/src/rp2_common/pico_float/BUILD.bazel
index 8d4ab363..d0a0f984 100644
--- a/src/rp2_common/pico_float/BUILD.bazel
+++ b/src/rp2_common/pico_float/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2", "incompatible_with_config")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_i2c_slave/BUILD.bazel b/src/rp2_common/pico_i2c_slave/BUILD.bazel
index 739b331b..2fe81bda 100644
--- a/src/rp2_common/pico_i2c_slave/BUILD.bazel
+++ b/src/rp2_common/pico_i2c_slave/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_int64_ops/BUILD.bazel b/src/rp2_common/pico_int64_ops/BUILD.bazel
index 58685318..7eaec6e2 100644
--- a/src/rp2_common/pico_int64_ops/BUILD.bazel
+++ b/src/rp2_common/pico_int64_ops/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_lwip/BUILD.bazel b/src/rp2_common/pico_lwip/BUILD.bazel
index cc5de44c..8c011ffc 100644
--- a/src/rp2_common/pico_lwip/BUILD.bazel
+++ b/src/rp2_common/pico_lwip/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_pico_w")
 
 package(default_visibility = ["//visibility:public"])
@@ -31,8 +32,8 @@ cc_library(
 cc_library(
     name = "pico_lwip_nosys",
     srcs = ["lwip_nosys.c"],
-    includes = ["include"],
     hdrs = ["include/pico/lwip_nosys.h"],
+    includes = ["include"],
     target_compatible_with = compatible_with_pico_w(),
     deps = [
         ":pico_lwip",
diff --git a/src/rp2_common/pico_malloc/BUILD.bazel b/src/rp2_common/pico_malloc/BUILD.bazel
index 944fc1d5..0a21cf05 100644
--- a/src/rp2_common/pico_malloc/BUILD.bazel
+++ b/src/rp2_common/pico_malloc/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_mbedtls/BUILD.bazel b/src/rp2_common/pico_mbedtls/BUILD.bazel
index 843ae821..f04f1d77 100644
--- a/src/rp2_common/pico_mbedtls/BUILD.bazel
+++ b/src/rp2_common/pico_mbedtls/BUILD.bazel
@@ -1,12 +1,13 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "pico_mbedtls_config",
-    includes = ["include"],
     hdrs = ["include/pico_mbedtls_config.h"],
     defines = ['MBEDTLS_CONFIG_FILE=\\"pico_mbedtls_config.h\\"'],
+    includes = ["include"],
 )
 
 cc_library(
@@ -16,13 +17,13 @@ cc_library(
     includes = ["include"],
     target_compatible_with = compatible_with_rp2(),
     deps = [
-        ":pico_mbedtls_library",
         ":pico_mbedtls_config",
+        ":pico_mbedtls_library",
         "//src/rp2_common:pico_platform",
         "//src/rp2_common/pico_rand",
     ] + select({
-        "//bazel/constraint:rp2350": [ "//src/rp2_common/pico_sha256" ],
-        "//conditions:default": [ ],
+        "//bazel/constraint:rp2350": ["//src/rp2_common/pico_sha256"],
+        "//conditions:default": [],
     }),
 )
 
diff --git a/src/rp2_common/pico_mem_ops/BUILD.bazel b/src/rp2_common/pico_mem_ops/BUILD.bazel
index df9128d7..6acf3c7c 100644
--- a/src/rp2_common/pico_mem_ops/BUILD.bazel
+++ b/src/rp2_common/pico_mem_ops/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_multicore/BUILD.bazel b/src/rp2_common/pico_multicore/BUILD.bazel
index 4e8a704a..c029b784 100644
--- a/src/rp2_common/pico_multicore/BUILD.bazel
+++ b/src/rp2_common/pico_multicore/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_config", "compatible_with_rp2", "incompatible_with_config")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_platform_common/BUILD.bazel b/src/rp2_common/pico_platform_common/BUILD.bazel
index 18a373a5..82238983 100644
--- a/src/rp2_common/pico_platform_common/BUILD.bazel
+++ b/src/rp2_common/pico_platform_common/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
@@ -18,8 +19,8 @@ cc_library(
     target_compatible_with = compatible_with_rp2(),
     deps = [
         ":pico_platform_common_headers",
+        "//src/common/pico_base_headers",
         "//src/rp2_common:platform_defs",
         "//src/rp2_common/hardware_base",
-        "//src/common/pico_base_headers",
     ],
 )
diff --git a/src/rp2_common/pico_platform_compiler/BUILD.bazel b/src/rp2_common/pico_platform_compiler/BUILD.bazel
index aa648670..dba2c301 100644
--- a/src/rp2_common/pico_platform_compiler/BUILD.bazel
+++ b/src/rp2_common/pico_platform_compiler/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_platform_panic/BUILD.bazel b/src/rp2_common/pico_platform_panic/BUILD.bazel
index 8ad2b997..1a29b9c1 100644
--- a/src/rp2_common/pico_platform_panic/BUILD.bazel
+++ b/src/rp2_common/pico_platform_panic/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_platform_sections/BUILD.bazel b/src/rp2_common/pico_platform_sections/BUILD.bazel
index 1553854f..cb90be1a 100644
--- a/src/rp2_common/pico_platform_sections/BUILD.bazel
+++ b/src/rp2_common/pico_platform_sections/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_printf/BUILD.bazel b/src/rp2_common/pico_printf/BUILD.bazel
index b18f0016..a65a0ce8 100644
--- a/src/rp2_common/pico_printf/BUILD.bazel
+++ b/src/rp2_common/pico_printf/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_rand/BUILD.bazel b/src/rp2_common/pico_rand/BUILD.bazel
index 19473e1e..4b6b332d 100644
--- a/src/rp2_common/pico_rand/BUILD.bazel
+++ b/src/rp2_common/pico_rand/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_runtime/BUILD.bazel b/src/rp2_common/pico_runtime/BUILD.bazel
index 4cffb2c0..3f8b7e87 100644
--- a/src/rp2_common/pico_runtime/BUILD.bazel
+++ b/src/rp2_common/pico_runtime/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_runtime_init/BUILD.bazel b/src/rp2_common/pico_runtime_init/BUILD.bazel
index 8956c4e1..0af3b23f 100644
--- a/src/rp2_common/pico_runtime_init/BUILD.bazel
+++ b/src/rp2_common/pico_runtime_init/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_sha256/BUILD.bazel b/src/rp2_common/pico_sha256/BUILD.bazel
index e2882d11..03aba514 100644
--- a/src/rp2_common/pico_sha256/BUILD.bazel
+++ b/src/rp2_common/pico_sha256/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_standard_link/BUILD.bazel b/src/rp2_common/pico_standard_link/BUILD.bazel
index d2449f5d..4c8ff249 100644
--- a/src/rp2_common/pico_standard_link/BUILD.bazel
+++ b/src/rp2_common/pico_standard_link/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 load("pico_flash_region.bzl", "generated_pico_flash_region")
 
diff --git a/src/rp2_common/pico_standard_link/pico_flash_region.bzl b/src/rp2_common/pico_standard_link/pico_flash_region.bzl
index 3d1e5c46..9fce7c4f 100644
--- a/src/rp2_common/pico_standard_link/pico_flash_region.bzl
+++ b/src/rp2_common/pico_standard_link/pico_flash_region.bzl
@@ -1,4 +1,6 @@
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "use_cpp_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 def _generated_pico_flash_region_impl(ctx):
     flash_region_linker_fragment = ctx.actions.declare_file(ctx.label.name + "/ldinclude/pico_flash_region.ld")
diff --git a/src/rp2_common/pico_status_led/BUILD.bazel b/src/rp2_common/pico_status_led/BUILD.bazel
index 6b618de4..a234fb26 100644
--- a/src/rp2_common/pico_status_led/BUILD.bazel
+++ b/src/rp2_common/pico_status_led/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2", "pico_generate_pio_header")
 
 package(default_visibility = ["//visibility:public"])
@@ -16,7 +17,7 @@ cc_library(
             "//src/rp2_common/pico_cyw43_driver",
         ],
         "//bazel/constraint:is_pico2_w": [
-            "//src/rp2_common/pico_cyw43_driver"
+            "//src/rp2_common/pico_cyw43_driver",
         ],
         "//conditions:default": [],
     }),
diff --git a/src/rp2_common/pico_stdio/BUILD.bazel b/src/rp2_common/pico_stdio/BUILD.bazel
index 3aeed0f1..82244c49 100644
--- a/src/rp2_common/pico_stdio/BUILD.bazel
+++ b/src/rp2_common/pico_stdio/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_stdio_rtt/BUILD.bazel b/src/rp2_common/pico_stdio_rtt/BUILD.bazel
index 5cec6680..80f2c232 100644
--- a/src/rp2_common/pico_stdio_rtt/BUILD.bazel
+++ b/src/rp2_common/pico_stdio_rtt/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_config", "compatible_with_rp2", "incompatible_with_config")
 load("//bazel/util:sdk_define.bzl", "pico_sdk_define")
 
diff --git a/src/rp2_common/pico_stdio_semihosting/BUILD.bazel b/src/rp2_common/pico_stdio_semihosting/BUILD.bazel
index 115f1f0d..23f27b3d 100644
--- a/src/rp2_common/pico_stdio_semihosting/BUILD.bazel
+++ b/src/rp2_common/pico_stdio_semihosting/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_config", "compatible_with_rp2", "incompatible_with_config")
 load("//bazel/util:sdk_define.bzl", "pico_sdk_define")
 
diff --git a/src/rp2_common/pico_stdio_uart/BUILD.bazel b/src/rp2_common/pico_stdio_uart/BUILD.bazel
index b178cbaa..faa7808f 100644
--- a/src/rp2_common/pico_stdio_uart/BUILD.bazel
+++ b/src/rp2_common/pico_stdio_uart/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_config", "compatible_with_rp2", "incompatible_with_config")
 load("//bazel/util:sdk_define.bzl", "pico_sdk_define")
 
diff --git a/src/rp2_common/pico_stdio_usb/BUILD.bazel b/src/rp2_common/pico_stdio_usb/BUILD.bazel
index 1e881714..f554378b 100644
--- a/src/rp2_common/pico_stdio_usb/BUILD.bazel
+++ b/src/rp2_common/pico_stdio_usb/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_config", "compatible_with_rp2", "incompatible_with_config")
 load("//bazel/util:sdk_define.bzl", "pico_sdk_define")
 
diff --git a/src/rp2_common/pico_stdlib/BUILD.bazel b/src/rp2_common/pico_stdlib/BUILD.bazel
index f4a15d98..57c433a1 100644
--- a/src/rp2_common/pico_stdlib/BUILD.bazel
+++ b/src/rp2_common/pico_stdlib/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_time_adapter/BUILD.bazel b/src/rp2_common/pico_time_adapter/BUILD.bazel
index 3cbc845f..a03c20c5 100644
--- a/src/rp2_common/pico_time_adapter/BUILD.bazel
+++ b/src/rp2_common/pico_time_adapter/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/pico_unique_id/BUILD.bazel b/src/rp2_common/pico_unique_id/BUILD.bazel
index 7a8c557e..8bbca6ee 100644
--- a/src/rp2_common/pico_unique_id/BUILD.bazel
+++ b/src/rp2_common/pico_unique_id/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/src/rp2_common/tinyusb/BUILD.bazel b/src/rp2_common/tinyusb/BUILD.bazel
index fcc0405a..1be236e9 100644
--- a/src/rp2_common/tinyusb/BUILD.bazel
+++ b/src/rp2_common/tinyusb/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/test/cmsis_test/BUILD.bazel b/test/cmsis_test/BUILD.bazel
index 3b9a4d7d..b7ef34b5 100644
--- a/test/cmsis_test/BUILD.bazel
+++ b/test/cmsis_test/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/test/hardware_irq_test/BUILD.bazel b/test/hardware_irq_test/BUILD.bazel
index 8787b7b3..a17bb695 100644
--- a/test/hardware_irq_test/BUILD.bazel
+++ b/test/hardware_irq_test/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/test/hardware_pwm_test/BUILD.bazel b/test/hardware_pwm_test/BUILD.bazel
index 9c8a32c8..9e3553d5 100644
--- a/test/hardware_pwm_test/BUILD.bazel
+++ b/test/hardware_pwm_test/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/test/hardware_sync_spin_lock_test/BUILD.bazel b/test/hardware_sync_spin_lock_test/BUILD.bazel
index 8e35cfa1..43d067f2 100644
--- a/test/hardware_sync_spin_lock_test/BUILD.bazel
+++ b/test/hardware_sync_spin_lock_test/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 load("//bazel/util:transition.bzl", "extra_copts_for_all_deps")
 
diff --git a/test/kitchen_sink/BUILD.bazel b/test/kitchen_sink/BUILD.bazel
index 3dbb8492..fd0dd5ef 100644
--- a/test/kitchen_sink/BUILD.bazel
+++ b/test/kitchen_sink/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//bazel:defs.bzl", "compatible_with_rp2", "pico_generate_pio_header")
 load("//bazel/util:transition.bzl", "kitchen_sink_test_binary")
 
@@ -113,8 +115,8 @@ cc_binary(
     tags = ["manual"],  # Built via kitchen_sink_lwip_poll
     deps = [
         ":kitchen_sink_common",
+        "//src/rp2_common/pico_btstack",
         "//src/rp2_common/pico_cyw43_arch:pico_cyw43_arch_lwip_poll",
-        "//src/rp2_common/pico_btstack:pico_btstack",
         "//src/rp2_common/pico_lwip:pico_lwip_mbedtls",
         "//src/rp2_common/pico_mbedtls",
     ],
@@ -127,8 +129,8 @@ cc_binary(
     tags = ["manual"],  # Built via kitchen_sink_lwip_background
     deps = [
         ":kitchen_sink_common",
+        "//src/rp2_common/pico_btstack",
         "//src/rp2_common/pico_cyw43_arch:pico_cyw43_arch_lwip_threadsafe_background",
-        "//src/rp2_common/pico_btstack:pico_btstack",
         "//src/rp2_common/pico_lwip:pico_lwip_mbedtls",
         "//src/rp2_common/pico_mbedtls",
     ],
@@ -139,10 +141,10 @@ kitchen_sink_test_binary(
     testonly = True,
     src = ":kitchen_sink_lwip_poll_actual",
     bt_stack_config = ":btstack_config",
-    lwip_config = ":lwip_config",
-    mbedtls_config = ":mbedtls_config",
     enable_ble = True,
     enable_bt_classic = True,
+    lwip_config = ":lwip_config",
+    mbedtls_config = ":mbedtls_config",
     target_compatible_with = compatible_with_rp2(),
 )
 
@@ -151,9 +153,9 @@ kitchen_sink_test_binary(
     testonly = True,
     src = ":kitchen_sink_lwip_background_actual",
     bt_stack_config = ":btstack_config",
-    lwip_config = ":lwip_config",
-    mbedtls_config = ":mbedtls_config",
     enable_ble = True,
     enable_bt_classic = True,
+    lwip_config = ":lwip_config",
+    mbedtls_config = ":mbedtls_config",
     target_compatible_with = compatible_with_rp2(),
 )
diff --git a/test/pico_divider_test/BUILD.bazel b/test/pico_divider_test/BUILD.bazel
index e5f2e93b..08d47736 100644
--- a/test/pico_divider_test/BUILD.bazel
+++ b/test/pico_divider_test/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/test/pico_float_test/BUILD.bazel b/test/pico_float_test/BUILD.bazel
index 36405330..14a98c04 100644
--- a/test/pico_float_test/BUILD.bazel
+++ b/test/pico_float_test/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 load("//bazel/util:transition.bzl", "pico_float_test_binary")
 
@@ -93,4 +94,4 @@ filegroup(
         "custom_double_funcs_test.c",
         "custom_float_funcs_test.c",
     ],
-)
\ No newline at end of file
+)
diff --git a/test/pico_sem_test/BUILD.bazel b/test/pico_sem_test/BUILD.bazel
index 911056a6..37dafacf 100644
--- a/test/pico_sem_test/BUILD.bazel
+++ b/test/pico_sem_test/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_binary(
diff --git a/test/pico_sha256_test/BUILD.bazel b/test/pico_sha256_test/BUILD.bazel
index 505f3de8..19ea38b9 100644
--- a/test/pico_sha256_test/BUILD.bazel
+++ b/test/pico_sha256_test/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/test/pico_stdio_test/BUILD.bazel b/test/pico_stdio_test/BUILD.bazel
index 42026019..62cf90c4 100644
--- a/test/pico_stdio_test/BUILD.bazel
+++ b/test/pico_stdio_test/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/test/pico_stdlib_test/BUILD.bazel b/test/pico_stdlib_test/BUILD.bazel
index 7bfa2eab..2cee750f 100644
--- a/test/pico_stdlib_test/BUILD.bazel
+++ b/test/pico_stdlib_test/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_binary(
diff --git a/test/pico_test/BUILD.bazel b/test/pico_test/BUILD.bazel
index f104b61e..0823c684 100644
--- a/test/pico_test/BUILD.bazel
+++ b/test/pico_test/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/test/pico_time_test/BUILD.bazel b/test/pico_time_test/BUILD.bazel
index 03873860..200b18dc 100644
--- a/test/pico_time_test/BUILD.bazel
+++ b/test/pico_time_test/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load("//bazel:defs.bzl", "compatible_with_rp2")
 load("//bazel/util:transition.bzl", "extra_copts_for_all_deps")
 
@@ -11,8 +12,8 @@ cc_binary(
     # Doesn't appear to work on host builds yet.
     target_compatible_with = compatible_with_rp2(),
     deps = [
-        "//src/rp2_common/pico_stdlib",
         "//src/rp2_common/pico_aon_timer",
+        "//src/rp2_common/pico_stdlib",
         "//test/pico_test",
     ],
 )
diff --git a/tools/pioasm/BUILD.bazel b/tools/pioasm/BUILD.bazel
index 732d5e42..5ad238f6 100644
--- a/tools/pioasm/BUILD.bazel
+++ b/tools/pioasm/BUILD.bazel
@@ -1,4 +1,6 @@
 load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -68,11 +70,11 @@ cc_library(
 
 expand_template(
     name = "version",
-    template = "version.h.in",
+    out = "gen/version.h",
     substitutions = {
         "${PIOASM_VERSION_STRING}": module_version() if module_version() != None else "0.0.1-WORKSPACE",
     },
-    out = "gen/version.h",
+    template = "version.h.in",
 )
 
 cc_binary(