diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index a6a9e9f1d..4e439e6bb 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -41,6 +41,7 @@
       'modules_java_gyp_path%': '<(modules_java_gyp_path)',
 
       'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
+      'rbe_components_path%': '<(webrtc_root)/modules/remote_bitrate_estimator',
       'include_opus%': 1,
     },
     'build_with_chromium%': '<(build_with_chromium)',
@@ -50,6 +51,7 @@
     'modules_java_gyp_path%': '<(modules_java_gyp_path)',
     'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',
     'include_opus%': '<(include_opus)',
+    'rbe_components_path%': '<(rbe_components_path)',
 
     # The Chromium common.gypi we use treats all gyp files without
     # chromium_code==1 as third party code. This disables many of the
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index bfbaf560a..3ea1515b0 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -87,6 +87,7 @@
             'webrtc_utility',
             'webrtc_video_coding',
             '<@(neteq_dependencies)',
+            '<(rbe_components_path)/remote_bitrate_estimator_components.gyp:rbe_components_unittests',
             '<(DEPTH)/testing/gmock.gyp:gmock',
             '<(DEPTH)/testing/gtest.gyp:gtest',
             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
@@ -163,9 +164,6 @@
             'pacing/paced_sender_unittest.cc',
             'remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h',
             'remote_bitrate_estimator/bitrate_estimator_unittest.cc',
-            'remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc',
-            'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc',
-            'remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h',
             'remote_bitrate_estimator/rtp_to_ntp_unittest.cc',
             'rtp_rtcp/source/mock/mock_rtp_payload_strategy.h',
             'rtp_rtcp/source/fec_test_helper.cc',
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
index f738bb3cd..9c8efdebe 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
@@ -7,18 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
+  'includes': [
+    '../../build/common.gypi',
+  ],
   'targets': [
     {
       'target_name': 'remote_bitrate_estimator',
       'type': 'static_library',
       'dependencies': [
-        # system_wrappers
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-      ],
-      'include_dirs': [
-        'include',
-        '../rtp_rtcp/interface',
-        '../interface',
+        '<(rbe_components_path)/remote_bitrate_estimator_components.gyp:rbe_components',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -26,19 +24,11 @@
         ],
       },
       'sources': [
-        # interface
         'include/bwe_defines.h',
         'include/remote_bitrate_estimator.h',
         'include/rtp_to_ntp.h',
-
-        # source
         'bitrate_estimator.cc',
         'bitrate_estimator.h',
-        'overuse_detector.cc',
-        'overuse_detector.h',
-        'remote_bitrate_estimator_single_stream.cc',
-        'remote_rate_control.cc',
-        'remote_rate_control.h',
         'rtp_to_ntp.cc',
       ], # 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
new file mode 100644
index 000000000..c23c30ca6
--- /dev/null
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_components.gyp
@@ -0,0 +1,45 @@
+# 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': [
+    '../../build/common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'rbe_components',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(webrtc_root)/modules/remote_bitrate_estimator',
+      ],
+      'sources': [
+        'bitrate_estimator.cc',
+        'bitrate_estimator.h',
+        'overuse_detector.cc',
+        'overuse_detector.h',
+        'remote_bitrate_estimator_single_stream.cc',
+        'remote_rate_control.cc',
+        'remote_rate_control.h',
+      ],
+    },
+    {
+      'target_name': 'rbe_components_unittests',
+      'type': 'static_library',
+      'dependencies': [
+        '<(DEPTH)/testing/gmock.gyp:gmock',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(webrtc_root)/modules/modules.gyp:remote_bitrate_estimator',
+      ],
+      'sources': [
+        '<(rbe_components_path)/remote_bitrate_estimator_single_stream_unittest.cc',
+        '<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.cc',
+        '<(rbe_components_path)/remote_bitrate_estimator_unittest_helper.h',
+      ],
+    },
+  ],
+}
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi b/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi
index 8c4f36603..42b6580ca 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp.gypi
@@ -13,8 +13,8 @@
       'type': 'static_library',
       'dependencies': [
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-        '<(webrtc_root)/modules/modules.gyp:remote_bitrate_estimator',
         '<(webrtc_root)/modules/modules.gyp:paced_sender',
+        '<(webrtc_root)/modules/modules.gyp:remote_bitrate_estimator',
       ],
       'include_dirs': [
         '../interface',