diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 7db227ef75..321a342100 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -191,8 +191,10 @@ rtc_static_library("peerconnection") {
     "../call:call_interfaces",
     "../common_video:common_video",
     "../logging:rtc_event_log_api",
+    "../media:rtc_audio_video",
     "../media:rtc_data",
     "../media:rtc_media_base",
+    "../modules/audio_device",
     "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:rtc_base",
diff --git a/pc/channel.cc b/pc/channel.cc
index 5c91c0b961..d9d3f1840f 100644
--- a/pc/channel.cc
+++ b/pc/channel.cc
@@ -26,9 +26,6 @@
 #include "rtc_base/networkroute.h"
 #include "rtc_base/ptr_util.h"
 #include "rtc_base/trace_event.h"
-// Adding 'nogncheck' to disable the gn include headers check to support modular
-// WebRTC build targets.
-#include "media/engine/webrtcvoiceengine.h"  // nogncheck
 #include "p2p/base/packettransportinternal.h"
 #include "pc/channelmanager.h"
 #include "pc/rtpmediautils.h"
diff --git a/pc/peerconnectionfactory.cc b/pc/peerconnectionfactory.cc
index d9fcce2ae6..13fdd9b15a 100644
--- a/pc/peerconnectionfactory.cc
+++ b/pc/peerconnectionfactory.cc
@@ -25,14 +25,10 @@
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/ptr_util.h"
-// Adding 'nogncheck' to disable the gn include headers check to support modular
-// WebRTC build targets.
-// TODO(zhihuang): This wouldn't be necessary if the interface and
-// implementation of the media engine were in separate build targets.
-#include "media/engine/webrtcmediaengine.h"             // nogncheck
-#include "media/engine/webrtcvideodecoderfactory.h"     // nogncheck
-#include "media/engine/webrtcvideoencoderfactory.h"     // nogncheck
-#include "modules/audio_device/include/audio_device.h"  // nogncheck
+#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtcvideodecoderfactory.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
+#include "modules/audio_device/include/audio_device.h"
 #include "p2p/base/basicpacketsocketfactory.h"
 #include "p2p/client/basicportallocator.h"
 #include "pc/audiotrack.h"
diff --git a/pc/rtpsender.h b/pc/rtpsender.h
index eb09d0b13f..13bc95daed 100644
--- a/pc/rtpsender.h
+++ b/pc/rtpsender.h
@@ -23,9 +23,7 @@
 #include "api/rtpsenderinterface.h"
 #include "rtc_base/basictypes.h"
 #include "rtc_base/criticalsection.h"
-// Adding 'nogncheck' to disable the gn include headers check to support modular
-// WebRTC build targets.
-#include "media/base/audiosource.h"  // nogncheck
+#include "media/base/audiosource.h"
 #include "pc/channel.h"
 #include "pc/dtmfsender.h"
 #include "pc/statscollector.h"