diff --git a/BUILD b/BUILD
index 2231b393cca..58206feeb03 100644
--- a/BUILD
+++ b/BUILD
@@ -1698,11 +1698,9 @@ grpc_cc_library(
     visibility = ["@grpc:tsi"],
     deps = [
         "gpr",
-        "grpc_base",
-        "tsi_alts_credentials",
+        "tsi_alts_frame_protector",
         "tsi_base",
         "tsi_fake_credentials",
-        "tsi_ssl_credentials",
         "//src/core:tsi_local_credentials",
         "//src/core:useful",
     ],
@@ -3002,6 +3000,38 @@ grpc_cc_library(
 
 grpc_cc_library(
     name = "tsi_alts_credentials",
+    srcs = [
+        "//src/core:tsi/alts/handshaker/alts_handshaker_client.cc",
+        "//src/core:tsi/alts/handshaker/alts_shared_resource.cc",
+        "//src/core:tsi/alts/handshaker/alts_tsi_handshaker.cc",
+        "//src/core:tsi/alts/handshaker/alts_tsi_utils.cc",
+    ],
+    hdrs = [
+        "//src/core:tsi/alts/handshaker/alts_handshaker_client.h",
+        "//src/core:tsi/alts/handshaker/alts_shared_resource.h",
+        "//src/core:tsi/alts/handshaker/alts_tsi_handshaker.h",
+        "//src/core:tsi/alts/handshaker/alts_tsi_handshaker_private.h",
+        "//src/core:tsi/alts/handshaker/alts_tsi_utils.h",
+    ],
+    external_deps = ["upb_lib"],
+    language = "c++",
+    visibility = ["@grpc:public"],
+    deps = [
+        "alts_upb",
+        "alts_util",
+        "gpr",
+        "grpc_base",
+        "tsi_alts_frame_protector",
+        "tsi_base",
+        "//src/core:channel_args",
+        "//src/core:closure",
+        "//src/core:pollset_set",
+        "//src/core:slice",
+    ],
+)
+
+grpc_cc_library(
+    name = "tsi_alts_frame_protector",
     srcs = [
         "//src/core:tsi/alts/crypt/aes_gcm.cc",
         "//src/core:tsi/alts/crypt/gsec.cc",
@@ -3012,10 +3042,6 @@ grpc_cc_library(
         "//src/core:tsi/alts/frame_protector/alts_seal_privacy_integrity_crypter.cc",
         "//src/core:tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc",
         "//src/core:tsi/alts/frame_protector/frame_handler.cc",
-        "//src/core:tsi/alts/handshaker/alts_handshaker_client.cc",
-        "//src/core:tsi/alts/handshaker/alts_shared_resource.cc",
-        "//src/core:tsi/alts/handshaker/alts_tsi_handshaker.cc",
-        "//src/core:tsi/alts/handshaker/alts_tsi_utils.cc",
         "//src/core:tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc",
         "//src/core:tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc",
         "//src/core:tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc",
@@ -3029,11 +3055,6 @@ grpc_cc_library(
         "//src/core:tsi/alts/frame_protector/alts_frame_protector.h",
         "//src/core:tsi/alts/frame_protector/alts_record_protocol_crypter_common.h",
         "//src/core:tsi/alts/frame_protector/frame_handler.h",
-        "//src/core:tsi/alts/handshaker/alts_handshaker_client.h",
-        "//src/core:tsi/alts/handshaker/alts_shared_resource.h",
-        "//src/core:tsi/alts/handshaker/alts_tsi_handshaker.h",
-        "//src/core:tsi/alts/handshaker/alts_tsi_handshaker_private.h",
-        "//src/core:tsi/alts/handshaker/alts_tsi_utils.h",
         "//src/core:tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h",
         "//src/core:tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h",
         "//src/core:tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h",
@@ -3042,27 +3063,19 @@ grpc_cc_library(
         "//src/core:tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h",
     ],
     external_deps = [
-        "libssl",
         "libcrypto",
-        "upb_lib",
+        "libssl",
     ],
     language = "c++",
-    tags = ["nofixdeps"],
     visibility = ["@grpc:public"],
     deps = [
-        "alts_upb",
-        "alts_util",
-        "config",
+        "event_engine_base_hdrs",
         "exec_ctx",
         "gpr",
-        "grpc_base",
+        "gpr_platform",
         "tsi_base",
-        "//src/core:arena",
-        "//src/core:channel_args",
-        "//src/core:closure",
-        "//src/core:error",
-        "//src/core:pollset_set",
         "//src/core:slice",
+        "//src/core:slice_buffer",
         "//src/core:useful",
     ],
 )
diff --git a/tools/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py
index d99a1022348..e2dcc868ac9 100755
--- a/tools/distrib/fix_build_deps.py
+++ b/tools/distrib/fix_build_deps.py
@@ -247,6 +247,8 @@ INTERNAL_DEPS = {
         '//src/proto/grpc/reflection/v1alpha:reflection_proto',
     'src/proto/grpc/gcp/transport_security_common.upb.h':
         'alts_upb',
+    'src/proto/grpc/gcp/handshaker.upb.h':
+        'alts_upb',
     'src/proto/grpc/gcp/altscontext.upb.h':
         'alts_upb',
     'src/proto/grpc/lookup/v1/rls.upb.h':