diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
index 38aebcd199..60802ebcbe 100644
--- a/webrtc/modules/BUILD.gn
+++ b/webrtc/modules/BUILD.gn
@@ -237,9 +237,7 @@ if (rtc_include_tests) {
     testonly = true
 
     defines = audio_coding_defines
-    deps = [
-      "audio_coding:legacy_encoded_audio_frame",
-    ]
+    deps = []
     sources = [
       "audio_coding/acm2/acm_receiver_unittest_oldapi.cc",
       "audio_coding/acm2/audio_coding_module_unittest_oldapi.cc",
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 09202af3e6..967d9b2fd6 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -128,9 +128,10 @@ rtc_source_set("audio_decoder_interface") {
   sources = [
     "codecs/audio_decoder.cc",
     "codecs/audio_decoder.h",
+    "codecs/legacy_encoded_audio_frame.cc",
+    "codecs/legacy_encoded_audio_frame.h",
   ]
   deps = [
-    ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
   ]
@@ -188,13 +189,6 @@ rtc_source_set("red") {
   ]
 }
 
-rtc_source_set("legacy_encoded_audio_frame") {
-  sources = [
-    "codecs/legacy_encoded_audio_frame.cc",
-    "codecs/legacy_encoded_audio_frame.h",
-  ]
-}
-
 config("g711_config") {
   include_dirs = [
     "../../..",
@@ -219,7 +213,6 @@ rtc_source_set("g711") {
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
-    ":legacy_encoded_audio_frame",
   ]
 }
 
@@ -248,7 +241,6 @@ rtc_source_set("g722") {
   deps = [
     ":audio_decoder_interface",
     ":audio_encoder_interface",
-    ":legacy_encoded_audio_frame",
   ]
 }
 
diff --git a/webrtc/modules/audio_coding/audio_coding.gypi b/webrtc/modules/audio_coding/audio_coding.gypi
index 2901855464..cb318ec777 100644
--- a/webrtc/modules/audio_coding/audio_coding.gypi
+++ b/webrtc/modules/audio_coding/audio_coding.gypi
@@ -186,26 +186,6 @@
         'include/audio_coding_module_typedefs.h',
       ],
     },
-    {
-      'target_name': 'legacy_encoded_audio_frame',
-      'type': 'static_library',
-      'dependencies': [
-        '<(webrtc_root)/common.gyp:webrtc_common',
-        'audio_decoder_interface',
-      ],
-      'include_dirs': [
-        '<(webrtc_root)',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(webrtc_root)',
-        ],
-      },
-      'sources': [
-        'codecs/legacy_encoded_audio_frame.cc',
-        'codecs/legacy_encoded_audio_frame.h',
-      ],
-    },
   ],
   'conditions': [
     ['include_opus==1', {
diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.gypi b/webrtc/modules/audio_coding/codecs/g711/g711.gypi
index 207790fe4e..364a1e6a8f 100644
--- a/webrtc/modules/audio_coding/codecs/g711/g711.gypi
+++ b/webrtc/modules/audio_coding/codecs/g711/g711.gypi
@@ -14,7 +14,6 @@
       'dependencies': [
         'audio_encoder_interface',
         'audio_decoder_interface',
-        'legacy_encoded_audio_frame',
       ],
       'sources': [
         'audio_decoder_pcm.cc',
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722.gypi b/webrtc/modules/audio_coding/codecs/g722/g722.gypi
index a661a75cf3..836afa1203 100644
--- a/webrtc/modules/audio_coding/codecs/g722/g722.gypi
+++ b/webrtc/modules/audio_coding/codecs/g722/g722.gypi
@@ -13,7 +13,6 @@
       'dependencies': [
         'audio_encoder_interface',
         'audio_decoder_interface',
-        'legacy_encoded_audio_frame',
       ],
       'sources': [
         'audio_decoder_g722.cc',
diff --git a/webrtc/modules/audio_coding/codecs/interfaces.gypi b/webrtc/modules/audio_coding/codecs/interfaces.gypi
index 1aba106f90..adcddcf9fe 100644
--- a/webrtc/modules/audio_coding/codecs/interfaces.gypi
+++ b/webrtc/modules/audio_coding/codecs/interfaces.gypi
@@ -14,6 +14,8 @@
       'sources': [
         'audio_decoder.cc',
         'audio_decoder.h',
+        'legacy_encoded_audio_frame.cc',
+        'legacy_encoded_audio_frame.h',
       ],
       'dependencies': [
         '<(webrtc_root)/base/base.gyp:rtc_base_approved',
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
index ae40793324..e6ffb16640 100644
--- a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
+++ b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
@@ -14,7 +14,6 @@
       'dependencies': [
         'audio_encoder_interface',
         'audio_decoder_interface',
-        'legacy_encoded_audio_frame',
         'g711',
       ],
       'sources': [