diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index b911e6b608..69908949da 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -98,6 +98,7 @@ rtc_library("video_codecs_api") {
     "../video:video_bitrate_allocation",
     "../video:video_codec_constants",
     "../video:video_frame",
+    "../video:video_frame_type",
     "../video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/algorithm:container",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
@@ -159,11 +160,13 @@ rtc_source_set("video_encoder_factory_template") {
   public = [ "video_encoder_factory_template.h" ]
 
   deps = [
+    ":scalability_mode",
     ":video_codecs_api",
     "..:array_view",
     "../../modules/video_coding/svc:scalability_mode_util",
     "../environment",
     "//third_party/abseil-cpp/absl/algorithm:container",
+    "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
 
@@ -173,6 +176,7 @@ rtc_source_set("video_encoder_factory_template_libvpx_vp8_adapter") {
   public = [ "video_encoder_factory_template_libvpx_vp8_adapter.h" ]
 
   deps = [
+    ":scalability_mode",
     ":video_codecs_api",
     "../../modules/video_coding:webrtc_vp8",
     "../../modules/video_coding:webrtc_vp8_scalability",
@@ -187,6 +191,7 @@ rtc_source_set("video_encoder_factory_template_libvpx_vp9_adapter") {
   public = [ "video_encoder_factory_template_libvpx_vp9_adapter.h" ]
 
   deps = [
+    ":scalability_mode",
     ":video_codecs_api",
     "../../modules/video_coding:webrtc_vp9",
     "../environment",
@@ -199,6 +204,8 @@ rtc_source_set("video_encoder_factory_template_open_h264_adapter") {
   public = [ "video_encoder_factory_template_open_h264_adapter.h" ]
 
   deps = [
+    ":scalability_mode",
+    ":video_codecs_api",
     "../../modules/video_coding:webrtc_h264",
     "../environment",
   ]
@@ -250,7 +257,10 @@ rtc_source_set("video_decoder_factory_template_libvpx_vp9_adapter") {
   allow_poison = [ "software_video_codecs" ]
   public = [ "video_decoder_factory_template_libvpx_vp9_adapter.h" ]
 
-  deps = [ "../../modules/video_coding:webrtc_vp9" ]
+  deps = [
+    ":video_codecs_api",
+    "../../modules/video_coding:webrtc_vp9",
+  ]
 }
 
 rtc_source_set("video_decoder_factory_template_open_h264_adapter") {
@@ -258,7 +268,10 @@ rtc_source_set("video_decoder_factory_template_open_h264_adapter") {
   allow_poison = [ "software_video_codecs" ]
   public = [ "video_decoder_factory_template_open_h264_adapter.h" ]
 
-  deps = [ "../../modules/video_coding:webrtc_h264" ]
+  deps = [
+    ":video_codecs_api",
+    "../../modules/video_coding:webrtc_h264",
+  ]
 }
 
 rtc_source_set("video_decoder_factory_template_dav1d_adapter") {
@@ -281,6 +294,8 @@ rtc_source_set("video_encoder_interface") {
 
   deps = [
     ":video_encoding_general",
+    "..:array_view",
+    "..:scoped_refptr",
     "../../api/units:data_rate",
     "../../api/units:data_size",
     "../../api/units:time_delta",
@@ -305,6 +320,7 @@ rtc_source_set("video_encoder_factory_interface") {
     "../../api/units:time_delta",
     "../../api/video:resolution",
     "../../rtc_base:rtc_numerics",
+    "../video:video_frame",
     "//third_party/abseil-cpp/absl/types:optional",
     "//third_party/abseil-cpp/absl/types:variant",
   ]
@@ -319,14 +335,26 @@ rtc_library("simple_encoder_wrapper") {
   deps = [
     ":video_encoder_factory_interface",
     ":video_encoder_interface",
+    "..:array_view",
+    "..:scoped_refptr",
     "../../api/units:data_rate",
     "../../api/video_codecs:scalability_mode",
     "../../api/video_codecs:scalability_mode_helper",
     "../../common_video/generic_frame_descriptor:generic_frame_descriptor",
     "../../modules/video_coding/svc:scalability_structures",
+    "../../modules/video_coding/svc:scalable_video_controller",
+    "../../rtc_base:checks",
     "../../rtc_base:logging",
+    "../../rtc_base:rtc_numerics",
+    "../transport/rtp:dependency_descriptor",
+    "../units:data_size",
+    "../units:frequency",
+    "../units:timestamp",
+    "../video:video_frame",
     "//third_party/abseil-cpp/absl/algorithm:container",
     "//third_party/abseil-cpp/absl/functional:any_invocable",
+    "//third_party/abseil-cpp/absl/strings:string_view",
+    "//third_party/abseil-cpp/absl/types:optional",
     "//third_party/abseil-cpp/absl/types:variant",
   ]
 }
@@ -340,11 +368,13 @@ rtc_library("simple_encoder_wrapper_unittests") {
     ":simple_encoder_wrapper",
     ":video_encoder_factory_interface",
     ":video_encoder_interface",
+    ":video_encoding_general",
     "../../api/video:video_frame",
     "../../api/video_codecs:libaom_av1_encoder_factory",
     "../../test:fileutils",
     "../../test:test_support",
     "../../test:video_test_support",
+    "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
 
@@ -355,13 +385,25 @@ rtc_library("libaom_av1_encoder_factory") {
   ]
 
   deps = [
+    ":video_codecs_api",
     ":video_encoder_factory_interface",
     ":video_encoder_interface",
+    ":video_encoding_general",
+    "..:array_view",
+    "..:scoped_refptr",
     "../../api/units:time_delta",
+    "../../rtc_base:checks",
     "../../rtc_base:logging",
+    "../../rtc_base:rtc_numerics",
     "../../rtc_base:stringutils",
+    "../units:data_rate",
+    "../units:data_size",
+    "../video:resolution",
+    "../video:video_frame",
     "//third_party/abseil-cpp/absl/algorithm:container",
     "//third_party/abseil-cpp/absl/cleanup",
+    "//third_party/abseil-cpp/absl/types:optional",
+    "//third_party/abseil-cpp/absl/types:variant",
     "//third_party/libaom",
   ]
 }
@@ -373,16 +415,27 @@ rtc_library("libaom_av1_encoder_factory_test") {
 
   deps = [
     ":libaom_av1_encoder_factory",
+    ":video_encoder_factory_interface",
     ":video_encoder_interface",
+    ":video_encoding_general",
+    "..:array_view",
+    "..:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video:common_video",
     "../../modules/video_coding/codecs/av1:dav1d_decoder",
+    "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../test:fileutils",
     "../../test:test_support",
     "../../test:video_frame_writer",
     "../../test:video_test_support",
+    "../units:data_rate",
+    "../units:data_size",
+    "../units:time_delta",
+    "../units:timestamp",
+    "../video:encoded_image",
+    "//third_party/abseil-cpp/absl/types:optional",
     "//third_party/abseil-cpp/absl/types:variant",
   ]
 }
@@ -417,6 +470,7 @@ rtc_library("rtc_software_fallback_wrappers") {
   deps = [
     ":video_codecs_api",
     "..:fec_controller_api",
+    "..:scoped_refptr",
     "../../api:field_trials_view",
     "../../api/environment",
     "../../api/video:video_frame",
@@ -432,6 +486,7 @@ rtc_library("rtc_software_fallback_wrappers") {
     "../video:encoded_image",
     "../video:video_bitrate_allocation",
     "../video:video_frame",
+    "../video:video_frame_type",
     "../video:video_rtp_headers",
     "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
diff --git a/api/video_codecs/av1_profile.cc b/api/video_codecs/av1_profile.cc
index 1a953a0c53..5181fe1303 100644
--- a/api/video_codecs/av1_profile.cc
+++ b/api/video_codecs/av1_profile.cc
@@ -11,8 +11,12 @@
 #include "api/video_codecs/av1_profile.h"
 
 #include <map>
+#include <string>
 #include <utility>
 
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "api/rtp_parameters.h"
 #include "media/base/media_constants.h"
 #include "rtc_base/string_to_number.h"
 
diff --git a/api/video_codecs/av1_profile.h b/api/video_codecs/av1_profile.h
index 4651d93ef4..fde4633a52 100644
--- a/api/video_codecs/av1_profile.h
+++ b/api/video_codecs/av1_profile.h
@@ -11,11 +11,10 @@
 #ifndef API_VIDEO_CODECS_AV1_PROFILE_H_
 #define API_VIDEO_CODECS_AV1_PROFILE_H_
 
-#include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "api/video_codecs/sdp_video_format.h"
+#include "api/rtp_parameters.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/builtin_video_decoder_factory.cc b/api/video_codecs/builtin_video_decoder_factory.cc
index f831905189..0067c4a8d6 100644
--- a/api/video_codecs/builtin_video_decoder_factory.cc
+++ b/api/video_codecs/builtin_video_decoder_factory.cc
@@ -12,6 +12,7 @@
 
 #include <memory>
 
+#include "api/video_codecs/video_decoder_factory.h"
 #include "media/engine/internal_decoder_factory.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/h264_profile_level_id.cc b/api/video_codecs/h264_profile_level_id.cc
index 9bd9c9e4ab..09f7fa525e 100644
--- a/api/video_codecs/h264_profile_level_id.cc
+++ b/api/video_codecs/h264_profile_level_id.cc
@@ -10,12 +10,15 @@
 
 #include "api/video_codecs/h264_profile_level_id.h"
 
+#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <string>
 
+#include "absl/types/optional.h"
+#include "api/rtp_parameters.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/api/video_codecs/h264_profile_level_id.h b/api/video_codecs/h264_profile_level_id.h
index 37709fae64..ca8c1d5ab2 100644
--- a/api/video_codecs/h264_profile_level_id.h
+++ b/api/video_codecs/h264_profile_level_id.h
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "absl/types/optional.h"
-#include "api/video_codecs/sdp_video_format.h"
+#include "api/rtp_parameters.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/h265_profile_tier_level.cc b/api/video_codecs/h265_profile_tier_level.cc
index 9705f46431..3a25843d49 100644
--- a/api/video_codecs/h265_profile_tier_level.cc
+++ b/api/video_codecs/h265_profile_tier_level.cc
@@ -12,6 +12,9 @@
 
 #include <string>
 
+#include "absl/types/optional.h"
+#include "api/rtp_parameters.h"
+#include "api/video/resolution.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/string_to_number.h"
 
diff --git a/api/video_codecs/h265_profile_tier_level.h b/api/video_codecs/h265_profile_tier_level.h
index 28a35ae093..91e64b74d0 100644
--- a/api/video_codecs/h265_profile_tier_level.h
+++ b/api/video_codecs/h265_profile_tier_level.h
@@ -14,8 +14,8 @@
 #include <string>
 
 #include "absl/types/optional.h"
+#include "api/rtp_parameters.h"
 #include "api/video/resolution.h"
-#include "api/video_codecs/sdp_video_format.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/libaom_av1_encoder_factory.cc b/api/video_codecs/libaom_av1_encoder_factory.cc
index c2d933f890..16555c58fc 100644
--- a/api/video_codecs/libaom_av1_encoder_factory.cc
+++ b/api/video_codecs/libaom_av1_encoder_factory.cc
@@ -10,20 +10,38 @@
 
 #include "api/video_codecs/libaom_av1_encoder_factory.h"
 
-#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include <map>
 #include <memory>
 #include <string>
-#include <utility>
+#include <type_traits>
 #include <vector>
 
 #include "absl/algorithm/container.h"
 #include "absl/cleanup/cleanup.h"
+#include "absl/types/optional.h"
+#include "absl/types/variant.h"
+#include "api/array_view.h"
+#include "api/scoped_refptr.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/video/resolution.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder_factory_interface.h"
 #include "api/video_codecs/video_encoder_interface.h"
+#include "api/video_codecs/video_encoding_general.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/numerics/rational.h"
 #include "rtc_base/strings/string_builder.h"
 #include "third_party/libaom/source/libaom/aom/aom_codec.h"
 #include "third_party/libaom/source/libaom/aom/aom_encoder.h"
+#include "third_party/libaom/source/libaom/aom/aom_image.h"
 #include "third_party/libaom/source/libaom/aom/aomcx.h"
 
 #define SET_OR_RETURN(param_id, param_value)                          \
diff --git a/api/video_codecs/libaom_av1_encoder_factory.h b/api/video_codecs/libaom_av1_encoder_factory.h
index df2abb2a3b..487ed7b89b 100644
--- a/api/video_codecs/libaom_av1_encoder_factory.h
+++ b/api/video_codecs/libaom_av1_encoder_factory.h
@@ -14,9 +14,9 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <vector>
 
 #include "api/video_codecs/video_encoder_factory_interface.h"
+#include "api/video_codecs/video_encoder_interface.h"
 
 namespace webrtc {
 class LibaomAv1EncoderFactory final : VideoEncoderFactoryInterface {
diff --git a/api/video_codecs/libaom_av1_encoder_factory_test.cc b/api/video_codecs/libaom_av1_encoder_factory_test.cc
index 38630b2f4c..ba4623c9c6 100644
--- a/api/video_codecs/libaom_av1_encoder_factory_test.cc
+++ b/api/video_codecs/libaom_av1_encoder_factory_test.cc
@@ -10,22 +10,38 @@
 
 #include "api/video_codecs/libaom_av1_encoder_factory.h"
 
+#include <cstdint>
 #include <cstdio>
+#include <memory>
+#include <ostream>
+#include <string>
 #include <utility>
 #include <vector>
 
+#include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "api/array_view.h"
+#include "api/scoped_refptr.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "api/video/encoded_image.h"
 #include "api/video/i420_buffer.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
 #include "api/video_codecs/video_decoder.h"
+#include "api/video_codecs/video_encoder_factory_interface.h"
 #include "api/video_codecs/video_encoder_interface.h"
+#include "api/video_codecs/video_encoding_general.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "modules/video_coding/codecs/av1/dav1d_decoder.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"
 #include "test/testsupport/frame_reader.h"
-#include "test/testsupport/frame_writer.h"
 
 namespace webrtc {
 namespace {
diff --git a/api/video_codecs/scalability_mode.cc b/api/video_codecs/scalability_mode.cc
index c449b4217e..b738c9acff 100644
--- a/api/video_codecs/scalability_mode.cc
+++ b/api/video_codecs/scalability_mode.cc
@@ -10,6 +10,7 @@
 
 #include "api/video_codecs/scalability_mode.h"
 
+#include "absl/strings/string_view.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/scalability_mode_helper.cc b/api/video_codecs/scalability_mode_helper.cc
index 09ede9c87d..238bc229cb 100644
--- a/api/video_codecs/scalability_mode_helper.cc
+++ b/api/video_codecs/scalability_mode_helper.cc
@@ -10,6 +10,9 @@
 
 #include "api/video_codecs/scalability_mode_helper.h"
 
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "api/video_codecs/scalability_mode.h"
 #include "modules/video_coding/svc/scalability_mode_util.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/sdp_video_format.cc b/api/video_codecs/sdp_video_format.cc
index fc26ac9dab..c0838bdde5 100644
--- a/api/video_codecs/sdp_video_format.cc
+++ b/api/video_codecs/sdp_video_format.cc
@@ -10,11 +10,17 @@
 
 #include "api/video_codecs/sdp_video_format.h"
 
+#include <string>
+
+#include "absl/container/inlined_vector.h"
 #include "absl/strings/match.h"
 #include "absl/types/optional.h"
 #include "api/array_view.h"
+#include "api/rtp_parameters.h"
+#include "api/video/video_codec_type.h"
 #include "api/video_codecs/av1_profile.h"
 #include "api/video_codecs/h264_profile_level_id.h"
+#include "api/video_codecs/scalability_mode.h"
 #ifdef RTC_ENABLE_H265
 #include "api/video_codecs/h265_profile_tier_level.h"
 #endif
diff --git a/api/video_codecs/simple_encoder_wrapper.cc b/api/video_codecs/simple_encoder_wrapper.cc
index 96ce98a129..06ca5afd77 100644
--- a/api/video_codecs/simple_encoder_wrapper.cc
+++ b/api/video_codecs/simple_encoder_wrapper.cc
@@ -11,18 +11,31 @@
 #include "api/video_codecs/simple_encoder_wrapper.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "absl/algorithm/container.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "api/array_view.h"
+#include "api/scoped_refptr.h"
+#include "api/units/data_size.h"
+#include "api/units/frequency.h"
+#include "api/video/video_frame_buffer.h"
 #include "api/video_codecs/scalability_mode.h"
 #include "api/video_codecs/scalability_mode_helper.h"
 #include "api/video_codecs/video_encoder_factory_interface.h"
 #include "api/video_codecs/video_encoder_interface.h"
+#include "common_video/generic_frame_descriptor/generic_frame_info.h"
 #include "modules/video_coding/svc/create_scalability_structure.h"
+#include "modules/video_coding/svc/scalable_video_controller.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/rational.h"
 
 namespace webrtc {
 using PredictionConstraints =
diff --git a/api/video_codecs/simple_encoder_wrapper.h b/api/video_codecs/simple_encoder_wrapper.h
index c823c9370d..fd7ca7f11d 100644
--- a/api/video_codecs/simple_encoder_wrapper.h
+++ b/api/video_codecs/simple_encoder_wrapper.h
@@ -11,16 +11,22 @@
 #ifndef API_VIDEO_CODECS_SIMPLE_ENCODER_WRAPPER_H_
 #define API_VIDEO_CODECS_SIMPLE_ENCODER_WRAPPER_H_
 
+#include <cstdint>
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "absl/functional/any_invocable.h"
-#include "api/units/data_rate.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "api/scoped_refptr.h"
+#include "api/transport/rtp/dependency_descriptor.h"
+#include "api/units/timestamp.h"
+#include "api/video/video_frame_buffer.h"
 #include "api/video_codecs/video_encoder_factory_interface.h"
 #include "api/video_codecs/video_encoder_interface.h"
 #include "common_video/generic_frame_descriptor/generic_frame_info.h"
-#include "modules/video_coding/svc/create_scalability_structure.h"
+#include "modules/video_coding/svc/scalable_video_controller.h"
 
 namespace webrtc {
 class SimpleEncoderWrapper {
diff --git a/api/video_codecs/simple_encoder_wrapper_unittests.cc b/api/video_codecs/simple_encoder_wrapper_unittests.cc
index 184a7e8e7a..14a48f76e3 100644
--- a/api/video_codecs/simple_encoder_wrapper_unittests.cc
+++ b/api/video_codecs/simple_encoder_wrapper_unittests.cc
@@ -8,11 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/video_codecs/simple_encoder_wrapper.h"
+#include <memory>
+#include <utility>
 
-#include "api/video/i420_buffer.h"
+#include "absl/types/optional.h"
+#include "api/video/i420_buffer.h"  // IWYU pragma: keep
 #include "api/video_codecs/libaom_av1_encoder_factory.h"
-#include "api/video_codecs/video_encoder_interface.h"
+#include "api/video_codecs/simple_encoder_wrapper.h"
+#include "api/video_codecs/video_encoder_factory_interface.h"
+#include "api/video_codecs/video_encoding_general.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 #include "test/testsupport/file_utils.h"
diff --git a/api/video_codecs/simulcast_stream.cc b/api/video_codecs/simulcast_stream.cc
index 4139a38e16..9ecf746f60 100644
--- a/api/video_codecs/simulcast_stream.cc
+++ b/api/video_codecs/simulcast_stream.cc
@@ -11,6 +11,7 @@
 #include "api/video_codecs/simulcast_stream.h"
 
 #include "absl/types/optional.h"
+#include "api/video_codecs/scalability_mode.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/simulcast_stream.h b/api/video_codecs/simulcast_stream.h
index 7d94ae37a7..50ec21e544 100644
--- a/api/video_codecs/simulcast_stream.h
+++ b/api/video_codecs/simulcast_stream.h
@@ -13,6 +13,7 @@
 
 #include "absl/types/optional.h"
 #include "api/video_codecs/scalability_mode.h"
+#include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
 
diff --git a/api/video_codecs/test/BUILD.gn b/api/video_codecs/test/BUILD.gn
index 0bc86f54ce..2e5036d010 100644
--- a/api/video_codecs/test/BUILD.gn
+++ b/api/video_codecs/test/BUILD.gn
@@ -31,6 +31,7 @@ if (rtc_include_tests) {
       "..:video_codecs_api",
       "../..:fec_controller_api",
       "../..:mock_video_encoder",
+      "../..:rtp_parameters",
       "../../../api:scoped_refptr",
       "../../../media:media_constants",
       "../../../modules/video_coding:video_codec_interface",
@@ -45,9 +46,13 @@ if (rtc_include_tests) {
       "../../../test:video_test_common",
       "../../environment",
       "../../environment:environment_factory",
+      "../../units:timestamp",
       "../../video:encoded_image",
+      "../../video:resolution",
       "../../video:video_bitrate_allocation",
+      "../../video:video_bitrate_allocator",
       "../../video:video_frame",
+      "../../video:video_frame_type",
       "../../video:video_rtp_headers",
       "//testing/gtest",
       "//third_party/abseil-cpp/absl/types:optional",
@@ -59,6 +64,8 @@ if (rtc_include_tests) {
     sources = [ "video_encoder_factory_template_tests.cc" ]
 
     deps = [
+      "..:scalability_mode",
+      "..:video_codecs_api",
       "..:video_encoder_factory_template",
       "..:video_encoder_factory_template_libaom_av1_adapter",
       "..:video_encoder_factory_template_libvpx_vp8_adapter",
@@ -77,6 +84,7 @@ if (rtc_include_tests) {
     sources = [ "video_decoder_factory_template_tests.cc" ]
 
     deps = [
+      "..:video_codecs_api",
       "..:video_decoder_factory_template",
       "..:video_decoder_factory_template_dav1d_adapter",
       "..:video_decoder_factory_template_libvpx_vp8_adapter",
diff --git a/api/video_codecs/test/builtin_video_encoder_factory_unittest.cc b/api/video_codecs/test/builtin_video_encoder_factory_unittest.cc
index 84fd594b4c..d2ccccfefa 100644
--- a/api/video_codecs/test/builtin_video_encoder_factory_unittest.cc
+++ b/api/video_codecs/test/builtin_video_encoder_factory_unittest.cc
@@ -12,9 +12,9 @@
 
 #include <memory>
 #include <string>
-#include <vector>
 
 #include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_encoder_factory.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/test/h264_profile_level_id_unittest.cc b/api/video_codecs/test/h264_profile_level_id_unittest.cc
index 404d3e2cb3..374c3d5ba6 100644
--- a/api/video_codecs/test/h264_profile_level_id_unittest.cc
+++ b/api/video_codecs/test/h264_profile_level_id_unittest.cc
@@ -11,9 +11,9 @@
 #include "api/video_codecs/h264_profile_level_id.h"
 
 #include <map>
-#include <string>
 
 #include "absl/types/optional.h"
+#include "api/rtp_parameters.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/test/h265_profile_tier_level_unittest.cc b/api/video_codecs/test/h265_profile_tier_level_unittest.cc
index aacfee9d55..8fcabe876a 100644
--- a/api/video_codecs/test/h265_profile_tier_level_unittest.cc
+++ b/api/video_codecs/test/h265_profile_tier_level_unittest.cc
@@ -13,6 +13,8 @@
 #include <string>
 
 #include "absl/types/optional.h"
+#include "api/rtp_parameters.h"
+#include "api/video/resolution.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/test/sdp_video_format_unittest.cc b/api/video_codecs/test/sdp_video_format_unittest.cc
index 26e50d6945..bf6e95a40e 100644
--- a/api/video_codecs/test/sdp_video_format_unittest.cc
+++ b/api/video_codecs/test/sdp_video_format_unittest.cc
@@ -10,8 +10,7 @@
 
 #include "api/video_codecs/sdp_video_format.h"
 
-#include <stdint.h>
-
+#include "api/rtp_parameters.h"
 #include "media/base/media_constants.h"
 #include "test/gtest.h"
 
diff --git a/api/video_codecs/test/video_decoder_factory_template_tests.cc b/api/video_codecs/test/video_decoder_factory_template_tests.cc
index f0b62752e4..d2a631f019 100644
--- a/api/video_codecs/test/video_decoder_factory_template_tests.cc
+++ b/api/video_codecs/test/video_decoder_factory_template_tests.cc
@@ -8,9 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <memory>
+#include <vector>
+
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
 #include "api/test/mock_video_decoder.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_decoder_factory_template.h"
 #include "api/video_codecs/video_decoder_factory_template_dav1d_adapter.h"
 #include "api/video_codecs/video_decoder_factory_template_libvpx_vp8_adapter.h"
diff --git a/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc
index bd837605b0..331f633312 100644
--- a/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc
@@ -12,14 +12,17 @@
 
 #include <stdint.h>
 
+#include <memory>
+#include <string>
+
 #include "absl/types/optional.h"
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
 #include "api/video/encoded_image.h"
 #include "api/video/video_frame.h"
+#include "api/video/video_frame_type.h"
 #include "api/video_codecs/video_decoder.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
-#include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/checks.h"
 #include "test/explicit_key_value_config.h"
diff --git a/api/video_codecs/test/video_encoder_factory_template_tests.cc b/api/video_codecs/test/video_encoder_factory_template_tests.cc
index 569cb5c6bb..8b1bf62fec 100644
--- a/api/video_codecs/test/video_encoder_factory_template_tests.cc
+++ b/api/video_codecs/test/video_encoder_factory_template_tests.cc
@@ -8,9 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <memory>
+#include <vector>
+
+#include "absl/types/optional.h"
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
 #include "api/test/mock_video_encoder.h"
+#include "api/video_codecs/scalability_mode.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_encoder.h"
+#include "api/video_codecs/video_encoder_factory.h"
 #include "api/video_codecs/video_encoder_factory_template.h"
 #include "api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h"
 #include "api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h"
diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
index dbe72c2ead..a63e8ba1bd 100644
--- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
@@ -15,6 +15,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/types/optional.h"
@@ -23,11 +24,14 @@
 #include "api/fec_controller_override.h"
 #include "api/scoped_refptr.h"
 #include "api/test/mock_video_encoder.h"
+#include "api/units/timestamp.h"
 #include "api/video/encoded_image.h"
 #include "api/video/i420_buffer.h"
-#include "api/video/video_bitrate_allocation.h"
+#include "api/video/video_bitrate_allocator.h"
+#include "api/video/video_codec_type.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_frame_buffer.h"
+#include "api/video/video_frame_type.h"
 #include "api/video/video_rotation.h"
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_encoder.h"
diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc
index ff6f67f15a..0cd6b3790f 100644
--- a/api/video_codecs/video_codec.cc
+++ b/api/video_codecs/video_codec.cc
@@ -15,6 +15,10 @@
 #include <string>
 
 #include "absl/strings/match.h"
+#include "absl/types/optional.h"
+#include "api/video/video_codec_type.h"
+#include "api/video_codecs/scalability_mode.h"
+#include "api/video_codecs/simulcast_stream.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/api/video_codecs/video_codec.h b/api/video_codecs/video_codec.h
index e48ffd4b5f..8872eaeb22 100644
--- a/api/video_codecs/video_codec.h
+++ b/api/video_codecs/video_codec.h
@@ -16,8 +16,8 @@
 
 #include <string>
 
-#include "absl/strings/string_view.h"
-#include "api/video/video_bitrate_allocation.h"
+#include "absl/types/optional.h"
+#include "api/video/video_codec_constants.h"
 #include "api/video/video_codec_type.h"
 #include "api/video_codecs/scalability_mode.h"
 #include "api/video_codecs/simulcast_stream.h"
diff --git a/api/video_codecs/video_decoder.cc b/api/video_codecs/video_decoder.cc
index c8f40cee7f..b6a749328d 100644
--- a/api/video_codecs/video_decoder.cc
+++ b/api/video_codecs/video_decoder.cc
@@ -10,9 +10,11 @@
 
 #include "api/video_codecs/video_decoder.h"
 
+#include <cstdint>
+#include <string>
+
 #include "absl/types/optional.h"
-#include "api/video/render_resolution.h"
-#include "api/video/video_codec_type.h"
+#include "api/video/video_frame.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/api/video_codecs/video_decoder.h b/api/video_codecs/video_decoder.h
index 40614ce3d7..a951f7f381 100644
--- a/api/video_codecs/video_decoder.h
+++ b/api/video_codecs/video_decoder.h
@@ -11,9 +11,8 @@
 #ifndef API_VIDEO_CODECS_VIDEO_DECODER_H_
 #define API_VIDEO_CODECS_VIDEO_DECODER_H_
 
-#include <memory>
+#include <cstdint>
 #include <string>
-#include <vector>
 
 #include "absl/types/optional.h"
 #include "api/video/encoded_image.h"
diff --git a/api/video_codecs/video_decoder_factory_template.h b/api/video_codecs/video_decoder_factory_template.h
index e859615951..7e9b61f543 100644
--- a/api/video_codecs/video_decoder_factory_template.h
+++ b/api/video_codecs/video_decoder_factory_template.h
@@ -18,6 +18,7 @@
 #include "absl/algorithm/container.h"
 #include "api/array_view.h"
 #include "api/environment/environment.h"
+#include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_decoder_factory.h"
 
diff --git a/api/video_codecs/video_decoder_factory_template_dav1d_adapter.h b/api/video_codecs/video_decoder_factory_template_dav1d_adapter.h
index 7bc0bbb8fc..cf2fc85e45 100644
--- a/api/video_codecs/video_decoder_factory_template_dav1d_adapter.h
+++ b/api/video_codecs/video_decoder_factory_template_dav1d_adapter.h
@@ -14,8 +14,8 @@
 #include <memory>
 #include <vector>
 
-#include "api/video_codecs/av1_profile.h"
 #include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_decoder.h"
 #include "modules/video_coding/codecs/av1/dav1d_decoder.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/video_decoder_factory_template_libvpx_vp8_adapter.h b/api/video_codecs/video_decoder_factory_template_libvpx_vp8_adapter.h
index a86a45813f..303e320c6e 100644
--- a/api/video_codecs/video_decoder_factory_template_libvpx_vp8_adapter.h
+++ b/api/video_codecs/video_decoder_factory_template_libvpx_vp8_adapter.h
@@ -16,6 +16,7 @@
 
 #include "api/environment/environment.h"
 #include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_decoder.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/video_decoder_factory_template_libvpx_vp9_adapter.h b/api/video_codecs/video_decoder_factory_template_libvpx_vp9_adapter.h
index e0ec0010be..0f329a12a4 100644
--- a/api/video_codecs/video_decoder_factory_template_libvpx_vp9_adapter.h
+++ b/api/video_codecs/video_decoder_factory_template_libvpx_vp9_adapter.h
@@ -14,6 +14,8 @@
 #include <memory>
 #include <vector>
 
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_decoder.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/video_decoder_factory_template_open_h264_adapter.h b/api/video_codecs/video_decoder_factory_template_open_h264_adapter.h
index 2746bde132..7f1d4c8c6b 100644
--- a/api/video_codecs/video_decoder_factory_template_open_h264_adapter.h
+++ b/api/video_codecs/video_decoder_factory_template_open_h264_adapter.h
@@ -14,6 +14,8 @@
 #include <memory>
 #include <vector>
 
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_decoder.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/video_decoder_software_fallback_wrapper.cc b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
index 006abdde73..5d5eeaa182 100644
--- a/api/video_codecs/video_decoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_decoder_software_fallback_wrapper.cc
@@ -12,12 +12,16 @@
 
 #include <stdint.h>
 
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <utility>
 
+#include "api/environment/environment.h"
 #include "api/field_trials_view.h"
 #include "api/video/encoded_image.h"
+#include "api/video/video_codec_type.h"
+#include "api/video/video_frame_type.h"
 #include "api/video_codecs/video_decoder.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/checks.h"
diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
index b0fe078b37..11d68213d4 100644
--- a/api/video_codecs/video_encoder.cc
+++ b/api/video_codecs/video_encoder.cc
@@ -13,7 +13,19 @@
 #include <string.h>
 
 #include <algorithm>
+#include <cstdint>
+#include <string>
+#include <tuple>
+#include <vector>
 
+#include "absl/container/inlined_vector.h"
+#include "absl/types/optional.h"
+#include "api/fec_controller_override.h"
+#include "api/units/data_rate.h"
+#include "api/video/video_bitrate_allocation.h"
+#include "api/video/video_codec_constants.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video_codecs/video_codec.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h
index ff84acf592..77564eae5c 100644
--- a/api/video_codecs/video_encoder.h
+++ b/api/video_codecs/video_encoder.h
@@ -11,8 +11,9 @@
 #ifndef API_VIDEO_CODECS_VIDEO_ENCODER_H_
 #define API_VIDEO_CODECS_VIDEO_ENCODER_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <limits>
-#include <memory>
 #include <string>
 #include <vector>
 
@@ -24,8 +25,9 @@
 #include "api/video/video_bitrate_allocation.h"
 #include "api/video/video_codec_constants.h"
 #include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video/video_frame_type.h"
 #include "api/video_codecs/video_codec.h"
-#include "rtc_base/checks.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/video_encoder_factory_interface.h b/api/video_codecs/video_encoder_factory_interface.h
index 67ca42a81b..7bc414cdf7 100644
--- a/api/video_codecs/video_encoder_factory_interface.h
+++ b/api/video_codecs/video_encoder_factory_interface.h
@@ -13,15 +13,14 @@
 
 #include <map>
 #include <memory>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "api/units/time_delta.h"
 #include "api/video/resolution.h"
+#include "api/video/video_frame_buffer.h"
 #include "api/video_codecs/video_encoder_interface.h"
 #include "api/video_codecs/video_encoding_general.h"
 #include "rtc_base/numerics/rational.h"
diff --git a/api/video_codecs/video_encoder_factory_template.h b/api/video_codecs/video_encoder_factory_template.h
index 0772ff9367..599c12a4a7 100644
--- a/api/video_codecs/video_encoder_factory_template.h
+++ b/api/video_codecs/video_encoder_factory_template.h
@@ -13,12 +13,13 @@
 
 #include <memory>
 #include <string>
-#include <type_traits>
 #include <vector>
 
 #include "absl/algorithm/container.h"
+#include "absl/types/optional.h"
 #include "api/array_view.h"
 #include "api/environment/environment.h"
+#include "api/video_codecs/scalability_mode.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/video_encoder_factory.h"
diff --git a/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h b/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h
index 36daacc6d9..454ba353d9 100644
--- a/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h
+++ b/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h
@@ -16,7 +16,9 @@
 
 #include "absl/container/inlined_vector.h"
 #include "api/environment/environment.h"
+#include "api/video_codecs/scalability_mode.h"
 #include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_encoder.h"
 #include "modules/video_coding/codecs/av1/av1_svc_config.h"
 #include "modules/video_coding/codecs/av1/libaom_av1_encoder.h"
 
diff --git a/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h b/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h
index 262b00d42e..fed796fc76 100644
--- a/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h
+++ b/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h
@@ -16,7 +16,9 @@
 
 #include "absl/container/inlined_vector.h"
 #include "api/environment/environment.h"
+#include "api/video_codecs/scalability_mode.h"
 #include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_encoder.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/codecs/vp8/vp8_scalability.h"
 
diff --git a/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h b/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h
index a46e38bf4f..5e3dba0799 100644
--- a/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h
+++ b/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h
@@ -15,6 +15,9 @@
 #include <vector>
 
 #include "api/environment/environment.h"
+#include "api/video_codecs/scalability_mode.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/vp9_profile.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
 
diff --git a/api/video_codecs/video_encoder_factory_template_open_h264_adapter.h b/api/video_codecs/video_encoder_factory_template_open_h264_adapter.h
index 041a6344e8..f72e381e24 100644
--- a/api/video_codecs/video_encoder_factory_template_open_h264_adapter.h
+++ b/api/video_codecs/video_encoder_factory_template_open_h264_adapter.h
@@ -15,6 +15,9 @@
 #include <vector>
 
 #include "api/environment/environment.h"
+#include "api/video_codecs/scalability_mode.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_encoder.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/video_encoder_interface.h b/api/video_codecs/video_encoder_interface.h
index 7cced56801..dc64e18e0a 100644
--- a/api/video_codecs/video_encoder_interface.h
+++ b/api/video_codecs/video_encoder_interface.h
@@ -11,25 +11,21 @@
 #ifndef API_VIDEO_CODECS_VIDEO_ENCODER_INTERFACE_H_
 #define API_VIDEO_CODECS_VIDEO_ENCODER_INTERFACE_H_
 
-#include <map>
+#include <cstdint>
 #include <memory>
-#include <string>
-#include <utility>
 #include <vector>
 
-#include "absl/functional/any_invocable.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "api/array_view.h"
+#include "api/scoped_refptr.h"
 #include "api/units/data_rate.h"
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
-#include "api/video/encoded_image.h"
 #include "api/video/resolution.h"
-#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
 #include "api/video_codecs/video_codec.h"
-#include "api/video_codecs/video_encoding_general.h"
-#include "rtc_base/numerics/rational.h"
 
 namespace webrtc {
 // NOTE: This class is still under development and may change without notice.
diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
index a2c875f39c..2993e16008 100644
--- a/api/video_codecs/video_encoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
@@ -15,6 +15,7 @@
 #include <cstdio>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/match.h"
@@ -22,9 +23,11 @@
 #include "api/environment/environment.h"
 #include "api/fec_controller_override.h"
 #include "api/field_trials_view.h"
-#include "api/video/i420_buffer.h"
-#include "api/video/video_bitrate_allocation.h"
+#include "api/scoped_refptr.h"
+#include "api/video/video_codec_type.h"
 #include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video/video_frame_type.h"
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_encoder.h"
 #include "media/base/video_common.h"
diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.h b/api/video_codecs/video_encoder_software_fallback_wrapper.h
index 8ce462f508..3915111d44 100644
--- a/api/video_codecs/video_encoder_software_fallback_wrapper.h
+++ b/api/video_codecs/video_encoder_software_fallback_wrapper.h
@@ -12,7 +12,6 @@
 #define API_VIDEO_CODECS_VIDEO_ENCODER_SOFTWARE_FALLBACK_WRAPPER_H_
 
 #include <memory>
-#include <utility>
 
 #include "api/environment/environment.h"
 #include "api/video_codecs/video_encoder.h"
diff --git a/api/video_codecs/vp8_frame_buffer_controller.h b/api/video_codecs/vp8_frame_buffer_controller.h
index fc494f7293..f9f0e5f0e9 100644
--- a/api/video_codecs/vp8_frame_buffer_controller.h
+++ b/api/video_codecs/vp8_frame_buffer_controller.h
@@ -12,6 +12,8 @@
 #define API_VIDEO_CODECS_VP8_FRAME_BUFFER_CONTROLLER_H_
 
 #include <array>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/api/video_codecs/vp8_temporal_layers.cc b/api/video_codecs/vp8_temporal_layers.cc
index dd75c616d8..d2787ff48e 100644
--- a/api/video_codecs/vp8_temporal_layers.cc
+++ b/api/video_codecs/vp8_temporal_layers.cc
@@ -10,9 +10,17 @@
 
 #include "api/video_codecs/vp8_temporal_layers.h"
 
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 #include <utility>
+#include <vector>
 
 #include "absl/algorithm/container.h"
+#include "api/fec_controller_override.h"
+#include "api/video_codecs/video_encoder.h"
+#include "api/video_codecs/vp8_frame_buffer_controller.h"
+#include "api/video_codecs/vp8_frame_config.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/vp8_temporal_layers.h b/api/video_codecs/vp8_temporal_layers.h
index 2ffe6eacdf..be6a4d2e70 100644
--- a/api/video_codecs/vp8_temporal_layers.h
+++ b/api/video_codecs/vp8_temporal_layers.h
@@ -11,11 +11,13 @@
 #ifndef API_VIDEO_CODECS_VP8_TEMPORAL_LAYERS_H_
 #define API_VIDEO_CODECS_VP8_TEMPORAL_LAYERS_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
 #include "api/fec_controller_override.h"
-#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/vp8_frame_buffer_controller.h"
 #include "api/video_codecs/vp8_frame_config.h"
 
diff --git a/api/video_codecs/vp8_temporal_layers_factory.cc b/api/video_codecs/vp8_temporal_layers_factory.cc
index 193494d71d..9457611b1f 100644
--- a/api/video_codecs/vp8_temporal_layers_factory.cc
+++ b/api/video_codecs/vp8_temporal_layers_factory.cc
@@ -16,6 +16,10 @@
 #include <vector>
 
 #include "api/fec_controller_override.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder.h"
+#include "api/video_codecs/vp8_frame_buffer_controller.h"
+#include "api/video_codecs/vp8_temporal_layers.h"
 #include "modules/video_coding/codecs/vp8/default_temporal_layers.h"
 #include "modules/video_coding/codecs/vp8/screenshare_layers.h"
 #include "modules/video_coding/utility/simulcast_utility.h"
diff --git a/api/video_codecs/vp8_temporal_layers_factory.h b/api/video_codecs/vp8_temporal_layers_factory.h
index 7a146f1d4f..95717f572d 100644
--- a/api/video_codecs/vp8_temporal_layers_factory.h
+++ b/api/video_codecs/vp8_temporal_layers_factory.h
@@ -13,7 +13,10 @@
 
 #include <memory>
 
-#include "api/video_codecs/vp8_temporal_layers.h"
+#include "api/fec_controller_override.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder.h"
+#include "api/video_codecs/vp8_frame_buffer_controller.h"
 
 namespace webrtc {
 
diff --git a/api/video_codecs/vp9_profile.cc b/api/video_codecs/vp9_profile.cc
index ccd3937296..ba694b02ae 100644
--- a/api/video_codecs/vp9_profile.cc
+++ b/api/video_codecs/vp9_profile.cc
@@ -11,8 +11,11 @@
 #include "api/video_codecs/vp9_profile.h"
 
 #include <map>
+#include <string>
 #include <utility>
 
+#include "absl/types/optional.h"
+#include "api/rtp_parameters.h"
 #include "rtc_base/string_to_number.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/vp9_profile.h b/api/video_codecs/vp9_profile.h
index 27f84cbecc..59b665fec2 100644
--- a/api/video_codecs/vp9_profile.h
+++ b/api/video_codecs/vp9_profile.h
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "absl/types/optional.h"
-#include "api/video_codecs/sdp_video_format.h"
+#include "api/rtp_parameters.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {