diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn
index 0dda2f8832..68b4934317 100644
--- a/webrtc/common_video/BUILD.gn
+++ b/webrtc/common_video/BUILD.gn
@@ -59,7 +59,7 @@ rtc_static_library("common_video") {
     "..:webrtc_common",
     "../base:rtc_base",
     "../base:rtc_task_queue",
-    "../media:rtc_media_base",
+    "../media:rtc_h264_profile_id",
     "../modules:module_api",
     "../system_wrappers",
   ]
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index 249ceb89ff..ec00b049b6 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -32,6 +32,24 @@ config("rtc_media_warnings_config") {
   }
 }
 
+rtc_source_set("rtc_h264_profile_id") {
+  sources = [
+    "base/h264_profile_level_id.cc",
+    "base/h264_profile_level_id.h",
+  ]
+
+  if (!build_with_chromium && is_clang) {
+    # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+    suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+  }
+
+  deps = [
+    "..:webrtc_common",
+    "../base:rtc_base",
+    "../base:rtc_base_approved",
+  ]
+}
+
 rtc_source_set("rtc_media_base") {
   # TODO(kjellander): Remove (bugs.webrtc.org/6828)
   # Enabling GN check triggers cyclic dependency error:
@@ -51,8 +69,6 @@ rtc_source_set("rtc_media_base") {
     "base/codec.h",
     "base/cryptoparams.h",
     "base/device.h",
-    "base/h264_profile_level_id.cc",
-    "base/h264_profile_level_id.h",
     "base/mediachannel.h",
     "base/mediaconstants.cc",
     "base/mediaconstants.h",
@@ -96,6 +112,7 @@ rtc_source_set("rtc_media_base") {
   }
 
   deps += [
+    ":rtc_h264_profile_id",
     "..:webrtc_common",
     "../api:libjingle_peerconnection_api",
     "../base:rtc_base",
diff --git a/webrtc/pc/BUILD.gn b/webrtc/pc/BUILD.gn
index 2720a1e8a8..4719db64c0 100644
--- a/webrtc/pc/BUILD.gn
+++ b/webrtc/pc/BUILD.gn
@@ -61,6 +61,7 @@ rtc_static_library("rtc_pc_base") {
     "../base:rtc_base",
     "../base:rtc_task_queue",
     "../media:rtc_data",
+    "../media:rtc_h264_profile_id",
     "../media:rtc_media_base",
     "../p2p:rtc_p2p",
   ]