diff --git a/media/BUILD.gn b/media/BUILD.gn
index f010aeaf13..5d8a2b849e 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -89,7 +89,6 @@ rtc_static_library("rtc_media_base") {
     "../common_video",
     "../modules/audio_processing:audio_processing_statistics",
     "../modules/rtp_rtcp:rtp_rtcp_format",
-    "../p2p:stun_types",
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
@@ -137,6 +136,10 @@ rtc_static_library("rtc_media_base") {
     "base/video_source_base.cc",
     "base/video_source_base.h",
   ]
+
+  if (!build_with_mozilla) {
+    deps += [ "../p2p" ]
+  }
 }
 
 rtc_static_library("rtc_constants") {
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 3ef59f3c5d..5b9a5d5ac2 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -15,17 +15,9 @@ group("p2p") {
   ]
 }
 
+# TODO(bugs.webrtc.org/8733): Move base/stun.{h,cc} into this target,
+# after downstream dependencies are updated.
 rtc_source_set("stun_types") {
-  sources = [
-    "base/stun.cc",
-    "base/stun.h",
-  ]
-  deps = [
-    "../rtc_base:checks",
-    "../rtc_base:rtc_base",
-    "../rtc_base:rtc_base_approved",
-    "//third_party/abseil-cpp/absl/memory",
-  ]
 }
 
 rtc_static_library("rtc_p2p") {
@@ -75,6 +67,8 @@ rtc_static_library("rtc_p2p") {
     "base/regathering_controller.h",
     "base/relay_port.cc",
     "base/relay_port.h",
+    "base/stun.cc",
+    "base/stun.h",
     "base/stun_port.cc",
     "base/stun_port.h",
     "base/stun_request.cc",
@@ -98,7 +92,6 @@ rtc_static_library("rtc_p2p") {
   ]
 
   deps = [
-    ":stun_types",
     "../api:libjingle_peerconnection_api",
     "../api:scoped_refptr",
     "../api/rtc_event_log",
@@ -170,7 +163,6 @@ if (rtc_include_tests) {
       ":fake_port_allocator",
       ":p2p_server_utils",
       ":rtc_p2p",
-      ":stun_types",
       "../api:libjingle_peerconnection_api",
       "../rtc_base",
       "../rtc_base:gunit_helpers",
@@ -216,7 +208,6 @@ if (rtc_include_tests) {
       ":p2p_server_utils",
       ":p2p_test_utils",
       ":rtc_p2p",
-      ":stun_types",
       "../api:libjingle_peerconnection_api",
       "../api:scoped_refptr",
       "../api/units:time_delta",
@@ -250,7 +241,6 @@ rtc_source_set("p2p_server_utils") {
   ]
   deps = [
     ":rtc_p2p",
-    ":stun_types",
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_tests_utils",
@@ -269,7 +259,6 @@ rtc_static_library("libstunprober") {
 
   deps = [
     ":rtc_p2p",
-    ":stun_types",
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base/system:rtc_export",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 7a0f332a54..36183036f2 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -428,7 +428,6 @@ webrtc_fuzzer_test("stun_parser_fuzzer") {
   ]
   deps = [
     "../../p2p:rtc_p2p",
-    "../../p2p:stun_types",
   ]
   seed_corpus = "corpora/stun-corpus"
   dict = "corpora/stun.tokens"
@@ -440,7 +439,6 @@ webrtc_fuzzer_test("stun_validator_fuzzer") {
   ]
   deps = [
     "../../p2p:rtc_p2p",
-    "../../p2p:stun_types",
   ]
   seed_corpus = "corpora/stun-corpus"
   dict = "corpora/stun.tokens"