diff --git a/media/BUILD.gn b/media/BUILD.gn
index fe98a63511..b7ea5af833 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -223,6 +223,7 @@ rtc_static_library("rtc_audio_video") {
   defines = []
   libs = []
   deps = [
+    "../modules/video_coding:video_codec_interface",
     "../modules/video_coding:video_coding",
     "../rtc_base:checks",
   ]
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 4b955506e3..5b59df7dac 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -37,11 +37,6 @@ rtc_static_library("video_coding") {
     "histogram.cc",
     "histogram.h",
     "include/video_codec_initializer.h",
-
-    # TODO(bugs.webrtc.org/7620: remove these when downstream is updated).
-    "include/video_codec_interface.h",
-    "include/video_coding.h",
-    "include/video_error_codes.h",
     "inter_frame_delay.cc",
     "inter_frame_delay.h",
     "internal_defines.h",