diff --git a/BUILD.gn b/BUILD.gn
index 4acda15..00a4932 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -427,7 +427,10 @@
     }
 
     if (build_with_mozilla) {
-      deps += [ "api/video:video_frame" ]
+      deps += [
+        "api/video:video_frame",
+        "api/video:video_rtp_headers",
+      ]
     } else {
       deps += [
         "api",
diff --git a/api/BUILD.gn b/api/BUILD.gn
index 063767a..9c35682 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -74,6 +74,7 @@
     ":array_view",
     "..:webrtc_common",
     "video:video_frame",
+    "video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
@@ -180,6 +181,7 @@
     "units:timestamp",
     "video:encoded_image",
     "video:video_frame",
+    "video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/algorithm:container",
     "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -236,6 +238,7 @@
     ":stats_observer_interface",
     "video:encoded_image",
     "video:video_frame",
+    "video:video_rtp_headers",
     "video_codecs:video_codecs_api",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index 483707b..557e8da 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -8,6 +8,32 @@
 
 import("../../webrtc.gni")
 
+# Part of a change to break the dependency between "api:rtp_headers" and
+# "api/video:video_frame". This build rule is currently just an empty
+# placeholder to help us fix downstream projects before moving the source files
+# from "api/video:video_frame".
+rtc_source_set("video_rtp_headers") {
+  visibility = [ "*" ]
+  sources = [
+    # "color_space.cc",
+    # "color_space.h",
+    # "hdr_metadata.cc",
+    # "hdr_metadata.h",
+    # "video_content_type.cc",
+    # "video_content_type.h",
+    # "video_frame_marking.h",
+    # "video_rotation.h",
+    # "video_timing.cc",
+    # "video_timing.h",
+  ]
+
+  deps = [
+    "..:array_view",
+    "../../rtc_base:rtc_base_approved",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
+}
+
 rtc_source_set("video_frame") {
   visibility = [ "*" ]
   sources = [
@@ -32,6 +58,7 @@
   ]
 
   deps = [
+    ":video_rtp_headers",
     "..:array_view",
     "..:scoped_refptr",
     "../../rtc_base:checks",
@@ -56,6 +83,7 @@
   ]
   deps = [
     ":video_frame",
+    ":video_rtp_headers",
     "..:scoped_refptr",
     "../../rtc_base",
     "../../rtc_base:checks",
@@ -74,6 +102,7 @@
   deps = [
     ":video_frame",
     ":video_frame_i420",
+    ":video_rtp_headers",
     "..:scoped_refptr",
     "../../rtc_base",
     "../../rtc_base:checks",
@@ -91,6 +120,8 @@
     ":video_codec_constants",
     ":video_frame",
     ":video_frame_type",
+    ":video_rtp_headers",
+    "..:rtp_packet_info",
     "../..:webrtc_common",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
diff --git a/api/video/test/BUILD.gn b/api/video/test/BUILD.gn
index df1e383..8ad1b50 100644
--- a/api/video/test/BUILD.gn
+++ b/api/video/test/BUILD.gn
@@ -17,6 +17,7 @@
   deps = [
     "..:video_bitrate_allocation",
     "..:video_frame",
+    "..:video_rtp_headers",
     "../../../test:test_support",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index 21cdca2..66e17e2 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -47,6 +47,7 @@
     "../video:video_bitrate_allocation",
     "../video:video_codec_constants",
     "../video:video_frame",
+    "../video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/algorithm:container",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
     "//third_party/abseil-cpp/absl/strings",
@@ -148,6 +149,7 @@
     "../video:encoded_image",
     "../video:video_bitrate_allocation",
     "../video:video_frame",
+    "../video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
diff --git a/api/video_codecs/test/BUILD.gn b/api/video_codecs/test/BUILD.gn
index 03b9276..449788d 100644
--- a/api/video_codecs/test/BUILD.gn
+++ b/api/video_codecs/test/BUILD.gn
@@ -35,6 +35,7 @@
       "../../video:video_bitrate_allocation",
       "../../video:video_frame",
       "../../video:video_frame_i420",
+      "../../video:video_rtp_headers",
       "//testing/gtest",
       "//third_party/abseil-cpp/absl/memory",
     ]
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 52f13da..9ee0520 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -136,6 +136,7 @@
     "../api/units:time_delta",
     "../api/units:timestamp",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../logging:rtc_event_bwe",
     "../logging:rtc_event_log_api",
@@ -276,6 +277,7 @@
     "../api:rtp_headers",
     "../api:transport_api",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video:video_stream_encoder",
     "../api/video_codecs:video_codecs_api",
     "../common_video",
@@ -374,6 +376,7 @@
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/task_queue:default_task_queue_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../audio",
       "../logging:rtc_event_log_api",
       "../logging:rtc_event_log_impl_base",
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 10a646f..ccb93ee 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -47,6 +47,7 @@
     "../api/video:video_bitrate_allocator",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:bitstream_parser_api",
     "../media:rtc_h264_profile_id",
     "../rtc_base",
@@ -95,6 +96,7 @@
       "../api/video:video_frame",
       "../api/video:video_frame_i010",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../media:rtc_h264_profile_id",
       "../rtc_base",
       "../rtc_base:checks",
diff --git a/common_video/test/BUILD.gn b/common_video/test/BUILD.gn
index d9cf786..0522ba5 100644
--- a/common_video/test/BUILD.gn
+++ b/common_video/test/BUILD.gn
@@ -16,7 +16,9 @@
       "utilities.h",
     ]
     deps = [
+      "../../api:rtp_packet_info",
       "../../api/video:video_frame",
+      "../../api/video:video_rtp_headers",
     ]
   }
 }
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index a14c206..f33ec4d 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -646,6 +646,7 @@
       "../api/audio:audio_mixer_api",
       "../api/audio_codecs:audio_codecs_api",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:video_codecs_api",
       "../media:rtc_media_base",
       "../p2p:rtc_p2p",
@@ -688,6 +689,7 @@
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/audio_codecs:builtin_audio_encoder_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:builtin_video_decoder_factory",
       "../api/video_codecs:builtin_video_encoder_factory",
       "../media:rtc_audio_video",
@@ -795,6 +797,7 @@
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/audio_codecs:builtin_audio_encoder_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../media:rtc_audio_video",
       "../media:rtc_internal_video_codecs",
       "../media:rtc_media",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 95f19dc..6627eea 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -81,6 +81,7 @@
     "../api/video:video_bitrate_allocator_factory",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
     "../common_video",
@@ -161,6 +162,7 @@
     "../api/video:video_codec_constants",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../modules/video_coding:video_codec_interface",
     "../modules/video_coding:video_coding_utility",
@@ -188,6 +190,7 @@
     ":rtc_simulcast_encoder_adapter",
     "../api/video:video_bitrate_allocation",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../modules/video_coding:video_codec_interface",
     "../rtc_base/system:rtc_export",
@@ -209,7 +212,7 @@
     "../api/video:encoded_image",
     "../api/video:video_bitrate_allocation",
     "../api/video:video_frame",
-    "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:rtc_software_fallback_wrappers",
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
@@ -266,6 +269,7 @@
     "../api/video:video_codec_constants",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:rtc_software_fallback_wrappers",
     "../api/video_codecs:video_codecs_api",
     "../call",
@@ -422,6 +426,7 @@
       "../api/video:video_bitrate_allocation",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:video_codecs_api",
       "../call:call_interfaces",
       "../call:mock_rtp_interfaces",
@@ -521,6 +526,7 @@
       "../api/video:video_bitrate_allocation",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:builtin_video_decoder_factory",
       "../api/video_codecs:builtin_video_encoder_factory",
       "../api/video_codecs:video_codecs_api",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 60f7085..b738624 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -98,6 +98,7 @@
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/transport:network_control",
     "../../api/video:video_frame",
+    "../../api/video:video_rtp_headers",
     "../../common_video",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
@@ -215,6 +216,7 @@
     "../../api/video:video_bitrate_allocation",
     "../../api/video:video_bitrate_allocator",
     "../../api/video:video_frame",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../call:rtp_interfaces",
     "../../common_video",
@@ -287,6 +289,7 @@
     "../../:webrtc_common",
     "../../api/video:video_frame",
     "../../api/video:video_frame_type",
+    "../../api/video:video_rtp_headers",
     "../../modules/video_coding:codec_globals_headers",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -453,6 +456,7 @@
       "../../api/video:video_bitrate_allocator",
       "../../api/video:video_codec_constants",
       "../../api/video:video_frame",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../call:rtp_receiver",
       "../../common_video",
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index af6f22e..8d51b7f 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -31,6 +31,7 @@
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../common_video",
     "../../media:rtc_media_base",
     "../../rtc_base:rtc_base_approved",
@@ -126,6 +127,7 @@
         "../../api:scoped_refptr",
         "../../api/video:video_frame",
         "../../api/video:video_frame_i420",
+        "../../api/video:video_rtp_headers",
         "../../common_video",
         "../../rtc_base:rtc_base_approved",
         "../../system_wrappers",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 49d39a9..4ae54db 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -20,6 +20,7 @@
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../modules:module_api",
     "../../modules:module_api_public",
     "../../rtc_base:checks",
@@ -63,6 +64,7 @@
     "..:module_api",
     "../../:webrtc_common",
     "../../api:rtp_headers",
+    "../../api:rtp_packet_info",
     "../../api/video:video_frame_type",
     "../rtp_rtcp:rtp_rtcp_format",
     "../rtp_rtcp:rtp_video_header",
@@ -158,6 +160,7 @@
     "../../api/video:video_bitrate_allocator",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../rtc_base",
@@ -196,6 +199,7 @@
   deps = [
     "..:module_api",
     "../../api/video:video_frame",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../common_video/generic_frame_descriptor",
@@ -290,6 +294,7 @@
     "../../api/video:video_frame",
     "../../api/video:video_frame_i010",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../media:rtc_h264_profile_id",
@@ -336,6 +341,7 @@
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../rtc_base",
@@ -369,6 +375,7 @@
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../api/video_codecs:vp8_temporal_layers_factory",
     "../../common_video",
@@ -460,6 +467,7 @@
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i010",
+    "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
     "../../media:rtc_media_base",
@@ -505,6 +513,7 @@
 
       deps = [
         "../../api/video:video_frame",
+        "../../api/video:video_rtp_headers",
         "../../api/video_codecs:video_codecs_api",
         "../../media:rtc_audio_video",
         "../../media:rtc_media_base",
@@ -537,6 +546,7 @@
       "../../api/video:encoded_image",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../common_video",
       "../../rtc_base:checks",
@@ -573,6 +583,7 @@
       "../../api/video:video_bitrate_allocator_factory",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../common_video",
       "../../rtc_base:checks",
@@ -719,6 +730,7 @@
       "../../api/video:encoded_image",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:rtc_software_fallback_wrappers",
       "../../api/video_codecs:video_codecs_api",
       "../../common_video",
@@ -845,6 +857,7 @@
       "../../api/video:video_bitrate_allocator_factory",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../api/video_codecs:vp8_temporal_layers_factory",
       "../../common_video",
diff --git a/modules/video_processing/BUILD.gn b/modules/video_processing/BUILD.gn
index d488a46..003a7dd 100644
--- a/modules/video_processing/BUILD.gn
+++ b/modules/video_processing/BUILD.gn
@@ -30,6 +30,7 @@
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
+    "../../api/video:video_rtp_headers",
     "../../common_audio",
     "../../common_video",
     "../../modules/utility",
@@ -108,6 +109,7 @@
       "../../api:scoped_refptr",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../common_video",
       "../../test:fileutils",
       "../../test:test_support",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 1417acf..65f968a 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -83,6 +83,7 @@
     "../api:scoped_refptr",
     "../api/video:builtin_video_bitrate_allocator_factory",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../call:call_interfaces",
     "../call:rtp_interfaces",
     "../call:rtp_receiver",
@@ -214,6 +215,7 @@
     "../api/task_queue",
     "../api/video:builtin_video_bitrate_allocator_factory",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
     "../common_video",
@@ -427,6 +429,7 @@
       "../api/task_queue:default_task_queue_factory",
       "../api/video:builtin_video_bitrate_allocator_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:builtin_video_decoder_factory",
       "../api/video_codecs:builtin_video_encoder_factory",
       "../api/video_codecs:video_codecs_api",
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index dbbed49..790fe66 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -69,6 +69,7 @@
     "../api:scoped_refptr",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/strings",
@@ -86,6 +87,7 @@
     "../api:scoped_refptr",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -111,6 +113,7 @@
     "../api:scoped_refptr",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../common_video",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
@@ -205,6 +208,7 @@
       ":video_quality_analysis",
       "../api:scoped_refptr",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
     ]
   }
 
@@ -219,6 +223,7 @@
       ":video_quality_analysis",
       "../api:scoped_refptr",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
     ]
   }
 
@@ -417,6 +422,7 @@
       "../api:scoped_refptr",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../common_video",
       "../rtc_base",
       "../rtc_base:checks",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index d389298..60be6db8 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -332,6 +332,7 @@
         "../api:libjingle_peerconnection_api",
         "../api/video:video_frame",
         "../api/video:video_frame_i420",
+        "../api/video:video_rtp_headers",
         "../common_video",
         "../media:rtc_media_base",
         "../rtc_base",
@@ -360,6 +361,7 @@
         ":base_objc",
         "//api/video:video_frame",
         "//api/video:video_frame_i420",
+        "//api/video:video_rtp_headers",
         "//common_video",
         "//rtc_base:checks",
         "//rtc_base:rtc_base_approved",
@@ -413,6 +415,7 @@
         ":videosource_objc",
         "../api:libjingle_peerconnection_api",
         "../api/video:video_frame",
+        "../api/video:video_rtp_headers",
         "../common_video",
         "../media:rtc_media_base",
         "../rtc_base",
@@ -491,6 +494,7 @@
           ":video_objc",
           ":videoframebuffer_objc",
           "../api/video:video_frame",
+          "../api/video:video_rtp_headers",
           "../rtc_base:checks",
           "../rtc_base:rtc_base_approved",
         ]
