diff --git a/webrtc/modules/remote_bitrate_estimator/BUILD.gn b/webrtc/modules/remote_bitrate_estimator/BUILD.gn
index f13e8fcb0a..8bcbe7b334 100644
--- a/webrtc/modules/remote_bitrate_estimator/BUILD.gn
+++ b/webrtc/modules/remote_bitrate_estimator/BUILD.gn
@@ -57,6 +57,26 @@ rtc_static_library("remote_bitrate_estimator") {
   ]
 }
 
+if (!build_with_chromium) {
+  rtc_source_set("bwe_rtp") {
+    testonly = true
+    sources = [
+      "tools/bwe_rtp.cc",
+      "tools/bwe_rtp.h",
+    ]
+    deps = [
+      ":remote_bitrate_estimator",
+      "../../rtc_base:rtc_base_approved",
+      "../../test:rtp_test_utils",
+      "../rtp_rtcp:rtp_rtcp",
+    ]
+    if (is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+  }
+}
+
 if (rtc_include_tests) {
   rtc_static_library("bwe_simulator_lib") {
     testonly = true
diff --git a/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.cc b/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.cc
index de0d5ea9e0..d8493982c0 100644
--- a/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.cc
+++ b/webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.cc
@@ -79,7 +79,7 @@ bool ParseArgsAndSetupEstimator(int argc,
   if (rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true)) {
     return 1;
   }
-  if (FLAG_help) {
+  if (flags::FLAG_help) {
     rtc::FlagList::Print(nullptr, false);
     return 0;
   }