diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn
index 832d6ee4de..7474974c52 100644
--- a/webrtc/common_video/BUILD.gn
+++ b/webrtc/common_video/BUILD.gn
@@ -17,7 +17,9 @@ config("common_video_config") {
 
 source_set("common_video") {
   sources = [
+    "bitrate_adjuster.cc",
     "i420_buffer_pool.cc",
+    "include/bitrate_adjuster.h",
     "include/frame_callback.h",
     "include/i420_buffer_pool.h",
     "include/incoming_video_stream.h",
diff --git a/webrtc/modules/video_coding/bitrate_adjuster.cc b/webrtc/common_video/bitrate_adjuster.cc
similarity index 98%
rename from webrtc/modules/video_coding/bitrate_adjuster.cc
rename to webrtc/common_video/bitrate_adjuster.cc
index b6828ee6e1..9c61120afe 100644
--- a/webrtc/modules/video_coding/bitrate_adjuster.cc
+++ b/webrtc/common_video/bitrate_adjuster.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_coding/include/bitrate_adjuster.h"
+#include "webrtc/common_video/include/bitrate_adjuster.h"
 
 #include <cmath>
 
diff --git a/webrtc/modules/video_coding/bitrate_adjuster_unittest.cc b/webrtc/common_video/bitrate_adjuster_unittest.cc
similarity index 99%
rename from webrtc/modules/video_coding/bitrate_adjuster_unittest.cc
rename to webrtc/common_video/bitrate_adjuster_unittest.cc
index 1421082aeb..23b278731e 100644
--- a/webrtc/modules/video_coding/bitrate_adjuster_unittest.cc
+++ b/webrtc/common_video/bitrate_adjuster_unittest.cc
@@ -10,7 +10,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "webrtc/modules/video_coding/include/bitrate_adjuster.h"
+#include "webrtc/common_video/include/bitrate_adjuster.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/common_video/common_video.gyp b/webrtc/common_video/common_video.gyp
index 0318d67de2..47ba3e59d7 100644
--- a/webrtc/common_video/common_video.gyp
+++ b/webrtc/common_video/common_video.gyp
@@ -52,9 +52,11 @@
         }],
       ],
       'sources': [
+        'bitrate_adjuster.cc',
         'i420_buffer_pool.cc',
         'video_frame.cc',
         'incoming_video_stream.cc',
+        'include/bitrate_adjuster.h',
         'include/frame_callback.h',
         'include/i420_buffer_pool.h',
         'include/incoming_video_stream.h',
diff --git a/webrtc/common_video/common_video_unittests.gyp b/webrtc/common_video/common_video_unittests.gyp
index 5fa082a8e3..8372c0b4a9 100644
--- a/webrtc/common_video/common_video_unittests.gyp
+++ b/webrtc/common_video/common_video_unittests.gyp
@@ -20,6 +20,7 @@
          '<(webrtc_root)/test/test.gyp:video_test_common',
       ],
       'sources': [
+        'bitrate_adjuster_unittest.cc',
         'i420_buffer_pool_unittest.cc',
         'i420_video_frame_unittest.cc',
         'libyuv/libyuv_unittest.cc',
diff --git a/webrtc/modules/video_coding/include/bitrate_adjuster.h b/webrtc/common_video/include/bitrate_adjuster.h
similarity index 94%
rename from webrtc/modules/video_coding/include/bitrate_adjuster.h
rename to webrtc/common_video/include/bitrate_adjuster.h
index ec58445ae2..1f2474f88b 100644
--- a/webrtc/modules/video_coding/include/bitrate_adjuster.h
+++ b/webrtc/common_video/include/bitrate_adjuster.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_BITRATE_ADJUSTER_H_
-#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_BITRATE_ADJUSTER_H_
+#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_
+#define WEBRTC_COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_
 
 #include <functional>
 
@@ -86,4 +86,4 @@ class BitrateAdjuster {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_BITRATE_ADJUSTER_H_
+#endif  // WEBRTC_COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 26ec179630..14ab8e2889 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -364,7 +364,6 @@
             'video_coding/codecs/vp8/simulcast_unittest.h',
             'video_coding/codecs/vp9/screenshare_layers_unittest.cc',
             'video_coding/include/mock/mock_vcm_callbacks.h',
-            'video_coding/bitrate_adjuster_unittest.cc',
             'video_coding/decoding_state_unittest.cc',
             'video_coding/histogram_unittest.cc',
             'video_coding/jitter_buffer_unittest.cc',
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 1f7db59d28..f163b95da6 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -10,8 +10,6 @@ import("../../build/webrtc.gni")
 
 source_set("video_coding") {
   sources = [
-    "bitrate_adjuster.cc",
-    "bitrate_adjuster.h",
     "codec_database.cc",
     "codec_database.h",
     "codec_timer.cc",
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
index 78b76536c9..d54fa612c3 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
+++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
@@ -12,9 +12,9 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
 
+#include "webrtc/common_video/include/bitrate_adjuster.h"
 #include "webrtc/common_video/rotation.h"
 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
-#include "webrtc/modules/video_coding/include/bitrate_adjuster.h"
 
 #if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
 
diff --git a/webrtc/modules/video_coding/video_coding.gypi b/webrtc/modules/video_coding/video_coding.gypi
index 7cfefed3ee..f3ca1c7a73 100644
--- a/webrtc/modules/video_coding/video_coding.gypi
+++ b/webrtc/modules/video_coding/video_coding.gypi
@@ -22,7 +22,6 @@
       ],
       'sources': [
         # interfaces
-        'include/bitrate_adjuster.h',
         'include/video_coding.h',
         'include/video_coding_defines.h',
 
@@ -60,7 +59,6 @@
         'video_coding_impl.h',
 
         # sources
-        'bitrate_adjuster.cc',
         'codec_database.cc',
         'codec_timer.cc',
         'content_metrics_processing.cc',