@@ -915,6 +919,7 @@
         "../api/audio_codecs:builtin_audio_encoder_factory",
         "../api/task_queue:default_task_queue_factory",
         "../api/video:video_frame",
+        "../api/video:video_rtp_headers",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
         "../logging:rtc_event_log_impl_base",
@@ -1551,6 +1556,7 @@
         "../api:libjingle_peerconnection_api",
         "../api:scoped_refptr",
         "../api/video:video_frame",
+        "../api/video:video_rtp_headers",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
         "../rtc_base",
@@ -1588,6 +1594,7 @@
         ":wrapped_native_codec_objc",
         "../api/video:video_frame",
         "../api/video:video_frame_i420",
+        "../api/video:video_rtp_headers",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
         "../media:rtc_audio_video",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 69f59d9..187f885 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -698,6 +698,7 @@
       "../../api/video:encoded_image",
       "../../api/video:video_frame",
       "../../api/video:video_frame_type",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:rtc_software_fallback_wrappers",
       "../../api/video_codecs:video_codecs_api",
       "../../common_video",
@@ -1007,6 +1008,7 @@
       ":videoframe_jni",
       "//api:libjingle_peerconnection_api",
       "//api/video:video_frame",
+      "//api/video:video_rtp_headers",
       "//rtc_base",
       "//rtc_base:rtc_base_approved",
       "//third_party/abseil-cpp/absl/memory",
