diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 11050896b2..ad51d241e6 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -253,8 +253,6 @@ rtc_library("peerconnection") {
     "sctp_data_channel.h",
     "sdp_offer_answer.cc",  # TODO: Make separate target when not circular
     "sdp_offer_answer.h",  # dependent on peerconnection.h
-    "sdp_utils.cc",
-    "sdp_utils.h",
     "stats_collector.cc",
     "stats_collector.h",
     "stream_collection.h",
@@ -499,7 +497,21 @@ rtc_source_set("sdp_serializer") {
   ]
 }
 rtc_source_set("sdp_utils") {
-  visibility = [ ":*" ]
+  visibility = [
+    ":*",
+    "../test/pc/e2e:*",
+  ]
+  sources = [
+    "sdp_utils.cc",
+    "sdp_utils.h",
+  ]
+  deps = [
+    "../api:libjingle_peerconnection_api",
+    "../p2p:rtc_p2p",
+    "../pc:session_description",
+    "../rtc_base:checks",
+    "../rtc_base/system:rtc_export",
+  ]
 }
 rtc_source_set("stats_collector") {
   visibility = [ ":*" ]
@@ -1144,6 +1156,7 @@ if (rtc_include_tests && !build_with_chromium) {
     ]
     deps = [
       ":pc_test_utils",
+      ":sdp_utils",
       "../api:function_view",
       "../api:libjingle_peerconnection_api",
       "../api:media_stream_interface",
@@ -1226,6 +1239,7 @@ if (rtc_include_tests && !build_with_chromium) {
       ":rtp_sender",
       ":rtp_transceiver",
       ":sdp_serializer",
+      ":sdp_utils",
       ":session_description",
       ":usage_pattern",
       ":video_rtp_receiver",
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index 11c95d0e47..08df2f8817 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -388,6 +388,7 @@ if (!build_with_chromium) {
         "../../../api/units:timestamp",
         "../../../pc:pc_test_utils",
         "../../../pc:peerconnection",
+        "../../../pc:sdp_utils",
         "../../../rtc_base",
         "../../../rtc_base:gunit_helpers",
         "../../../rtc_base:macromagic",
@@ -815,6 +816,7 @@ if (!build_with_chromium) {
       "../../../p2p:rtc_p2p",
       "../../../pc:peerconnection",
       "../../../pc:rtc_pc_base",
+      "../../../pc:sdp_utils",
       "../../../pc:session_description",
       "../../../pc:simulcast_description",
       "../../../rtc_base:stringutils",