diff --git a/agent_based_epidemic_sim/agent_synthesis/BUILD b/agent_based_epidemic_sim/agent_synthesis/BUILD
index 2a89e468..0178cc0f 100644
--- a/agent_based_epidemic_sim/agent_synthesis/BUILD
+++ b/agent_based_epidemic_sim/agent_synthesis/BUILD
@@ -1,5 +1,7 @@
 # Libraries for synthesizing agents.
 
+load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
+
 licenses(["notice"])
 
 package(default_visibility = [
diff --git a/agent_based_epidemic_sim/applications/contact_tracing/BUILD b/agent_based_epidemic_sim/applications/contact_tracing/BUILD
index ce0c00d4..02aa0193 100644
--- a/agent_based_epidemic_sim/applications/contact_tracing/BUILD
+++ b/agent_based_epidemic_sim/applications/contact_tracing/BUILD
@@ -1,5 +1,7 @@
 # Libraries for contact tracing simulation.
 
+load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
+
 licenses(["notice"])
 
 proto_library(
diff --git a/agent_based_epidemic_sim/applications/home_work/BUILD b/agent_based_epidemic_sim/applications/home_work/BUILD
index 9fc37237..62cefb5b 100644
--- a/agent_based_epidemic_sim/applications/home_work/BUILD
+++ b/agent_based_epidemic_sim/applications/home_work/BUILD
@@ -1,5 +1,7 @@
 # Packages for the simplified home-work simulation application.
 
+load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
+
 licenses(["notice"])
 
 package(default_visibility = [
diff --git a/agent_based_epidemic_sim/applications/risk_learning/BUILD b/agent_based_epidemic_sim/applications/risk_learning/BUILD
index c900b4ba..86f6a812 100644
--- a/agent_based_epidemic_sim/applications/risk_learning/BUILD
+++ b/agent_based_epidemic_sim/applications/risk_learning/BUILD
@@ -15,6 +15,7 @@
 # Libraries for contact tracing simulation.
 
 load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
+load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
 
 package(default_visibility = [
     "//agent_based_epidemic_sim:internal",
diff --git a/agent_based_epidemic_sim/applications/risk_learning/observers_test.cc b/agent_based_epidemic_sim/applications/risk_learning/observers_test.cc
index a40ded3f..b98ea31e 100644
--- a/agent_based_epidemic_sim/applications/risk_learning/observers_test.cc
+++ b/agent_based_epidemic_sim/applications/risk_learning/observers_test.cc
@@ -40,7 +40,9 @@ std::unique_ptr<Agent> MakeAgentInState(HealthState::State state,
 TEST(SummaryObserverTest, CreationOfSummaryObserverFactoryCanOverwriteFiles) {
   std::string summary_filename =
       absl::StrCat(getenv("TEST_TMPDIR"), "/", "summary");
-  { SummaryObserverFactory old_factory(summary_filename); }
+  {
+    SummaryObserverFactory old_factory(summary_filename);
+  }
   {
     SummaryObserverFactory factory(summary_filename);
     Timestep timestep(absl::UnixEpoch(), absl::Hours(24));
diff --git a/agent_based_epidemic_sim/core/BUILD b/agent_based_epidemic_sim/core/BUILD
index 488e6853..9a831868 100644
--- a/agent_based_epidemic_sim/core/BUILD
+++ b/agent_based_epidemic_sim/core/BUILD
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
+load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
 
 licenses(["notice"])
 
diff --git a/agent_based_epidemic_sim/port/deps/BUILD b/agent_based_epidemic_sim/port/deps/BUILD
index 3f673ee5..39abf94e 100644
--- a/agent_based_epidemic_sim/port/deps/BUILD
+++ b/agent_based_epidemic_sim/port/deps/BUILD
@@ -1,5 +1,7 @@
 # Ported dependencies.
 
+load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
+
 licenses(["notice"])
 
 package(default_visibility = [
diff --git a/agent_based_epidemic_sim/port/deps/status_builder.h b/agent_based_epidemic_sim/port/deps/status_builder.h
index 8d9165e7..b3db38bd 100644
--- a/agent_based_epidemic_sim/port/deps/status_builder.h
+++ b/agent_based_epidemic_sim/port/deps/status_builder.h
@@ -220,7 +220,7 @@ class ABSL_MUST_USE_RESULT StatusBuilder {
   }
   template <typename Adaptor>
   auto With(Adaptor&& adaptor) && -> decltype(std::forward<Adaptor>(adaptor)(
-                                      std::move(*this))) {
+      std::move(*this))) {
     return std::forward<Adaptor>(adaptor)(std::move(*this));
   }
 
diff --git a/agent_based_epidemic_sim/port/testdata/BUILD b/agent_based_epidemic_sim/port/testdata/BUILD
index 534a3ef2..8675deb7 100644
--- a/agent_based_epidemic_sim/port/testdata/BUILD
+++ b/agent_based_epidemic_sim/port/testdata/BUILD
@@ -1,5 +1,7 @@
 # Test data for ported libraries.
 
+load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
+
 licenses(["notice"])
 
 package(default_visibility = ["//visibility:public"])