diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 1f327c9eec..7cb713b8c6 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -308,8 +308,6 @@ rtc_library("video_coding_legacy") {
   visibility = [ ":video_coding_unittests" ]
   sources = [
     "include/video_coding.h",
-    "jitter_buffer.cc",
-    "jitter_buffer.h",
     "receiver.cc",
     "receiver.h",
     "video_coding_impl.cc",
@@ -351,6 +349,7 @@ rtc_library("video_coding_legacy") {
     "deprecated:deprecated_decoding_state",
     "deprecated:deprecated_event_wrapper",
     "deprecated:deprecated_frame_buffer",
+    "deprecated:deprecated_jitter_buffer",
     "deprecated:deprecated_jitter_buffer_common",
     "deprecated:deprecated_packet",
     "deprecated:deprecated_session_info",
@@ -1206,7 +1205,6 @@ if (rtc_include_tests) {
       "h264_sprop_parameter_sets_unittest.cc",
       "h264_sps_pps_tracker_unittest.cc",
       "histogram_unittest.cc",
-      "jitter_buffer_unittest.cc",
       "loss_notification_controller_unittest.cc",
       "nack_requester_unittest.cc",
       "packet_buffer_unittest.cc",
@@ -1214,8 +1212,6 @@ if (rtc_include_tests) {
       "rtp_frame_reference_finder_unittest.cc",
       "rtp_vp8_ref_finder_unittest.cc",
       "rtp_vp9_ref_finder_unittest.cc",
-      "test/stream_generator.cc",
-      "test/stream_generator.h",
       "utility/bandwidth_quality_scaler_unittest.cc",
       "utility/decoded_frames_history_unittest.cc",
       "utility/frame_dropper_unittest.cc",
@@ -1334,6 +1330,7 @@ if (rtc_include_tests) {
       "deprecated:deprecated_jitter_buffer_common",
       "deprecated:deprecated_packet",
       "deprecated:deprecated_session_info",
+      "deprecated:deprecated_stream_generator",
       "svc:scalability_structure_tests",
       "svc:svc_rate_allocator_tests",
       "timing:jitter_estimator",
diff --git a/modules/video_coding/deprecated/BUILD.gn b/modules/video_coding/deprecated/BUILD.gn
index 5859902165..43f6959ce8 100644
--- a/modules/video_coding/deprecated/BUILD.gn
+++ b/modules/video_coding/deprecated/BUILD.gn
@@ -41,6 +41,33 @@ rtc_library("deprecated_jitter_buffer_common") {
   sources = [ "jitter_buffer_common.h" ]
 }
 
+rtc_library("deprecated_jitter_buffer") {
+  sources = [
+    "jitter_buffer.cc",
+    "jitter_buffer.h",
+  ]
+  deps = [
+    ":deprecated_decoding_state",
+    ":deprecated_event_wrapper",
+    ":deprecated_frame_buffer",
+    ":deprecated_jitter_buffer_common",
+    ":deprecated_packet",
+    "../../../api:field_trials_view",
+    "../../../api/units:timestamp",
+    "../../../modules:module_api",
+    "../../../modules:module_api_public",
+    "../../../modules/video_coding:video_codec_interface",
+    "../../../modules/video_coding/timing:inter_frame_delay_variation_calculator",
+    "../../../modules/video_coding/timing:jitter_estimator",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
+    "../../../rtc_base:macromagic",
+    "../../../rtc_base/synchronization:mutex",
+    "../../../system_wrappers",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
+}
+
 rtc_library("deprecated_frame_buffer") {
   sources = [
     "frame_buffer.cc",
@@ -92,20 +119,38 @@ rtc_library("deprecated_session_info") {
   absl_deps = [ "//third_party/abseil-cpp/absl/types:variant" ]
 }
 
+rtc_library("deprecated_stream_generator") {
+  deps = [
+    ":deprecated_packet",
+    "../../../rtc_base:checks",
+  ]
+  sources = [
+    "stream_generator.cc",
+    "stream_generator.h",
+  ]
+}
+
 rtc_library("deprecated_unittests") {
   testonly = true
   sources = [
     "decoding_state_unittest.cc",
+    "jitter_buffer_unittest.cc",
     "session_info_unittest.cc",
   ]
   visibility += [ "../../../modules/*" ]
   deps = [
     ":deprecated_decoding_state",
     ":deprecated_frame_buffer",
+    ":deprecated_jitter_buffer",
     ":deprecated_packet",
     ":deprecated_session_info",
+    ":deprecated_stream_generator",
+    "../../../common_video",
     "../../../modules/rtp_rtcp:rtp_video_header",
     "../../../modules/video_coding:codec_globals_headers",
+    "../../../system_wrappers",
+    "../../../test:scoped_key_value_config",
     "../../../test:test_support",
   ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
 }
diff --git a/modules/video_coding/jitter_buffer.cc b/modules/video_coding/deprecated/jitter_buffer.cc
similarity index 99%
rename from modules/video_coding/jitter_buffer.cc
rename to modules/video_coding/deprecated/jitter_buffer.cc
index 24e4fd2d8b..bae4bac9f8 100644
--- a/modules/video_coding/jitter_buffer.cc
+++ b/modules/video_coding/deprecated/jitter_buffer.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "modules/video_coding/jitter_buffer.h"
+#include "modules/video_coding/deprecated/jitter_buffer.h"
 
 #include <algorithm>
 #include <limits>
@@ -17,8 +17,6 @@
 #include "modules/video_coding/deprecated/frame_buffer.h"
 #include "modules/video_coding/deprecated/jitter_buffer_common.h"
 #include "modules/video_coding/deprecated/packet.h"
-#include "modules/video_coding/include/video_coding.h"
-#include "modules/video_coding/internal_defines.h"
 #include "modules/video_coding/timing/inter_frame_delay_variation_calculator.h"
 #include "modules/video_coding/timing/jitter_estimator.h"
 #include "rtc_base/checks.h"
diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/deprecated/jitter_buffer.h
similarity index 98%
rename from modules/video_coding/jitter_buffer.h
rename to modules/video_coding/deprecated/jitter_buffer.h
index fe314f0104..49af9c7b1e 100644
--- a/modules/video_coding/jitter_buffer.h
+++ b/modules/video_coding/deprecated/jitter_buffer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MODULES_VIDEO_CODING_JITTER_BUFFER_H_
-#define MODULES_VIDEO_CODING_JITTER_BUFFER_H_
+#ifndef MODULES_VIDEO_CODING_DEPRECATED_JITTER_BUFFER_H_
+#define MODULES_VIDEO_CODING_DEPRECATED_JITTER_BUFFER_H_
 
 #include <list>
 #include <map>
@@ -23,7 +23,6 @@
 #include "modules/video_coding/deprecated/decoding_state.h"
 #include "modules/video_coding/deprecated/event_wrapper.h"
 #include "modules/video_coding/deprecated/jitter_buffer_common.h"
-#include "modules/video_coding/include/video_coding.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/timing/inter_frame_delay_variation_calculator.h"
 #include "modules/video_coding/timing/jitter_estimator.h"
@@ -280,4 +279,4 @@ class VCMJitterBuffer {
 };
 }  // namespace webrtc
 
-#endif  // MODULES_VIDEO_CODING_JITTER_BUFFER_H_
+#endif  // MODULES_VIDEO_CODING_DEPRECATED_JITTER_BUFFER_H_
diff --git a/modules/video_coding/jitter_buffer_unittest.cc b/modules/video_coding/deprecated/jitter_buffer_unittest.cc
similarity index 99%
rename from modules/video_coding/jitter_buffer_unittest.cc
rename to modules/video_coding/deprecated/jitter_buffer_unittest.cc
index 89f75e7a93..81483a1e2c 100644
--- a/modules/video_coding/jitter_buffer_unittest.cc
+++ b/modules/video_coding/deprecated/jitter_buffer_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_coding/jitter_buffer.h"
+#include "modules/video_coding/deprecated/jitter_buffer.h"
 
 #include <list>
 #include <memory>
@@ -19,10 +19,8 @@
 #include "common_video/h264/h264_common.h"
 #include "modules/video_coding/deprecated/frame_buffer.h"
 #include "modules/video_coding/deprecated/packet.h"
-#include "modules/video_coding/media_opt_util.h"
-#include "modules/video_coding/test/stream_generator.h"
+#include "modules/video_coding/deprecated/stream_generator.h"
 #include "system_wrappers/include/clock.h"
-#include "system_wrappers/include/metrics.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 #include "test/scoped_key_value_config.h"
diff --git a/modules/video_coding/test/stream_generator.cc b/modules/video_coding/deprecated/stream_generator.cc
similarity index 96%
rename from modules/video_coding/test/stream_generator.cc
rename to modules/video_coding/deprecated/stream_generator.cc
index c136f2efcf..503ada2b37 100644
--- a/modules/video_coding/test/stream_generator.cc
+++ b/modules/video_coding/deprecated/stream_generator.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_coding/test/stream_generator.h"
+#include "modules/video_coding/deprecated/stream_generator.h"
 
 #include <string.h>
 
 #include <list>
 
 #include "modules/video_coding/deprecated/packet.h"
-#include "test/gtest.h"
+#include "rtc_base/checks.h"
 
 namespace webrtc {
 
@@ -55,7 +55,7 @@ VCMPacket StreamGenerator::GeneratePacket(uint16_t sequence_number,
                                           bool first_packet,
                                           bool marker_bit,
                                           VideoFrameType type) {
-  EXPECT_LT(size, kMaxPacketSize);
+  RTC_CHECK_LT(size, kMaxPacketSize);
   VCMPacket packet;
   packet.seqNum = sequence_number;
   packet.timestamp = timestamp;
diff --git a/modules/video_coding/test/stream_generator.h b/modules/video_coding/deprecated/stream_generator.h
similarity index 92%
rename from modules/video_coding/test/stream_generator.h
rename to modules/video_coding/deprecated/stream_generator.h
index 1b6bb12df8..1a86f69937 100644
--- a/modules/video_coding/test/stream_generator.h
+++ b/modules/video_coding/deprecated/stream_generator.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_
-#define MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_
+#ifndef MODULES_VIDEO_CODING_DEPRECATED_STREAM_GENERATOR_H_
+#define MODULES_VIDEO_CODING_DEPRECATED_STREAM_GENERATOR_H_
 
 #include <stdint.h>
 
@@ -71,4 +71,4 @@ class StreamGenerator {
 
 }  // namespace webrtc
 
-#endif  // MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_
+#endif  // MODULES_VIDEO_CODING_DEPRECATED_STREAM_GENERATOR_H_
diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h
index afc4b9c563..fcadf607a0 100644
--- a/modules/video_coding/receiver.h
+++ b/modules/video_coding/receiver.h
@@ -16,10 +16,10 @@
 
 #include "api/field_trials_view.h"
 #include "modules/video_coding/deprecated/event_wrapper.h"
+#include "modules/video_coding/deprecated/jitter_buffer.h"
 #include "modules/video_coding/deprecated/packet.h"
 #include "modules/video_coding/include/video_coding.h"
 #include "modules/video_coding/include/video_coding_defines.h"
-#include "modules/video_coding/jitter_buffer.h"
 #include "modules/video_coding/timing/timing.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc
index ef8df0757c..7b7e423841 100644
--- a/modules/video_coding/receiver_unittest.cc
+++ b/modules/video_coding/receiver_unittest.cc
@@ -18,8 +18,8 @@
 
 #include "modules/video_coding/deprecated/jitter_buffer_common.h"
 #include "modules/video_coding/deprecated/packet.h"
+#include "modules/video_coding/deprecated/stream_generator.h"
 #include "modules/video_coding/encoded_frame.h"
-#include "modules/video_coding/test/stream_generator.h"
 #include "modules/video_coding/timing/timing.h"
 #include "rtc_base/checks.h"
 #include "system_wrappers/include/clock.h"
diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h
index cd32330f94..de17033277 100644
--- a/modules/video_coding/video_coding_impl.h
+++ b/modules/video_coding/video_coding_impl.h
@@ -20,9 +20,9 @@
 #include "api/field_trials_view.h"
 #include "api/sequence_checker.h"
 #include "modules/video_coding/deprecated/frame_buffer.h"
+#include "modules/video_coding/deprecated/jitter_buffer.h"
 #include "modules/video_coding/generic_decoder.h"
 #include "modules/video_coding/include/video_coding.h"
-#include "modules/video_coding/jitter_buffer.h"
 #include "modules/video_coding/receiver.h"
 #include "modules/video_coding/timing/timing.h"
 #include "rtc_base/one_time_event.h"
diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
index bf2ef0b4aa..0363fd2736 100644
--- a/modules/video_coding/video_receiver.cc
+++ b/modules/video_coding/video_receiver.cc
@@ -18,13 +18,13 @@
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_decoder.h"
 #include "modules/video_coding/decoder_database.h"
+#include "modules/video_coding/deprecated/jitter_buffer.h"
 #include "modules/video_coding/deprecated/packet.h"
 #include "modules/video_coding/encoded_frame.h"
 #include "modules/video_coding/generic_decoder.h"
 #include "modules/video_coding/include/video_coding.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/internal_defines.h"
-#include "modules/video_coding/jitter_buffer.h"
 #include "modules/video_coding/media_opt_util.h"
 #include "modules/video_coding/receiver.h"
 #include "modules/video_coding/timing/timing.h"