@@ -1104,6 +1106,7 @@
       ":native_api_jni",
       "../../api:scoped_refptr",
       "../../api/video:video_frame",
+      "../../api/video:video_rtp_headers",
       "../../common_video",
       "../../rtc_base",
       "../../rtc_base:checks",
@@ -1553,6 +1556,7 @@
       "../../api:scoped_refptr",
       "../../api/task_queue:default_task_queue_factory",
       "../../api/video:video_frame",
+      "../../api/video:video_rtp_headers",
       "../../logging:rtc_event_log_impl_base",
       "../../media:rtc_audio_video",
       "../../media:rtc_internal_video_codecs",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index d4706b8..6c6e1d3 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -58,6 +58,7 @@
     "../api/video:video_frame",
     "../api/video:video_frame_i010",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../call:video_stream_api",
     "../common_video",
@@ -300,6 +301,7 @@
       "../api:scoped_refptr",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../common_video",
       "../rtc_base:checks",
       "../rtc_base:rtc_base_approved",
@@ -376,6 +378,7 @@
       "../api/video:builtin_video_bitrate_allocator_factory",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
+      "../api/video:video_rtp_headers",
       "../call:video_stream_api",
       "../modules/rtp_rtcp",
       "../modules/video_coding:simulcast_test_fixture_impl",
@@ -636,6 +639,7 @@
     "../api/video:video_bitrate_allocation",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../api/video_codecs:vp8_temporal_layers_factory",
     "../common_video",
@@ -733,6 +737,7 @@
     "../api/video:builtin_video_bitrate_allocator_factory",
     "../api/video:video_bitrate_allocator_factory",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video_codecs:video_codecs_api",
     "../audio",
     "../call",
@@ -823,6 +828,7 @@
     ":test_support",
     "../api:scoped_refptr",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../common_video",
     "../media:rtc_media_base",
     "../rtc_base:checks",
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index b0d72a9..6706e8f 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -131,6 +131,7 @@
     "../../../api/video:encoded_image",
     "../../../api/video:video_frame",
     "../../../api/video:video_frame_i420",
+    "../../../api/video:video_rtp_headers",
     "../../../api/video_codecs:video_codecs_api",
     "../../../modules/video_coding:video_codec_interface",
     "../../../rtc_base:criticalsection",
@@ -153,6 +154,7 @@
     "../../../api:video_quality_analyzer_api",
     "../../../api/video:encoded_image",
     "../../../api/video:video_frame",
+    "../../../api/video:video_rtp_headers",
     "../../../api/video_codecs:video_codecs_api",
     "../../../modules/video_coding:video_codec_interface",
     "../../../rtc_base:criticalsection",
