diff --git a/.gn b/.gn
index 0bd9b08667..c381566dec 100644
--- a/.gn
+++ b/.gn
@@ -31,6 +31,7 @@ check_targets = [
   "//webrtc/modules/audio_processing/*",
   "//webrtc/modules/media_file/*",
   "//webrtc/modules/pacing/*",
+  "//webrtc/modules/rtp_rtcp/*",
   "//webrtc/modules/video_capture/*",
   "//webrtc/modules/video_coding/*",
   "//webrtc/stats:rtc_stats",
diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
index ca519e7c04..40cbdf62c1 100644
--- a/webrtc/modules/BUILD.gn
+++ b/webrtc/modules/BUILD.gn
@@ -421,6 +421,7 @@ if (rtc_include_tests) {
       "remote_bitrate_estimator/test/bwe_unittest.cc",
       "remote_bitrate_estimator/test/estimators/nada_unittest.cc",
       "remote_bitrate_estimator/test/metric_recorder_unittest.cc",
+      "rtp_rtcp/mocks/mock_rtp_rtcp.h",
       "rtp_rtcp/source/byte_io_unittest.cc",
       "rtp_rtcp/source/fec_test_helper.cc",
       "rtp_rtcp/source/fec_test_helper.h",
diff --git a/webrtc/modules/rtp_rtcp/BUILD.gn b/webrtc/modules/rtp_rtcp/BUILD.gn
index 80f79c1764..e806f070a1 100644
--- a/webrtc/modules/rtp_rtcp/BUILD.gn
+++ b/webrtc/modules/rtp_rtcp/BUILD.gn
@@ -20,7 +20,6 @@ rtc_static_library("rtp_rtcp") {
     "include/rtp_rtcp.h",
     "include/rtp_rtcp_defines.h",
     "include/ulpfec_receiver.h",
-    "mocks/mock_rtp_rtcp.h",
     "source/byte_io.h",
     "source/dtmf_queue.cc",
     "source/dtmf_queue.h",
@@ -175,7 +174,12 @@ rtc_static_library("rtp_rtcp") {
   deps = [
     "../..:webrtc_common",
     "../../api:transport_api",
+    "../../base:gtest_prod",
+    "../../base:rtc_base_approved",
+    "../../base:rtc_task_queue",
+    "../../call:call_interfaces",
     "../../common_video",
+    "../../logging:rtc_event_log_api",
     "../../system_wrappers",
     "../remote_bitrate_estimator",
   ]
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
index 27e6143ae2..aa5df5f8cf 100644
--- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
+++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp.h
@@ -22,7 +22,6 @@
 #include "webrtc/modules/include/module.h"
 #include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
 
 namespace webrtc {