diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index d5905f5757..7fd0790075 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -81,11 +81,9 @@ rtc_source_set("encoded_image") {
     "encoded_image.h",
   ]
   deps = [
+    ":video_codec_constants",
     ":video_frame",
     "../..:webrtc_common",
-
-    # TODO(bugs.webrtc.org/8311) Cleanup when kMaxSpatialLayers is moved to proper include.
-    "../../api/video:video_bitrate_allocation",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:rtc_export",
diff --git a/api/video/encoded_image.h b/api/video/encoded_image.h
index 363d34cfec..1c91400c89 100644
--- a/api/video/encoded_image.h
+++ b/api/video/encoded_image.h
@@ -16,7 +16,7 @@
 
 #include "absl/types/optional.h"
 #include "api/video/color_space.h"
-#include "api/video/video_bitrate_allocation.h"
+#include "api/video/video_codec_constants.h"
 #include "api/video/video_codec_type.h"
 #include "api/video/video_content_type.h"
 #include "api/video/video_rotation.h"