diff --git a/media/BUILD.gn b/media/BUILD.gn
index 5d8a2b849e..f010aeaf13 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -89,6 +89,7 @@ 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",
@@ -136,10 +137,6 @@ 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 bc80b7501b..1583cfb007 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -15,9 +15,17 @@ 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") {
@@ -66,8 +74,6 @@ 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",
@@ -91,6 +97,7 @@ rtc_static_library("rtc_p2p") {
   ]
 
   deps = [
+    ":stun_types",
     "../api:libjingle_peerconnection_api",
     "../api:packet_socket_factory",
     "../api:scoped_refptr",
@@ -163,6 +170,7 @@ if (rtc_include_tests) {
       ":fake_port_allocator",
       ":p2p_server_utils",
       ":rtc_p2p",
+      ":stun_types",
       "../api:libjingle_peerconnection_api",
       "../api:packet_socket_factory",
       "../rtc_base",
@@ -209,6 +217,7 @@ 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",
@@ -242,6 +251,7 @@ rtc_source_set("p2p_server_utils") {
   ]
   deps = [
     ":rtc_p2p",
+    ":stun_types",
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_tests_utils",
@@ -260,6 +270,7 @@ 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 36183036f2..7a0f332a54 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -428,6 +428,7 @@ webrtc_fuzzer_test("stun_parser_fuzzer") {
   ]
   deps = [
     "../../p2p:rtc_p2p",
+    "../../p2p:stun_types",
   ]
   seed_corpus = "corpora/stun-corpus"
   dict = "corpora/stun.tokens"
@@ -439,6 +440,7 @@ webrtc_fuzzer_test("stun_validator_fuzzer") {
   ]
   deps = [
     "../../p2p:rtc_p2p",
+    "../../p2p:stun_types",
   ]
   seed_corpus = "corpora/stun-corpus"
   dict = "corpora/stun.tokens"