diff --git a/starboard/shared/starboard/media/BUILD.gn b/starboard/shared/starboard/media/BUILD.gn
index 20cb3bf8ddee..480d46052e1f 100644
--- a/starboard/shared/starboard/media/BUILD.gn
+++ b/starboard/shared/starboard/media/BUILD.gn
@@ -21,6 +21,7 @@ static_library("media_util") {
     "//starboard/shared/starboard/media/codec_util.h",
     "//starboard/shared/starboard/media/key_system_supportability_cache.cc",
     "//starboard/shared/starboard/media/key_system_supportability_cache.h",
+    "//starboard/shared/starboard/media/media_support_internal.h",
     "//starboard/shared/starboard/media/media_util.cc",
     "//starboard/shared/starboard/media/media_util.h",
     "//starboard/shared/starboard/media/mime_supportability_cache.cc",
diff --git a/starboard/stub/BUILD.gn b/starboard/stub/BUILD.gn
index 181951e2346b..9001c81a3acb 100644
--- a/starboard/stub/BUILD.gn
+++ b/starboard/stub/BUILD.gn
@@ -108,11 +108,8 @@ static_library("stub_sources") {
     "//starboard/shared/stub/media_get_max_buffer_capacity.cc",
     "//starboard/shared/stub/media_get_progressive_buffer_budget.cc",
     "//starboard/shared/stub/media_get_video_buffer_budget.cc",
-    "//starboard/shared/stub/media_is_audio_supported.cc",
     "//starboard/shared/stub/media_is_buffer_pool_allocate_on_demand.cc",
     "//starboard/shared/stub/media_is_buffer_using_memory_pool.cc",
-    "//starboard/shared/stub/media_is_supported.cc",
-    "//starboard/shared/stub/media_is_video_supported.cc",
     "//starboard/shared/stub/memory_allocate_aligned_unchecked.cc",
     "//starboard/shared/stub/memory_allocate_unchecked.cc",
     "//starboard/shared/stub/memory_flush.cc",