diff --git a/private_join_and_compute/crypto/dodis_yampolskiy_prf/BUILD b/private_join_and_compute/crypto/dodis_yampolskiy_prf/BUILD
index 11530fa..e0a0665 100644
--- a/private_join_and_compute/crypto/dodis_yampolskiy_prf/BUILD
+++ b/private_join_and_compute/crypto/dodis_yampolskiy_prf/BUILD
@@ -115,6 +115,7 @@ cc_library(
 
 cc_test(
     name = "bb_oblivious_signature_test",
+    timeout = "long",
     srcs = [
         "bb_oblivious_signature_test.cc",
     ],
diff --git a/private_join_and_compute/crypto/fixed_base_exp.cc b/private_join_and_compute/crypto/fixed_base_exp.cc
index 4a9e695..4698169 100644
--- a/private_join_and_compute/crypto/fixed_base_exp.cc
+++ b/private_join_and_compute/crypto/fixed_base_exp.cc
@@ -26,6 +26,7 @@
 
 #include "private_join_and_compute/crypto/fixed_base_exp.h"
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/private_join_and_compute/crypto/simultaneous_fixed_bases_exp.cc b/private_join_and_compute/crypto/simultaneous_fixed_bases_exp.cc
index 0b3a93d..bd14df8 100644
--- a/private_join_and_compute/crypto/simultaneous_fixed_bases_exp.cc
+++ b/private_join_and_compute/crypto/simultaneous_fixed_bases_exp.cc
@@ -16,10 +16,16 @@
 #include "private_join_and_compute/crypto/simultaneous_fixed_bases_exp.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <memory>
+#include <utility>
 #include <vector>
 
+#include "absl/memory/memory.h"
+#include "absl/strings/str_cat.h"
+#include "private_join_and_compute/crypto/big_num.h"
 #include "private_join_and_compute/crypto/mont_mul.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/private_join_and_compute/crypto/simultaneous_fixed_bases_exp.h b/private_join_and_compute/crypto/simultaneous_fixed_bases_exp.h
index 7a3921f..01fec90 100644
--- a/private_join_and_compute/crypto/simultaneous_fixed_bases_exp.h
+++ b/private_join_and_compute/crypto/simultaneous_fixed_bases_exp.h
@@ -30,11 +30,14 @@
 #ifndef PRIVATE_JOIN_AND_COMPUTE_CRYPTO_SIMULTANEOUS_FIXED_BASES_H_
 #define PRIVATE_JOIN_AND_COMPUTE_CRYPTO_SIMULTANEOUS_FIXED_BASES_H_
 
+#include <cstddef>
+#include <memory>
 #include <vector>
 
 #include "private_join_and_compute/crypto/big_num.h"
 #include "private_join_and_compute/crypto/ec_point.h"
 #include "private_join_and_compute/util/status.inc"
+
 namespace private_join_and_compute {
 
 // Template type definitions for elements of the multiplicative group mod n.
diff --git a/private_join_and_compute/crypto/simultaneous_fixed_bases_exp_test.cc b/private_join_and_compute/crypto/simultaneous_fixed_bases_exp_test.cc
index 0a4ecff..b55c2b6 100644
--- a/private_join_and_compute/crypto/simultaneous_fixed_bases_exp_test.cc
+++ b/private_join_and_compute/crypto/simultaneous_fixed_bases_exp_test.cc
@@ -18,6 +18,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <cstdint>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/private_join_and_compute/py/ciphers/BUILD b/private_join_and_compute/py/ciphers/BUILD
index 1ff2d69..7094719 100644
--- a/private_join_and_compute/py/ciphers/BUILD
+++ b/private_join_and_compute/py/ciphers/BUILD
@@ -15,8 +15,8 @@
 # Description:
 #   Contains libraries for openssl big num operations.
 load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
-load("@rules_python//python:defs.bzl", "py_library", "py_test")
 load("@pip_deps//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/private_join_and_compute/py/crypto_util/BUILD b/private_join_and_compute/py/crypto_util/BUILD
index a015e35..d9bdd01 100644
--- a/private_join_and_compute/py/crypto_util/BUILD
+++ b/private_join_and_compute/py/crypto_util/BUILD
@@ -15,8 +15,8 @@
 # Description:
 #   Contains libraries for openssl big num operations.
 
-load("@rules_python//python:defs.bzl", "py_library", "py_test")
 load("@pip_deps//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library", "py_test")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/private_join_and_compute/util/status.inc b/private_join_and_compute/util/status.inc
index fc2c8fc..f5b2f59 100644
--- a/private_join_and_compute/util/status.inc
+++ b/private_join_and_compute/util/status.inc
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
+#include "absl/status/status.h"    // IWYU pragma: export
+#include "absl/status/statusor.h"  // IWYU pragma: export
 
 #include "private_join_and_compute/util/status_macros.h"