diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 1477d4349..691f308b4 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -95,7 +95,6 @@
             '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
             '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
-            '<(webrtc_root)/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp:rbe_components',
             '<(webrtc_root)/modules/video_coding/codecs/vp8/vp8.gyp:webrtc_vp8',
             '<(webrtc_root)/modules/video_coding/codecs/vp9/vp9.gyp:webrtc_vp9',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
index 53b4cd30a..6580281c6 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
@@ -15,14 +15,29 @@
       'target_name': 'remote_bitrate_estimator',
       'type': 'static_library',
       'dependencies': [
-        '<(webrtc_root)/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp:rbe_components',
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [
         'include/bwe_defines.h',
         'include/remote_bitrate_estimator.h',
+        'aimd_rate_control.cc',
+        'aimd_rate_control.h',
+        'inter_arrival.cc',
+        'inter_arrival.h',
+        'mimd_rate_control.cc',
+        'mimd_rate_control.h',
+        'overuse_detector.cc',
+        'overuse_detector.h',
+        'overuse_estimator.cc',
+        'overuse_estimator.h',
         'rate_statistics.cc',
         'rate_statistics.h',
+        'remote_bitrate_estimator_abs_send_time.cc',
+        'remote_bitrate_estimator_single_stream.cc',
+        'remote_rate_control.cc',
+        'remote_rate_control.h',
+        'test/bwe_test_logging.cc',
+        'test/bwe_test_logging.h',
       ], # source
     },
     {
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp
deleted file mode 100644
index 282705e4c..000000000
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-{
-  'includes': [
-    '../../../webrtc/build/common.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'rbe_components',
-      'type': 'static_library',
-
-      'include_dirs': [
-        '<(webrtc_root)/modules/remote_bitrate_estimator',
-      ],
-      'sources': [
-        '<(webrtc_root)/modules/remote_bitrate_estimator/test/bwe_test_logging.cc',
-        '<(webrtc_root)/modules/remote_bitrate_estimator/test/bwe_test_logging.h',
-        'aimd_rate_control.cc',
-        'aimd_rate_control.h',
-        'inter_arrival.cc',
-        'inter_arrival.h',
-        'mimd_rate_control.cc',
-        'mimd_rate_control.h',
-        'overuse_detector.cc',
-        'overuse_detector.h',
-        'overuse_estimator.cc',
-        'overuse_estimator.h',
-        'remote_bitrate_estimator_abs_send_time.cc',
-        'remote_bitrate_estimator_single_stream.cc',
-        'remote_rate_control.cc',
-        'remote_rate_control.h',
-      ],
-    },
-  ],
-}