@@ -177,6 +179,7 @@
       "../../../api:stats_observer_interface",
       "../../../api:video_quality_analyzer_api",
       "../../../api/video:video_frame",
+      "../../../api/video:video_rtp_headers",
       "../../../api/video_codecs:video_codecs_api",
       "../../../test:video_test_common",
       "../../../test:video_test_support",
@@ -411,6 +414,7 @@
     "../../../api:video_quality_analyzer_api",
     "../../../api/video:encoded_image",
     "../../../api/video:video_frame",
+    "../../../api/video:video_rtp_headers",
     "../../../rtc_base:criticalsection",
     "../../../rtc_base:logging",
   ]
@@ -432,6 +436,7 @@
     "../../../api/units:timestamp",
     "../../../api/video:encoded_image",
     "../../../api/video:video_frame",
+    "../../../api/video:video_rtp_headers",
     "../../../common_video",
     "../../../rtc_base:criticalsection",
     "../../../rtc_base:logging",
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index f136245..be559db 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -98,6 +98,7 @@
       "../../api/video:builtin_video_bitrate_allocator_factory",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
+      "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../audio",
       "../../call",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 29e1e45..0ae719a 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -63,6 +63,7 @@
     "../api/video:video_bitrate_allocator",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video:video_stream_encoder",
     "../api/video:video_stream_encoder_create",
     "../api/video_codecs:video_codecs_api",
@@ -133,6 +134,7 @@
     "../api/task_queue",
     "../api/video:encoded_frame",
     "../api/video:video_frame",
+    "../api/video:video_rtp_headers",
     "../api/video:video_stream_decoder",
     "../api/video_codecs:video_codecs_api",
     "../modules/video_coding",
@@ -189,6 +191,7 @@
     "../api/video:video_bitrate_allocator_factory",
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
+    "../api/video:video_rtp_headers",
     "../api/video:video_stream_encoder",
     "../api/video_codecs:video_codecs_api",
     "../common_video",
@@ -258,6 +261,7 @@
       "../api/video:builtin_video_bitrate_allocator_factory",
       "../api/video:video_bitrate_allocator_factory",
       "../api/video:video_frame",
+      "../api/video:video_rtp_headers",
       "../call:fake_network",
       "../call:simulated_network",
       "../common_video",
@@ -558,6 +562,7 @@
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
       "../api/video:video_frame_type",
+      "../api/video:video_rtp_headers",
       "../api/video_codecs:video_codecs_api",
       "../api/video_codecs:vp8_temporal_layers_factory",
       "../call:call_interfaces",