diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 84593858e7..afebe93d1b 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -108,6 +108,7 @@ if (rtc_include_tests) {
       "../modules/audio_device:mock_audio_device",
       "../modules/audio_mixer:audio_mixer_impl",
       "../modules/audio_processing:audio_processing_statistics",
+      "../modules/audio_processing:mocks",
       "../modules/congestion_controller:congestion_controller",
       "../modules/congestion_controller:mock_congestion_controller",
       "../modules/pacing:mock_paced_sender",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 903df3ba78..7d1c443a5a 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -214,6 +214,7 @@ if (rtc_include_tests) {
       "../modules/audio_device:mock_audio_device",
       "../modules/audio_mixer",
       "../modules/audio_mixer:audio_mixer_impl",
+      "../modules/audio_processing:mocks",
       "../modules/bitrate_controller",
       "../modules/congestion_controller",
       "../modules/congestion_controller:mock_congestion_controller",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 227133913f..a2a7bb2841 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -438,6 +438,7 @@ if (rtc_include_tests) {
     defines = []
     deps = [
       "../api:video_frame_api_i420",
+      "../modules/audio_processing:mocks",
       "../pc:rtc_pc",
       "../pc:rtc_pc_base",
       "../rtc_base:checks",
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 49db002446..24658f20ec 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -404,11 +404,13 @@ rtc_source_set("apm_logging") {
 rtc_source_set("aec_core") {
   configs += [ ":apm_debug_dump" ]
   sources = [
+    "aec/aec_common.h",
     "aec/aec_core.cc",
     "aec/aec_core.h",
     "aec/aec_core_optimized_methods.h",
     "aecm/aecm_core.cc",
     "aecm/aecm_core.h",
+    "aecm/aecm_defines.h",
     "aecm/echo_control_mobile.cc",
     "aecm/echo_control_mobile.h",
     "utility/block_mean_calculator.cc",
@@ -493,6 +495,19 @@ rtc_source_set("aec_core") {
 }
 
 if (rtc_include_tests) {
+  rtc_source_set("mocks") {
+    testonly = true
+    sources = [
+      "include/mock_audio_processing.h",
+    ]
+    deps = [
+      ":aec_dump_interface",
+      ":audio_processing",
+      ":audio_processing_statistics",
+      "../../test:test_support",
+    ]
+  }
+
   group("audio_processing_tests") {
     testonly = true
     deps = [
@@ -524,6 +539,10 @@ if (rtc_include_tests) {
     sources = [
       "aec/echo_cancellation_unittest.cc",
       "aec/system_delay_unittest.cc",
+      "aec3/mock/mock_block_processor.h",
+      "aec3/mock/mock_echo_remover.h",
+      "aec3/mock/mock_render_delay_buffer.h",
+      "aec3/mock/mock_render_delay_controller.h",
       "agc/agc_manager_direct_unittest.cc",
       "agc/loudness_histogram_unittest.cc",
       "agc/mock_agc.h",
@@ -531,6 +550,7 @@ if (rtc_include_tests) {
       "beamformer/array_util_unittest.cc",
       "beamformer/complex_matrix_unittest.cc",
       "beamformer/covariance_matrix_generator_unittest.cc",
+      "beamformer/matrix_test_helpers.h",
       "beamformer/matrix_unittest.cc",
       "beamformer/mock_nonlinear_beamformer.h",
       "config_unittest.cc",
@@ -564,6 +584,7 @@ if (rtc_include_tests) {
       ":apm_logging",
       ":audio_processing",
       ":audioproc_test_utils",
+      ":mocks",
       "..:module_api",
       "../..:webrtc_common",
       "../../:typedefs",