diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index 8f7bba72..bde164c 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -110,6 +110,7 @@
     "../../rtc_base:byte_order",
     "../../rtc_base:checks",
     "../../rtc_base:crc32",
+    "../../rtc_base:digest",
     "../../rtc_base:ip_address",
     "../../rtc_base:logging",
     "../../rtc_base:socket_address",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 5a0a5ef..f7c52ec 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -399,7 +399,7 @@
     "../rtc_base:async_packet_socket",
     "../rtc_base:byte_order",
     "../rtc_base:checks",
-    "../rtc_base:ssl",
+    "../rtc_base:digest",
     "../rtc_base/system:rtc_export",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 8b23955..d0a1b69 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -837,7 +837,7 @@
     "../../common_audio",
     "../../rtc_base:buffer",
     "../../rtc_base:checks",
-    "../../rtc_base:ssl",
+    "../../rtc_base:digest",
     "../../rtc_base:stringutils",
     "../../rtc_base/system:arch",
     "../../test:rtp_test_utils",
@@ -954,7 +954,7 @@
     "../../api/audio_codecs:builtin_audio_encoder_factory",
     "../../api/neteq:neteq_api",
     "../../rtc_base:checks",
-    "../../rtc_base:ssl",
+    "../../rtc_base:digest",
     "../../rtc_base:stringutils",
     "../../system_wrappers",
     "../../test:fileutils",
@@ -1713,6 +1713,7 @@
         "../../logging:rtc_event_audio",
         "../../modules/rtp_rtcp:rtp_rtcp_format",
         "../../rtc_base:checks",
+        "../../rtc_base:digest",
         "../../rtc_base:macromagic",
         "../../rtc_base:platform_thread",
         "../../rtc_base:refcount",
@@ -1720,7 +1721,6 @@
         "../../rtc_base:rtc_event",
         "../../rtc_base:safe_conversions",
         "../../rtc_base:sanitizer",
-        "../../rtc_base:ssl",
         "../../rtc_base:stringutils",
         "../../rtc_base:timeutils",
         "../../rtc_base/synchronization:mutex",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 8a3c8eb..b548f4b 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -1181,6 +1181,7 @@
       "../rtc_base:byte_buffer",
       "../rtc_base:checks",
       "../rtc_base:copy_on_write_buffer",
+      "../rtc_base:digest",
       "../rtc_base:dscp",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
@@ -1242,6 +1243,7 @@
     "../rtc_base:async_udp_socket",
     "../rtc_base:byte_buffer",
     "../rtc_base:checks",
+    "../rtc_base:digest",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_tests_utils",
     "../rtc_base:socket_adapters",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index ea064df..7d0cac8 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -2425,6 +2425,7 @@
       "../rtc_base:byte_buffer",
       "../rtc_base:checks",
       "../rtc_base:copy_on_write_buffer",
+      "../rtc_base:digest",
       "../rtc_base:event_tracer",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index b6e1697..7cf17e4 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -1487,6 +1487,14 @@
   ]
 }
 
+rtc_source_set("ssl_header") {
+  public_deps += [ ":ssl" ]  # no-presubmit-check TODO(webrtc:8603)
+}
+
+rtc_source_set("digest") {
+  public_deps += [ ":ssl" ]  # no-presubmit-check TODO(webrtc:8603)
+}
+
 rtc_library("ssl") {
   visibility = [ "*" ]
   sources = [
@@ -1689,6 +1697,7 @@
     ":buffer",
     ":byte_buffer",
     ":checks",
+    ":digest",
     ":ip_address",
     ":logging",
     ":macromagic",
@@ -2071,6 +2080,7 @@
         ":checks",
         ":crc32",
         ":data_rate_limiter",
+        ":digest",
         ":gunit_helpers",
         ":ifaddrs_converter",
         ":ip_address",
@@ -2093,6 +2103,7 @@
         ":socket_factory",
         ":socket_server",
         ":ssl",
+        ":ssl_header",
         ":stream",
         ":stringutils",
         ":testclient",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index d857d9c..8fe6459 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -689,6 +689,7 @@
   sources = [ "ssl_certificate_fuzzer.cc" ]
   deps = [
     "../:rtp_test_utils",
+    "../../rtc_base:digest",
     "../../rtc_base:ssl",
     "../../rtc_base:stringutils",
   ]