Fix BUILD.bazel files for tink/cc/experimental/pqcrypto/cecpq2.

PiperOrigin-RevId: 446953277

30 files changed, 287 insertions, 253 deletions

diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/BUILD.bazel b/cc/experimental/pqcrypto/cecpq2/hybrid/BUILD.bazel
index a27fd7266..d7444b500 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/BUILD.bazel
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/BUILD.bazel
@@ -8,16 +8,18 @@ cc_library(
     name = "cecpq2_hybrid_config",
     srcs = ["cecpq2_hybrid_config.cc"],
     hdrs = ["cecpq2_hybrid_config.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/hybrid",
     deps = [
         ":cecpq2_aead_hkdf_private_key_manager",
         ":cecpq2_aead_hkdf_public_key_manager",
+        "//:registry",
+        "//aead:aead_config",
+        "//config:tink_fips",
+        "//hybrid:hybrid_decrypt_wrapper",
+        "//hybrid:hybrid_encrypt_wrapper",
+        "//util:status",
         "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/strings",
-        "@tink_cc//aead:aead_config",
-        "@tink_cc//config:tink_fips",
-        "@tink_cc//hybrid:hybrid_decrypt_wrapper",
-        "@tink_cc//hybrid:hybrid_encrypt_wrapper",
-        "@tink_cc//util:status",
+        "@com_google_absl//absl/memory",
     ],
 )
 
@@ -25,13 +27,14 @@ cc_library(
     name = "cecpq2_hybrid_key_templates",
     srcs = ["cecpq2_hybrid_key_templates.cc"],
     hdrs = ["cecpq2_hybrid_key_templates.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/hybrid",
     deps = [
+        "//aead:aead_key_templates",
+        "//daead:deterministic_aead_key_templates",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//proto:common_cc_proto",
+        "//proto:tink_cc_proto",
         "@com_google_absl//absl/strings",
-        "@tink_cc//aead:aead_key_templates",
-        "@tink_cc//daead:deterministic_aead_key_templates",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//proto:common_cc_proto",
-        "@tink_cc//proto:tink_cc_proto",
     ],
 )
 
@@ -39,19 +42,20 @@ cc_library(
     name = "cecpq2_aead_hkdf_dem_helper",
     srcs = ["cecpq2_aead_hkdf_dem_helper.cc"],
     hdrs = ["cecpq2_aead_hkdf_dem_helper.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/hybrid",
     deps = [
+        "//:aead",
+        "//:deterministic_aead",
+        "//:registry",
+        "//daead/subtle:aead_or_daead",
+        "//proto:tink_cc_proto",
+        "//util:errors",
+        "//util:istream_input_stream",
+        "//util:protobuf_helper",
+        "//util:secret_data",
+        "//util:statusor",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@tink_cc//:aead",
-        "@tink_cc//:deterministic_aead",
-        "@tink_cc//:hybrid_encrypt",
-        "@tink_cc//aead:aes_ctr_hmac_aead_key_manager",
-        "@tink_cc//daead/subtle:aead_or_daead",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_hkdf_sender_kem_boringssl",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//proto:tink_cc_proto",
-        "@tink_cc//util:istream_input_stream",
-        "@tink_cc//util:statusor",
     ],
 )
 
@@ -59,23 +63,28 @@ cc_library(
     name = "cecpq2_aead_hkdf_private_key_manager",
     srcs = ["cecpq2_aead_hkdf_private_key_manager.cc"],
     hdrs = ["cecpq2_aead_hkdf_private_key_manager.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/hybrid",
     deps = [
+        ":cecpq2_aead_hkdf_dem_helper",
         ":cecpq2_aead_hkdf_public_key_manager",
+        "//:core/key_type_manager",
+        "//:core/private_key_type_manager",
+        "//:hybrid_decrypt",
+        "//experimental/pqcrypto/cecpq2/hybrid/internal:cecpq2_aead_hkdf_hybrid_decrypt",
+        "//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//proto:tink_cc_proto",
+        "//subtle:random",
+        "//subtle:subtle_util",
+        "//util:enums",
+        "//util:secret_data",
+        "//util:status",
+        "//util:statusor",
+        "//util:validation",
+        "@boringssl//:crypto",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
-        "@tink_cc//:core/key_type_manager",
-        "@tink_cc//:core/private_key_type_manager",
-        "@tink_cc//:hybrid_decrypt",
-        "@tink_cc//experimental/pqcrypto/cecpq2/hybrid/internal:cecpq2_aead_hkdf_hybrid_decrypt",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//proto:tink_cc_proto",
-        "@tink_cc//subtle:random",
-        "@tink_cc//subtle:subtle_util",
-        "@tink_cc//util:enums",
-        "@tink_cc//util:secret_data",
-        "@tink_cc//util:status",
-        "@tink_cc//util:statusor",
     ],
 )
 
@@ -83,18 +92,24 @@ cc_library(
     name = "cecpq2_aead_hkdf_public_key_manager",
     srcs = ["cecpq2_aead_hkdf_public_key_manager.cc"],
     hdrs = ["cecpq2_aead_hkdf_public_key_manager.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/hybrid",
     deps = [
+        ":cecpq2_aead_hkdf_dem_helper",
+        "//:core/key_type_manager",
+        "//:hybrid_encrypt",
+        "//experimental/pqcrypto/cecpq2/hybrid/internal:cecpq2_aead_hkdf_hybrid_encrypt",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//proto:common_cc_proto",
+        "//proto:tink_cc_proto",
+        "//util:enums",
+        "//util:errors",
+        "//util:protobuf_helper",
+        "//util:status",
+        "//util:statusor",
+        "//util:validation",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
-        "@tink_cc//:core/key_type_manager",
-        "@tink_cc//:hybrid_encrypt",
-        "@tink_cc//experimental/pqcrypto/cecpq2/hybrid/internal:cecpq2_aead_hkdf_hybrid_encrypt",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//proto:common_cc_proto",
-        "@tink_cc//proto:tink_cc_proto",
-        "@tink_cc//util:enums",
-        "@tink_cc//util:status",
-        "@tink_cc//util:statusor",
     ],
 )
 
@@ -104,21 +119,21 @@ cc_test(
     name = "cecpq2_hybrid_config_test",
     size = "small",
     srcs = ["cecpq2_hybrid_config_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_aead_hkdf_private_key_manager",
         ":cecpq2_aead_hkdf_public_key_manager",
         ":cecpq2_hybrid_config",
         ":cecpq2_hybrid_key_templates",
+        "//:hybrid_decrypt",
+        "//:hybrid_encrypt",
+        "//:keyset_handle",
+        "//:registry",
+        "//config:tink_fips",
+        "//util:status",
+        "//util:test_matchers",
+        "//util:test_util",
         "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//:hybrid_decrypt",
-        "@tink_cc//:hybrid_encrypt",
-        "@tink_cc//:keyset_handle",
-        "@tink_cc//config:tink_fips",
-        "@tink_cc//util:status",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
 
@@ -126,14 +141,13 @@ cc_test(
     name = "cecpq2_hybrid_key_templates_test",
     size = "small",
     srcs = ["cecpq2_hybrid_key_templates_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_aead_hkdf_private_key_manager",
         ":cecpq2_hybrid_config",
         ":cecpq2_hybrid_key_templates",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//util:test_matchers",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//util:test_matchers",
     ],
 )
 
@@ -141,70 +155,64 @@ cc_test(
     name = "cecpq2_aead_hkdf_dem_helper_test",
     size = "small",
     srcs = ["cecpq2_aead_hkdf_dem_helper_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_aead_hkdf_dem_helper",
+        "//:registry",
+        "//aead:aes_gcm_key_manager",
+        "//aead:xchacha20_poly1305_key_manager",
+        "//config:tink_config",
+        "//daead:aes_siv_key_manager",
+        "//util:secret_data",
+        "//util:test_matchers",
+        "//util:test_util",
         "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//aead:aes_gcm_key_manager",
-        "@tink_cc//config:tink_config",
-        "@tink_cc//util:secret_data",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
 
 cc_test(
     name = "cecpq2_aead_hkdf_private_key_manager_test",
     srcs = ["cecpq2_aead_hkdf_private_key_manager_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_aead_hkdf_private_key_manager",
         ":cecpq2_aead_hkdf_public_key_manager",
+        "//:hybrid_decrypt",
+        "//:registry",
+        "//aead:aead_key_templates",
+        "//aead:aes_ctr_hmac_aead_key_manager",
+        "//aead:aes_gcm_key_manager",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//proto:aes_eax_cc_proto",
+        "//proto:common_cc_proto",
+        "//proto:tink_cc_proto",
+        "//util:status",
+        "//util:statusor",
+        "//util:test_matchers",
+        "//util:test_util",
         "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//:core/key_type_manager",
-        "@tink_cc//:core/private_key_type_manager",
-        "@tink_cc//:hybrid_decrypt",
-        "@tink_cc//aead:aead_key_templates",
-        "@tink_cc//aead:aes_gcm_key_manager",
-        "@tink_cc//experimental/pqcrypto/cecpq2/hybrid/internal:cecpq2_aead_hkdf_hybrid_decrypt",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//proto:tink_cc_proto",
-        "@tink_cc//subtle:random",
-        "@tink_cc//subtle:subtle_util",
-        "@tink_cc//util:enums",
-        "@tink_cc//util:secret_data",
-        "@tink_cc//util:status",
-        "@tink_cc//util:statusor",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
 
 cc_test(
     name = "cecpq2_aead_hkdf_public_key_manager_test",
     srcs = ["cecpq2_aead_hkdf_public_key_manager_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_aead_hkdf_private_key_manager",
         ":cecpq2_aead_hkdf_public_key_manager",
+        "//:hybrid_encrypt",
+        "//:registry",
+        "//aead:aead_key_templates",
+        "//aead:aes_gcm_key_manager",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//proto:aes_eax_cc_proto",
+        "//proto:common_cc_proto",
+        "//proto:tink_cc_proto",
+        "//util:status",
+        "//util:statusor",
+        "//util:test_matchers",
+        "//util:test_util",
         "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//:core/key_type_manager",
-        "@tink_cc//:hybrid_encrypt",
-        "@tink_cc//aead:aead_key_templates",
-        "@tink_cc//aead:aes_gcm_key_manager",
-        "@tink_cc//experimental/pqcrypto/cecpq2/hybrid/internal:cecpq2_aead_hkdf_hybrid_encrypt",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//proto:common_cc_proto",
-        "@tink_cc//proto:tink_cc_proto",
-        "@tink_cc//util:status",
-        "@tink_cc//util:statusor",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.cc
index 043899ec1..571d8b15b 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
 
 #include <string>
 #include <utility>
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper_test.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper_test.cc
index dc73408a0..1b54f2fa9 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper_test.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
 
 #include <string>
 #include <utility>
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.cc
index 07434fe17..8e1cc68a3 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
 
 #include <string>
 #include <utility>
@@ -23,9 +23,9 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "openssl/hrss.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
 #include "tink/hybrid_decrypt.h"
 #include "tink/subtle/random.h"
 #include "tink/subtle/subtle_util.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h
index 33ea1bf5b..5f1d62d4e 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h
@@ -24,8 +24,8 @@
 #include "openssl/hrss.h"
 #include "tink/core/key_type_manager.h"
 #include "tink/core/private_key_type_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h"
 #include "tink/hybrid_decrypt.h"
 #include "tink/util/enums.h"
 #include "tink/util/status.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager_test.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager_test.cc
index fb899913b..53e6c25af 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager_test.cc
@@ -14,7 +14,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
 
 #include <string>
 
@@ -23,7 +23,7 @@
 #include "tink/aead/aead_key_templates.h"
 #include "tink/aead/aes_ctr_hmac_aead_key_manager.h"
 #include "tink/aead/aes_gcm_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
 #include "tink/hybrid_decrypt.h"
 #include "tink/registry.h"
 #include "tink/util/status.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.cc
index 36cd27dfb..417ca44db 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.cc
@@ -14,11 +14,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
 #include "tink/hybrid_encrypt.h"
 #include "tink/util/errors.h"
 #include "tink/util/protobuf_helper.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h
index 1fec5ff7a..35a7591ae 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h
@@ -22,8 +22,8 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "tink/core/key_type_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
 #include "tink/hybrid_encrypt.h"
 #include "tink/util/enums.h"
 #include "tink/util/errors.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager_test.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager_test.cc
index b642d6458..8f47d8212 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager_test.cc
@@ -14,13 +14,13 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
 
 #include "gtest/gtest.h"
 #include "absl/status/status.h"
 #include "tink/aead/aead_key_templates.h"
 #include "tink/aead/aes_gcm_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
 #include "tink/hybrid_encrypt.h"
 #include "tink/registry.h"
 #include "tink/util/status.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.cc
index 5cc407204..89e596341 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.cc
@@ -14,13 +14,13 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.h"
 
 #include "absl/memory/memory.h"
 #include "tink/aead/aead_config.h"
 #include "tink/config/tink_fips.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
 #include "tink/hybrid/hybrid_decrypt_wrapper.h"
 #include "tink/hybrid/hybrid_encrypt_wrapper.h"
 #include "tink/registry.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config_test.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config_test.cc
index 38d5d92d8..539f86010 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config_test.cc
@@ -14,7 +14,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.h"
 
 #include <list>
 #include <string>
@@ -24,9 +24,9 @@
 #include "gtest/gtest.h"
 #include "absl/status/status.h"
 #include "tink/config/tink_fips.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_public_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.h"
 #include "tink/hybrid_decrypt.h"
 #include "tink/hybrid_encrypt.h"
 #include "tink/keyset_handle.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.cc
index 2cbb98bd6..6ac9ae9cc 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.h"
 
 #include <string>
 
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates_test.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates_test.cc
index bf2876192..264c2bcd4 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates_test.cc
@@ -14,12 +14,12 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_key_templates.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_private_key_manager.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_hybrid_config.h"
 #include "tink/util/test_matchers.h"
 #include "proto/experimental/pqcrypto/cecpq2_aead_hkdf.pb.h"
 
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/BUILD.bazel b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/BUILD.bazel
index 2378e2b72..245939ff7 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/BUILD.bazel
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/BUILD.bazel
@@ -8,20 +8,21 @@ cc_library(
     name = "cecpq2_aead_hkdf_hybrid_decrypt",
     srcs = ["cecpq2_aead_hkdf_hybrid_decrypt.cc"],
     hdrs = ["cecpq2_aead_hkdf_hybrid_decrypt.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/hybrid/internal",
     deps = [
+        "//:hybrid_decrypt",
+        "//experimental/pqcrypto/cecpq2/hybrid:cecpq2_aead_hkdf_dem_helper",
+        "//experimental/pqcrypto/cecpq2/subtle:cecpq2_hkdf_recipient_kem_boringssl",
+        "//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
+        "//internal:ec_util",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//util:enums",
+        "//util:secret_data",
+        "//util:status",
+        "//util:statusor",
         "@boringssl//:crypto",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@tink_cc//:hybrid_decrypt",
-        "@tink_cc//experimental/pqcrypto/cecpq2/hybrid:cecpq2_aead_hkdf_dem_helper",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_hkdf_recipient_kem_boringssl",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//subtle:ec_util",
-        "@tink_cc//util:enums",
-        "@tink_cc//util:secret_data",
-        "@tink_cc//util:status",
-        "@tink_cc//util:statusor",
     ],
 )
 
@@ -29,18 +30,20 @@ cc_library(
     name = "cecpq2_aead_hkdf_hybrid_encrypt",
     srcs = ["cecpq2_aead_hkdf_hybrid_encrypt.cc"],
     hdrs = ["cecpq2_aead_hkdf_hybrid_encrypt.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/hybrid/internal",
     deps = [
+        "//:aead",
+        "//:hybrid_encrypt",
+        "//experimental/pqcrypto/cecpq2/hybrid:cecpq2_aead_hkdf_dem_helper",
+        "//experimental/pqcrypto/cecpq2/subtle:cecpq2_hkdf_sender_kem_boringssl",
+        "//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//util:enums",
+        "//util:status",
+        "//util:statusor",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
-        "@tink_cc//:aead",
-        "@tink_cc//:hybrid_encrypt",
-        "@tink_cc//experimental/pqcrypto/cecpq2/hybrid:cecpq2_aead_hkdf_dem_helper",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_hkdf_sender_kem_boringssl",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//util:enums",
-        "@tink_cc//util:status",
-        "@tink_cc//util:statusor",
     ],
 )
 
@@ -50,49 +53,56 @@ cc_test(
     name = "cecpq2_aead_hkdf_hybrid_encrypt_test",
     size = "small",
     srcs = ["cecpq2_aead_hkdf_hybrid_encrypt_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_aead_hkdf_hybrid_encrypt",
+        "//:hybrid_encrypt",
+        "//:registry",
+        "//aead:aes_gcm_key_manager",
+        "//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
+        "//experimental/pqcrypto/cecpq2/util:test_util",
+        "//subtle:random",
+        "//subtle:subtle_util",
+        "//util:enums",
+        "//util:statusor",
+        "//util:test_matchers",
+        "//util:test_util",
         "@boringssl//:crypto",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//:hybrid_encrypt",
-        "@tink_cc//aead:aes_gcm_key_manager",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
-        "@tink_cc//experimental/pqcrypto/cecpq2/util:test_util",
-        "@tink_cc//subtle:random",
-        "@tink_cc//subtle:subtle_util",
-        "@tink_cc//util:enums",
-        "@tink_cc//util:statusor",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
 
 cc_test(
     name = "cecpq2_aead_hkdf_hybrid_decrypt_test",
-    size = "small",
+    size = "large",
     srcs = ["cecpq2_aead_hkdf_hybrid_decrypt_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_aead_hkdf_hybrid_decrypt",
         ":cecpq2_aead_hkdf_hybrid_encrypt",
+        "//:hybrid_decrypt",
+        "//:registry",
+        "//aead:aes_ctr_hmac_aead_key_manager",
+        "//aead:aes_gcm_key_manager",
+        "//aead:xchacha20_poly1305_key_manager",
+        "//config:tink_config",
+        "//daead:aes_siv_key_manager",
+        "//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
+        "//experimental/pqcrypto/cecpq2/util:test_util",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//subtle:common_enums",
+        "//subtle:random",
+        "//subtle:subtle_util",
+        "//util:enums",
+        "//util:secret_data",
+        "//util:status",
+        "//util:statusor",
+        "//util:test_matchers",
+        "//util:test_util",
         "@boringssl//:crypto",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//:hybrid_encrypt",
-        "@tink_cc//aead:aes_ctr_hmac_aead_key_manager",
-        "@tink_cc//aead:aes_gcm_key_manager",
-        "@tink_cc//aead:xchacha20_poly1305_key_manager",
-        "@tink_cc//config:tink_config",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
-        "@tink_cc//experimental/pqcrypto/cecpq2/util:test_util",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//subtle:random",
-        "@tink_cc//subtle:subtle_util",
-        "@tink_cc//util:enums",
-        "@tink_cc//util:statusor",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.cc
index c1ac5333f..96b8b2799 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h"
 
 #include <string>
 #include <utility>
@@ -23,8 +23,8 @@
 #include "absl/status/status.h"
 #include "openssl/hrss.h"
 #include "openssl/nid.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
 #include "tink/hybrid_decrypt.h"
 #include "tink/internal/ec_util.h"
 #include "tink/util/enums.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h
index bdfa621bd..56dd92760 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h
@@ -21,9 +21,9 @@
 #include <string>
 #include <utility>
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
 #include "tink/hybrid_decrypt.h"
 #include "tink/util/statusor.h"
 #include "proto/experimental/pqcrypto/cecpq2_aead_hkdf.pb.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt_test.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt_test.cc
index bd21b4739..8b6f34ef5 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt_test.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_decrypt.h"
 
 #include <string>
 #include <utility>
@@ -31,9 +31,9 @@
 #include "tink/aead/xchacha20_poly1305_key_manager.h"
 #include "tink/config/tink_config.h"
 #include "tink/daead/aes_siv_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
-#include "experimental/pqcrypto/cecpq2/util/test_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/util/test_util.h"
 #include "tink/hybrid_decrypt.h"
 #include "tink/registry.h"
 #include "tink/subtle/common_enums.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.cc
index f66d5b4c1..9bd2fdc48 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
 
 #include <string>
 #include <utility>
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h
index 3ef6e8beb..47a67af27 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h
@@ -21,9 +21,9 @@
 #include <string>
 #include <utility>
 
-#include "experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/cecpq2_aead_hkdf_dem_helper.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
 #include "tink/hybrid_encrypt.h"
 #include "tink/util/statusor.h"
 #include "proto/experimental/pqcrypto/cecpq2_aead_hkdf.pb.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt_test.cc b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt_test.cc
index 418eee6d3..d810f7adb 100644
--- a/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt_test.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
+#include "tink/experimental/pqcrypto/cecpq2/hybrid/internal/cecpq2_aead_hkdf_hybrid_encrypt.h"
 
 #include <string>
 #include <utility>
@@ -25,8 +25,8 @@
 #include "openssl/curve25519.h"
 #include "openssl/hrss.h"
 #include "tink/aead/aes_gcm_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
-#include "experimental/pqcrypto/cecpq2/util/test_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/util/test_util.h"
 #include "tink/hybrid_encrypt.h"
 #include "tink/registry.h"
 #include "tink/subtle/random.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/subtle/BUILD.bazel b/cc/experimental/pqcrypto/cecpq2/subtle/BUILD.bazel
index c2f25beac..7b7e86860 100644
--- a/cc/experimental/pqcrypto/cecpq2/subtle/BUILD.bazel
+++ b/cc/experimental/pqcrypto/cecpq2/subtle/BUILD.bazel
@@ -8,15 +8,21 @@ cc_library(
     name = "cecpq2_hkdf_sender_kem_boringssl",
     srcs = ["cecpq2_hkdf_sender_kem_boringssl.cc"],
     hdrs = ["cecpq2_hkdf_sender_kem_boringssl.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/subtle",
     visibility = ["//visibility:public"],
     deps = [
+        "//internal:fips_utils",
+        "//subtle",
+        "//subtle:common_enums",
+        "//subtle:hkdf",
+        "//subtle:random",
+        "//subtle:subtle_util",
+        "//util:secret_data",
+        "//util:statusor",
         "@boringssl//:crypto",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
-        "@tink_cc//subtle",
-        "@tink_cc//subtle:subtle_util",
-        "@tink_cc//util:secret_data",
-        "@tink_cc//util:statusor",
     ],
 )
 
@@ -24,16 +30,21 @@ cc_library(
     name = "cecpq2_hkdf_recipient_kem_boringssl",
     srcs = ["cecpq2_hkdf_recipient_kem_boringssl.cc"],
     hdrs = ["cecpq2_hkdf_recipient_kem_boringssl.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/subtle",
     visibility = ["//visibility:public"],
     deps = [
         ":cecpq2_hkdf_sender_kem_boringssl",
+        "//internal:fips_utils",
+        "//subtle",
+        "//subtle:common_enums",
+        "//subtle:hkdf",
+        "//util:errors",
+        "//util:secret_data",
+        "//util:statusor",
         "@boringssl//:crypto",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
-        "@tink_cc//subtle",
-        "@tink_cc//subtle:subtle_util",
-        "@tink_cc//util:secret_data",
-        "@tink_cc//util:statusor",
     ],
 )
 
@@ -41,63 +52,70 @@ cc_library(
     name = "cecpq2_subtle_boringssl_util",
     srcs = ["cecpq2_subtle_boringssl_util.cc"],
     hdrs = ["cecpq2_subtle_boringssl_util.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/subtle",
     visibility = ["//visibility:public"],
     deps = [
+        "//subtle",
+        "//subtle:subtle_util",
+        "//util:secret_data",
+        "//util:statusor",
         "@boringssl//:crypto",
-        "@tink_cc//subtle",
-        "@tink_cc//subtle:subtle_util",
-        "@tink_cc//util:secret_data",
     ],
 )
 
 #tests
+
 cc_test(
     name = "cecpq2_hkdf_sender_kem_boringssl_test",
-    size = "small",
     srcs = ["cecpq2_hkdf_sender_kem_boringssl_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_hkdf_recipient_kem_boringssl",
         ":cecpq2_hkdf_sender_kem_boringssl",
         ":cecpq2_subtle_boringssl_util",
+        "//config:tink_fips",
+        "//subtle",
+        "//subtle:common_enums",
+        "//subtle:hkdf",
+        "//subtle:random",
+        "//subtle:subtle_util",
+        "//util:secret_data",
+        "//util:status",
+        "//util:statusor",
+        "//util:test_matchers",
+        "//util:test_util",
         "@boringssl//:crypto",
+        "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//config:tink_fips",
-        "@tink_cc//subtle:random",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
 
 cc_test(
     name = "cecpq2_hkdf_recipient_kem_boringssl_test",
-    size = "small",
     srcs = ["cecpq2_hkdf_recipient_kem_boringssl_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_hkdf_recipient_kem_boringssl",
-        ":cecpq2_subtle_boringssl_util",
+        "//config:tink_fips",
+        "//subtle:random",
+        "//util:test_matchers",
+        "//util:test_util",
         "@boringssl//:crypto",
         "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//config:tink_fips",
-        "@tink_cc//subtle:random",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
 
 cc_test(
     name = "cecpq2_subtle_boringssl_util_test",
-    size = "small",
     srcs = ["cecpq2_subtle_boringssl_util_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":cecpq2_subtle_boringssl_util",
+        "//subtle:random",
+        "//subtle:subtle_util",
+        "//util:secret_data",
+        "//util:test_matchers",
+        "//util:test_util",
+        "@boringssl//:crypto",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//subtle:random",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
diff --git a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.cc b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.cc
index 54391cb0e..092de2df0 100644
--- a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.cc
+++ b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
 
 #include <utility>
 
@@ -25,7 +25,7 @@
 #include "openssl/curve25519.h"
 #include "openssl/ec.h"
 #include "openssl/hrss.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.h"
 #include "tink/subtle/common_enums.h"
 #include "tink/subtle/hkdf.h"
 #include "tink/util/errors.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl_test.cc b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl_test.cc
index 49e6b7668..5680b5814 100644
--- a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl_test.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
 
 #include <string>
 #include <utility>
diff --git a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.cc b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.cc
index 811e3a15d..a3f5ef642 100644
--- a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.cc
+++ b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.h"
 
 #include <string>
 #include <utility>
diff --git a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl_test.cc b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl_test.cc
index d7ebaa09c..03b569b49 100644
--- a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl_test.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_sender_kem_boringssl.h"
 
 #include <string>
 #include <utility>
@@ -26,8 +26,8 @@
 #include "openssl/hrss.h"
 #include "openssl/sha.h"
 #include "tink/config/tink_fips.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_hkdf_recipient_kem_boringssl.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
 #include "tink/subtle/common_enums.h"
 #include "tink/subtle/hkdf.h"
 #include "tink/subtle/random.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.cc b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.cc
index 686785001..b30084153 100644
--- a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.cc
+++ b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
 
 #include <utility>
 
diff --git a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util_test.cc b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util_test.cc
index 8fe392ea9..05138375f 100644
--- a/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util_test.cc
@@ -14,7 +14,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
 
 #include <string>
 
diff --git a/cc/experimental/pqcrypto/cecpq2/util/BUILD.bazel b/cc/experimental/pqcrypto/cecpq2/util/BUILD.bazel
index 34bba4f6f..508b70f26 100644
--- a/cc/experimental/pqcrypto/cecpq2/util/BUILD.bazel
+++ b/cc/experimental/pqcrypto/cecpq2/util/BUILD.bazel
@@ -6,46 +6,44 @@ licenses(["notice"])
 
 cc_library(
     name = "test_util",
+    testonly = 1,
     srcs = ["test_util.cc"],
     hdrs = ["test_util.h"],
+    include_prefix = "tink/experimental/pqcrypto/cecpq2/util",
     deps = [
+        "//aead:aes_ctr_hmac_aead_key_manager",
+        "//aead:aes_gcm_key_manager",
+        "//aead:xchacha20_poly1305_key_manager",
+        "//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//proto:aes_ctr_cc_proto",
+        "//proto:aes_ctr_hmac_aead_cc_proto",
+        "//proto:hmac_cc_proto",
+        "//proto:xchacha20_poly1305_cc_proto",
+        "//subtle:subtle_util",
+        "//util:enums",
         "@boringssl//:crypto",
-        "@tink_cc//aead:aes_ctr_hmac_aead_key_manager",
-        "@tink_cc//aead:aes_gcm_key_manager",
-        "@tink_cc//aead:xchacha20_poly1305_key_manager",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//proto:aes_ctr_cc_proto",
-        "@tink_cc//proto:aes_ctr_hmac_aead_cc_proto",
-        "@tink_cc//proto:hmac_cc_proto",
-        "@tink_cc//proto:xchacha20_poly1305_cc_proto",
-        "@tink_cc//subtle:subtle_util",
-        "@tink_cc//util:enums",
-        "@tink_cc//util:status",
-        "@tink_cc//util:statusor",
     ],
 )
 
 #tests
+
 cc_test(
     name = "test_util_test",
-    size = "small",
     srcs = ["test_util_test.cc"],
-    copts = ["-Iexternal/gtest/include"],
     deps = [
         ":test_util",
+        "//:hybrid_encrypt",
+        "//:registry",
+        "//aead:aes_gcm_key_manager",
+        "//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
+        "//proto:aes_eax_cc_proto",
+        "//proto:common_cc_proto",
+        "//proto:tink_cc_proto",
+        "//util:status",
+        "//util:statusor",
+        "//util:test_matchers",
+        "//util:test_util",
         "@com_google_googletest//:gtest_main",
-        "@tink_cc//:hybrid_encrypt",
-        "@tink_cc//aead:aes_gcm_key_manager",
-        "@tink_cc//experimental/pqcrypto/cecpq2/subtle:cecpq2_subtle_boringssl_util",
-        "@tink_cc//experimental/pqcrypto/proto:cecpq2_aead_hkdf_cc_proto",
-        "@tink_cc//proto:aes_eax_cc_proto",
-        "@tink_cc//proto:common_cc_proto",
-        "@tink_cc//proto:tink_cc_proto",
-        "@tink_cc//subtle:subtle_util",
-        "@tink_cc//util:status",
-        "@tink_cc//util:statusor",
-        "@tink_cc//util:test_matchers",
-        "@tink_cc//util:test_util",
     ],
 )
diff --git a/cc/experimental/pqcrypto/cecpq2/util/test_util.cc b/cc/experimental/pqcrypto/cecpq2/util/test_util.cc
index dc1e014df..d0df65fc1 100644
--- a/cc/experimental/pqcrypto/cecpq2/util/test_util.cc
+++ b/cc/experimental/pqcrypto/cecpq2/util/test_util.cc
@@ -14,7 +14,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/util/test_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/util/test_util.h"
 
 #include <string>
 #include <utility>
@@ -24,7 +24,7 @@
 #include "tink/aead/aes_ctr_hmac_aead_key_manager.h"
 #include "tink/aead/aes_gcm_key_manager.h"
 #include "tink/aead/xchacha20_poly1305_key_manager.h"
-#include "experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/subtle/cecpq2_subtle_boringssl_util.h"
 #include "tink/subtle/subtle_util.h"
 #include "tink/util/enums.h"
 #include "proto/aes_ctr.pb.h"
diff --git a/cc/experimental/pqcrypto/cecpq2/util/test_util_test.cc b/cc/experimental/pqcrypto/cecpq2/util/test_util_test.cc
index 4530d1a4c..4cbc37e2e 100644
--- a/cc/experimental/pqcrypto/cecpq2/util/test_util_test.cc
+++ b/cc/experimental/pqcrypto/cecpq2/util/test_util_test.cc
@@ -14,7 +14,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "experimental/pqcrypto/cecpq2/util/test_util.h"
+#include "tink/experimental/pqcrypto/cecpq2/util/test_util.h"
 
 #include "gtest/gtest.h"
 #include "tink/aead/aes_gcm_key_manager.h"