diff --git a/MODULE.bazel b/MODULE.bazel
index a20c3bd..cc10e22 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -22,7 +22,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_cc",
-    version = "0.1.1",
+    version = "0.1.5",
 )
 bazel_dep(
     name = "protobuf",
diff --git a/dcf/BUILD b/dcf/BUILD
index 3986fda..58b6725 100644
--- a/dcf/BUILD
+++ b/dcf/BUILD
@@ -14,6 +14,8 @@
 
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/dcf/fss_gates/BUILD b/dcf/fss_gates/BUILD
index a8c96cc..d6da99d 100644
--- a/dcf/fss_gates/BUILD
+++ b/dcf/fss_gates/BUILD
@@ -19,6 +19,8 @@
 
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/dcf/fss_gates/prng/BUILD b/dcf/fss_gates/prng/BUILD
index f05528a..92d99bb 100644
--- a/dcf/fss_gates/prng/BUILD
+++ b/dcf/fss_gates/prng/BUILD
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_visibility = ["//:__subpackages__"],
diff --git a/dpf/BUILD b/dpf/BUILD
index d598d0d..3de5ca2 100644
--- a/dpf/BUILD
+++ b/dpf/BUILD
@@ -14,6 +14,8 @@
 
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/dpf/internal/BUILD b/dpf/internal/BUILD
index 4e53072..3ad5509 100644
--- a/dpf/internal/BUILD
+++ b/dpf/internal/BUILD
@@ -14,6 +14,8 @@
 
 load("@com_github_google_iree//build_tools/embed_data:build_defs.bzl", "cc_embed_data")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_visibility = ["//:__subpackages__"],
diff --git a/experiments/BUILD b/experiments/BUILD
index a29a150..9124993 100644
--- a/experiments/BUILD
+++ b/experiments/BUILD
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 
 package(
     default_visibility = ["//visibility:private"],
diff --git a/pir/BUILD b/pir/BUILD
index b2672b4..0f930d5 100644
--- a/pir/BUILD
+++ b/pir/BUILD
@@ -15,6 +15,8 @@
 load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/pir/cuckoo_hashed_dpf_pir_database_test.cc b/pir/cuckoo_hashed_dpf_pir_database_test.cc
index 3fa4dda..733091f 100644
--- a/pir/cuckoo_hashed_dpf_pir_database_test.cc
+++ b/pir/cuckoo_hashed_dpf_pir_database_test.cc
@@ -164,7 +164,7 @@ TEST_F(CuckooHashedDpfPirDatabaseBuilderTest,
 TEST_F(CuckooHashedDpfPirDatabaseBuilderTest, BuildsEmptyDatabase) {
   EXPECT_THAT(
       builder_.Build(),
-      IsOkAndHolds(Truly([](auto &db) -> bool { return db->size() == 0; })));
+      IsOkAndHolds(Truly([](auto& db) -> bool { return db->size() == 0; })));
 }
 
 TEST_F(CuckooHashedDpfPirDatabaseBuilderTest, FailsToBuildWithEmptyKey) {
diff --git a/pir/hashing/BUILD b/pir/hashing/BUILD
index f183664..1ba1faf 100644
--- a/pir/hashing/BUILD
+++ b/pir/hashing/BUILD
@@ -15,6 +15,8 @@
 load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
diff --git a/pir/internal/BUILD b/pir/internal/BUILD
index 4245ba6..4a9cb98 100644
--- a/pir/internal/BUILD
+++ b/pir/internal/BUILD
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_visibility = ["//:__subpackages__"],
diff --git a/pir/prng/BUILD b/pir/prng/BUILD
index 5b11ba9..acae6ee 100644
--- a/pir/prng/BUILD
+++ b/pir/prng/BUILD
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_visibility = ["//visibility:public"],
diff --git a/pir/testing/BUILD b/pir/testing/BUILD
index 66135e5..9530517 100644
--- a/pir/testing/BUILD
+++ b/pir/testing/BUILD
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
 
 package(
     default_testonly = True,