commit 92ea95e34af5966555903026f45164afbd7e2088
author Mirko Bonadei <mbonadei@webrtc.org> Fri Sep 15 06:47:31 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Sep 15 05:02:56 2017 +0000
tree 3befb3fcfefff3b35da8a834052543338e15bcc0
parent bb547203bfebcc478b263c4e9ca173c6fd5a0c5d

Fixing WebRTC after moving from src/webrtc to src/

In https://webrtc-review.googlesource.com/c/src/+/1560 we moved WebRTC
from src/webrtc to src/ (in order to preserve an healthy git history).
This CL takes care of fixing header guards, #include paths, etc...

NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
TBR=tommi@webrtc.org


Bug: chromium:611808
Change-Id: Iea91618212bee0af16aa3f05071eab8f93706578
Reviewed-on: https://webrtc-review.googlesource.com/1561
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19846}

pc/DEPS

diff --git a/pc/DEPS b/pc/DEPS
index 20bbba2..dfadc23 100644
--- a/pc/DEPS
+++ b/pc/DEPS
@@ -1,24 +1,24 @@
 include_rules = [
   "+third_party/libsrtp",
-  "+webrtc/api",
-  "+webrtc/call",
-  "+webrtc/common_video/h264",
-  "+webrtc/logging/rtc_event_log",
-  "+webrtc/logging/rtc_event_log",
-  "+webrtc/media",
-  "+webrtc/modules/audio_device",
-  "+webrtc/modules/audio_processing",
-  "+webrtc/modules/rtp_rtcp",
-  "+webrtc/modules/video_coding",
-  "+webrtc/modules/video_render",
-  "+webrtc/p2p",
-  "+webrtc/system_wrappers",
+  "+api",
+  "+call",
+  "+common_video/h264",
+  "+logging/rtc_event_log",
+  "+logging/rtc_event_log",
+  "+media",
+  "+modules/audio_device",
+  "+modules/audio_processing",
+  "+modules/rtp_rtcp",
+  "+modules/video_coding",
+  "+modules/video_render",
+  "+p2p",
+  "+system_wrappers",
 ]
 
 specific_include_rules = {
   "androidtestinitializer\.cc": [
     "+base/android",  # Allowed only for Android tests.
-    "+webrtc/voice_engine",
+    "+voice_engine",
   ],
   "srtpfilter_unittest\.cc": [
     "+crypto",
@@ -27,9 +27,9 @@
   # TODO(ossu): Remove these exceptions when audio_encoder_factory.h
   # has moved to api/.
   "peerconnectionfactory\.cc": [
-    "+webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h",
+    "+modules/audio_coding/codecs/builtin_audio_encoder_factory.h",
   ],
   "peerconnectioninterface_unittest\.cc": [
-    "+webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory.h",
+    "+modules/audio_coding/codecs/builtin_audio_encoder_factory.h",
   ],
 }

pc/audiomonitor.cc

diff --git a/pc/audiomonitor.cc b/pc/audiomonitor.cc
index 9c610bc..a5bffd7 100644
--- a/pc/audiomonitor.cc
+++ b/pc/audiomonitor.cc
@@ -9,8 +9,8 @@
  */
 
 #include <assert.h>
-#include "webrtc/pc/audiomonitor.h"
-#include "webrtc/pc/voicechannel.h"
+#include "pc/audiomonitor.h"
+#include "pc/voicechannel.h"
 
 namespace cricket {
 

pc/audiomonitor.h

diff --git a/pc/audiomonitor.h b/pc/audiomonitor.h
index 86e8ba2..26212af 100644
--- a/pc/audiomonitor.h
+++ b/pc/audiomonitor.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_AUDIOMONITOR_H_
-#define WEBRTC_PC_AUDIOMONITOR_H_
+#ifndef PC_AUDIOMONITOR_H_
+#define PC_AUDIOMONITOR_H_
 
 #include <vector>
 #include <utility>
 
-#include "webrtc/p2p/base/port.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/thread.h"
+#include "p2p/base/port.h"
+#include "rtc_base/sigslot.h"
+#include "rtc_base/thread.h"
 
 namespace cricket {
 
@@ -57,4 +57,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_AUDIOMONITOR_H_
+#endif  // PC_AUDIOMONITOR_H_

pc/audiotrack.cc

diff --git a/pc/audiotrack.cc b/pc/audiotrack.cc
index 02607da..8e24f0b 100644
--- a/pc/audiotrack.cc
+++ b/pc/audiotrack.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/audiotrack.h"
+#include "pc/audiotrack.h"
 
-#include "webrtc/rtc_base/checks.h"
+#include "rtc_base/checks.h"
 
 using rtc::scoped_refptr;
 

pc/audiotrack.h

diff --git a/pc/audiotrack.h b/pc/audiotrack.h
index 8dde2ef..b7ad0aa 100644
--- a/pc/audiotrack.h
+++ b/pc/audiotrack.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_AUDIOTRACK_H_
-#define WEBRTC_PC_AUDIOTRACK_H_
+#ifndef PC_AUDIOTRACK_H_
+#define PC_AUDIOTRACK_H_
 
 #include <string>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/notifier.h"
-#include "webrtc/pc/mediastreamtrack.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "api/mediastreaminterface.h"
+#include "api/notifier.h"
+#include "pc/mediastreamtrack.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/thread_checker.h"
 
 namespace webrtc {
 
@@ -56,4 +56,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_AUDIOTRACK_H_
+#endif  // PC_AUDIOTRACK_H_

pc/bundlefilter.cc

diff --git a/pc/bundlefilter.cc b/pc/bundlefilter.cc
index 3b7dcd6..7791da6 100644
--- a/pc/bundlefilter.cc
+++ b/pc/bundlefilter.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/bundlefilter.h"
+#include "pc/bundlefilter.h"
 
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/rtc_base/logging.h"
+#include "media/base/rtputils.h"
+#include "rtc_base/logging.h"
 
 namespace cricket {
 

pc/bundlefilter.h

diff --git a/pc/bundlefilter.h b/pc/bundlefilter.h
index b4ad824..7decbba 100644
--- a/pc/bundlefilter.h
+++ b/pc/bundlefilter.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_BUNDLEFILTER_H_
-#define WEBRTC_PC_BUNDLEFILTER_H_
+#ifndef PC_BUNDLEFILTER_H_
+#define PC_BUNDLEFILTER_H_
 
 #include <stdint.h>
 
 #include <set>
 #include <vector>
 
-#include "webrtc/media/base/streamparams.h"
-#include "webrtc/rtc_base/basictypes.h"
+#include "media/base/streamparams.h"
+#include "rtc_base/basictypes.h"
 
 namespace cricket {
 
@@ -51,4 +51,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_BUNDLEFILTER_H_
+#endif  // PC_BUNDLEFILTER_H_

pc/bundlefilter_unittest.cc

diff --git a/pc/bundlefilter_unittest.cc b/pc/bundlefilter_unittest.cc
index f0f56a5..2b1af5c 100644
--- a/pc/bundlefilter_unittest.cc
+++ b/pc/bundlefilter_unittest.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/bundlefilter.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "pc/bundlefilter.h"
+#include "rtc_base/gunit.h"
 
 using cricket::StreamParams;
 

pc/channel.cc

diff --git a/pc/channel.cc b/pc/channel.cc
index 8e82925..7ddf5de 100644
--- a/pc/channel.cc
+++ b/pc/channel.cc
@@ -12,27 +12,27 @@
 #include <iterator>
 #include <utility>
 
-#include "webrtc/pc/channel.h"
+#include "pc/channel.h"
 
-#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/copyonwritebuffer.h"
-#include "webrtc/rtc_base/dscp.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/networkroute.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "api/call/audio_sink.h"
+#include "media/base/mediaconstants.h"
+#include "media/base/rtputils.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/byteorder.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/dscp.h"
+#include "rtc_base/logging.h"
+#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 "webrtc/media/engine/webrtcvoiceengine.h"  // nogncheck
-#include "webrtc/p2p/base/packettransportinternal.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/pc/rtptransport.h"
-#include "webrtc/pc/srtptransport.h"
+#include "media/engine/webrtcvoiceengine.h"  // nogncheck
+#include "p2p/base/packettransportinternal.h"
+#include "pc/channelmanager.h"
+#include "pc/rtptransport.h"
+#include "pc/srtptransport.h"
 
 namespace cricket {
 using rtc::Bind;

pc/channel.h

diff --git a/pc/channel.h b/pc/channel.h
index 4ff21fe..613597b 100644
--- a/pc/channel.h
+++ b/pc/channel.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_CHANNEL_H_
-#define WEBRTC_PC_CHANNEL_H_
+#ifndef PC_CHANNEL_H_
+#define PC_CHANNEL_H_
 
 #include <map>
 #include <memory>
@@ -18,28 +18,28 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/base/mediaengine.h"
-#include "webrtc/media/base/streamparams.h"
-#include "webrtc/media/base/videosinkinterface.h"
-#include "webrtc/media/base/videosourceinterface.h"
-#include "webrtc/p2p/base/dtlstransportinternal.h"
-#include "webrtc/p2p/base/packettransportinternal.h"
-#include "webrtc/p2p/base/transportcontroller.h"
-#include "webrtc/p2p/client/socketmonitor.h"
-#include "webrtc/pc/audiomonitor.h"
-#include "webrtc/pc/mediamonitor.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/pc/rtcpmuxfilter.h"
-#include "webrtc/pc/srtpfilter.h"
-#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/rtc_base/asyncudpsocket.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/network.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/window.h"
+#include "api/call/audio_sink.h"
+#include "api/rtpreceiverinterface.h"
+#include "media/base/mediachannel.h"
+#include "media/base/mediaengine.h"
+#include "media/base/streamparams.h"
+#include "media/base/videosinkinterface.h"
+#include "media/base/videosourceinterface.h"
+#include "p2p/base/dtlstransportinternal.h"
+#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/transportcontroller.h"
+#include "p2p/client/socketmonitor.h"
+#include "pc/audiomonitor.h"
+#include "pc/mediamonitor.h"
+#include "pc/mediasession.h"
+#include "pc/rtcpmuxfilter.h"
+#include "pc/srtpfilter.h"
+#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/network.h"
+#include "rtc_base/sigslot.h"
+#include "rtc_base/window.h"
 
 namespace webrtc {
 class AudioSinkInterface;
@@ -723,4 +723,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_CHANNEL_H_
+#endif  // PC_CHANNEL_H_

pc/channel_unittest.cc

diff --git a/pc/channel_unittest.cc b/pc/channel_unittest.cc
index b16e60d..b5517da 100644
--- a/pc/channel_unittest.cc
+++ b/pc/channel_unittest.cc
@@ -10,21 +10,21 @@
 
 #include <memory>
 
-#include "webrtc/api/array_view.h"
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/fakertp.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/base/testutils.h"
-#include "webrtc/p2p/base/fakecandidatepair.h"
-#include "webrtc/p2p/base/fakedtlstransport.h"
-#include "webrtc/p2p/base/fakepackettransport.h"
-#include "webrtc/pc/channel.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "api/array_view.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/fakertp.h"
+#include "media/base/mediachannel.h"
+#include "media/base/testutils.h"
+#include "p2p/base/fakecandidatepair.h"
+#include "p2p/base/fakedtlstransport.h"
+#include "p2p/base/fakepackettransport.h"
+#include "pc/channel.h"
+#include "rtc_base/buffer.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/fakeclock.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/sslstreamadapter.h"
 
 using cricket::CA_OFFER;
 using cricket::CA_PRANSWER;

pc/channelmanager.cc

diff --git a/pc/channelmanager.cc b/pc/channelmanager.cc
index 197e722..522f197 100644
--- a/pc/channelmanager.cc
+++ b/pc/channelmanager.cc
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/channelmanager.h"
+#include "pc/channelmanager.h"
 
 #include <algorithm>
 
-#include "webrtc/media/base/device.h"
-#include "webrtc/media/base/rtpdataengine.h"
-#include "webrtc/pc/srtpfilter.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "media/base/device.h"
+#include "media/base/rtpdataengine.h"
+#include "pc/srtpfilter.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/stringencode.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/trace_event.h"
 
 namespace cricket {
 

pc/channelmanager.h

diff --git a/pc/channelmanager.h b/pc/channelmanager.h
index eef90fd..380dad8 100644
--- a/pc/channelmanager.h
+++ b/pc/channelmanager.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_CHANNELMANAGER_H_
-#define WEBRTC_PC_CHANNELMANAGER_H_
+#ifndef PC_CHANNELMANAGER_H_
+#define PC_CHANNELMANAGER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "webrtc/media/base/mediaengine.h"
-#include "webrtc/pc/voicechannel.h"
-#include "webrtc/rtc_base/fileutils.h"
-#include "webrtc/rtc_base/thread.h"
+#include "media/base/mediaengine.h"
+#include "pc/voicechannel.h"
+#include "rtc_base/fileutils.h"
+#include "rtc_base/thread.h"
 
 namespace cricket {
 
@@ -223,4 +223,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_CHANNELMANAGER_H_
+#endif  // PC_CHANNELMANAGER_H_

pc/channelmanager_unittest.cc

diff --git a/pc/channelmanager_unittest.cc b/pc/channelmanager_unittest.cc
index b322407..55fc7ff 100644
--- a/pc/channelmanager_unittest.cc
+++ b/pc/channelmanager_unittest.cc
@@ -10,16 +10,16 @@
 
 #include <memory>
 
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/fakevideocapturer.h"
-#include "webrtc/media/base/testutils.h"
-#include "webrtc/media/engine/fakewebrtccall.h"
-#include "webrtc/p2p/base/faketransportcontroller.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/thread.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/fakevideocapturer.h"
+#include "media/base/testutils.h"
+#include "media/engine/fakewebrtccall.h"
+#include "p2p/base/faketransportcontroller.h"
+#include "pc/channelmanager.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/thread.h"
 
 namespace {
 const bool kDefaultSrtpRequired = true;

pc/createpeerconnectionfactory.cc

diff --git a/pc/createpeerconnectionfactory.cc b/pc/createpeerconnectionfactory.cc
index 11aa121..a62a7ae 100644
--- a/pc/createpeerconnectionfactory.cc
+++ b/pc/createpeerconnectionfactory.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/call/callfactoryinterface.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "webrtc/media/engine/webrtcmediaengine.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/thread.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/peerconnectioninterface.h"
+#include "call/callfactoryinterface.h"
+#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
+#include "media/engine/webrtcmediaengine.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/thread.h"
 
 namespace webrtc {
 

pc/currentspeakermonitor.cc

diff --git a/pc/currentspeakermonitor.cc b/pc/currentspeakermonitor.cc
index d52e79d..9765d2e 100644
--- a/pc/currentspeakermonitor.cc
+++ b/pc/currentspeakermonitor.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/currentspeakermonitor.h"
+#include "pc/currentspeakermonitor.h"
 
 #include <vector>
 
-#include "webrtc/media/base/streamparams.h"
-#include "webrtc/pc/audiomonitor.h"
-#include "webrtc/rtc_base/logging.h"
+#include "media/base/streamparams.h"
+#include "pc/audiomonitor.h"
+#include "rtc_base/logging.h"
 
 namespace cricket {
 

pc/currentspeakermonitor.h

diff --git a/pc/currentspeakermonitor.h b/pc/currentspeakermonitor.h
index 001035f..589fb1b 100644
--- a/pc/currentspeakermonitor.h
+++ b/pc/currentspeakermonitor.h
@@ -11,14 +11,14 @@
 // CurrentSpeakerMonitor monitors the audio levels for a session and determines
 // which participant is currently speaking.
 
-#ifndef WEBRTC_PC_CURRENTSPEAKERMONITOR_H_
-#define WEBRTC_PC_CURRENTSPEAKERMONITOR_H_
+#ifndef PC_CURRENTSPEAKERMONITOR_H_
+#define PC_CURRENTSPEAKERMONITOR_H_
 
 #include <stdint.h>
 
 #include <map>
 
-#include "webrtc/rtc_base/sigslot.h"
+#include "rtc_base/sigslot.h"
 
 namespace cricket {
 
@@ -93,4 +93,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_CURRENTSPEAKERMONITOR_H_
+#endif  // PC_CURRENTSPEAKERMONITOR_H_

pc/currentspeakermonitor_unittest.cc

diff --git a/pc/currentspeakermonitor_unittest.cc b/pc/currentspeakermonitor_unittest.cc
index 547b5a2..88b1821 100644
--- a/pc/currentspeakermonitor_unittest.cc
+++ b/pc/currentspeakermonitor_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/currentspeakermonitor.h"
-#include "webrtc/pc/audiomonitor.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/thread.h"
+#include "pc/currentspeakermonitor.h"
+#include "pc/audiomonitor.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/thread.h"
 
 namespace cricket {
 

pc/datachannel.cc

diff --git a/pc/datachannel.cc b/pc/datachannel.cc
index 28c090d..c342908 100644
--- a/pc/datachannel.cc
+++ b/pc/datachannel.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/datachannel.h"
+#include "pc/datachannel.h"
 
 #include <memory>
 #include <string>
 
-#include "webrtc/media/sctp/sctptransportinternal.h"
-#include "webrtc/pc/sctputils.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/refcount.h"
+#include "media/sctp/sctptransportinternal.h"
+#include "pc/sctputils.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/refcount.h"
 
 namespace webrtc {
 

pc/datachannel.h

diff --git a/pc/datachannel.h b/pc/datachannel.h
index 13f5b88..1af90da 100644
--- a/pc/datachannel.h
+++ b/pc/datachannel.h
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_DATACHANNEL_H_
-#define WEBRTC_PC_DATACHANNEL_H_
+#ifndef PC_DATACHANNEL_H_
+#define PC_DATACHANNEL_H_
 
 #include <deque>
 #include <set>
 #include <string>
 
-#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/api/proxy.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/pc/channel.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "api/datachannelinterface.h"
+#include "api/proxy.h"
+#include "media/base/mediachannel.h"
+#include "pc/channel.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/sigslot.h"
 
 namespace webrtc {
 
@@ -295,4 +295,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_DATACHANNEL_H_
+#endif  // PC_DATACHANNEL_H_

pc/datachannel_unittest.cc

diff --git a/pc/datachannel_unittest.cc b/pc/datachannel_unittest.cc
index 8776dce..7acfa8e 100644
--- a/pc/datachannel_unittest.cc
+++ b/pc/datachannel_unittest.cc
@@ -10,10 +10,10 @@
 
 #include <memory>
 
-#include "webrtc/pc/datachannel.h"
-#include "webrtc/pc/sctputils.h"
-#include "webrtc/pc/test/fakedatachannelprovider.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "pc/datachannel.h"
+#include "pc/sctputils.h"
+#include "pc/test/fakedatachannelprovider.h"
+#include "rtc_base/gunit.h"
 
 using webrtc::DataChannel;
 using webrtc::SctpSidAllocator;

pc/dtmfsender.cc

diff --git a/pc/dtmfsender.cc b/pc/dtmfsender.cc
index 3a95c2a..1400206 100644
--- a/pc/dtmfsender.cc
+++ b/pc/dtmfsender.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/dtmfsender.h"
+#include "pc/dtmfsender.h"
 
 #include <ctype.h>
 
 #include <string>
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/thread.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/thread.h"
 
 namespace webrtc {
 

pc/dtmfsender.h

diff --git a/pc/dtmfsender.h b/pc/dtmfsender.h
index 28156f3..ff7f0ac 100644
--- a/pc/dtmfsender.h
+++ b/pc/dtmfsender.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_DTMFSENDER_H_
-#define WEBRTC_PC_DTMFSENDER_H_
+#ifndef PC_DTMFSENDER_H_
+#define PC_DTMFSENDER_H_
 
 #include <string>
 
-#include "webrtc/api/dtmfsenderinterface.h"
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/proxy.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/refcount.h"
+#include "api/dtmfsenderinterface.h"
+#include "api/mediastreaminterface.h"
+#include "api/proxy.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/refcount.h"
 
 // DtmfSender is the native implementation of the RTCDTMFSender defined by
 // the WebRTC W3C Editor's Draft.
@@ -121,4 +121,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_DTMFSENDER_H_
+#endif  // PC_DTMFSENDER_H_

pc/dtmfsender_unittest.cc

diff --git a/pc/dtmfsender_unittest.cc b/pc/dtmfsender_unittest.cc
index 400444e..21343f6 100644
--- a/pc/dtmfsender_unittest.cc
+++ b/pc/dtmfsender_unittest.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/dtmfsender.h"
+#include "pc/dtmfsender.h"
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "webrtc/pc/audiotrack.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "pc/audiotrack.h"
+#include "rtc_base/fakeclock.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/timeutils.h"
 
 using webrtc::AudioTrackInterface;
 using webrtc::AudioTrack;

pc/externalhmac.cc

diff --git a/pc/externalhmac.cc b/pc/externalhmac.cc
index 34cab08..6c6d000 100644
--- a/pc/externalhmac.cc
+++ b/pc/externalhmac.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/externalhmac.h"
+#include "pc/externalhmac.h"
 
 #include <stdlib.h>  // For malloc/free.
 
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/logging.h"
 
 #include "third_party/libsrtp/crypto/include/crypto_kernel.h"
 #include "third_party/libsrtp/include/srtp.h"

pc/externalhmac.h

diff --git a/pc/externalhmac.h b/pc/externalhmac.h
index 4a6e817..7fb9f25 100644
--- a/pc/externalhmac.h
+++ b/pc/externalhmac.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_EXTERNALHMAC_H_
-#define WEBRTC_PC_EXTERNALHMAC_H_
+#ifndef PC_EXTERNALHMAC_H_
+#define PC_EXTERNALHMAC_H_
 
 // External libsrtp HMAC auth module which implements methods defined in
 // auth_type_t.
@@ -67,4 +67,4 @@
 
 srtp_err_status_t external_crypto_init();
 
-#endif  // WEBRTC_PC_EXTERNALHMAC_H_
+#endif  // PC_EXTERNALHMAC_H_

pc/iceserverparsing.cc

diff --git a/pc/iceserverparsing.cc b/pc/iceserverparsing.cc
index 9b802fc..ccc1e17 100644
--- a/pc/iceserverparsing.cc
+++ b/pc/iceserverparsing.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/iceserverparsing.h"
+#include "pc/iceserverparsing.h"
 
 #include <cctype>  // For std::isdigit.
 #include <string>
 
-#include "webrtc/rtc_base/arraysize.h"
+#include "rtc_base/arraysize.h"
 
 namespace webrtc {
 

pc/iceserverparsing.h

diff --git a/pc/iceserverparsing.h b/pc/iceserverparsing.h
index c8feefd..7e14dc2 100644
--- a/pc/iceserverparsing.h
+++ b/pc/iceserverparsing.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_ICESERVERPARSING_H_
-#define WEBRTC_PC_ICESERVERPARSING_H_
+#ifndef PC_ICESERVERPARSING_H_
+#define PC_ICESERVERPARSING_H_
 
 #include <vector>
 
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/rtcerror.h"
+#include "api/peerconnectioninterface.h"
+#include "api/rtcerror.h"
 
 namespace webrtc {
 
@@ -31,4 +31,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_ICESERVERPARSING_H_
+#endif  // PC_ICESERVERPARSING_H_

pc/iceserverparsing_unittest.cc

diff --git a/pc/iceserverparsing_unittest.cc b/pc/iceserverparsing_unittest.cc
index d433963..4ec7a89 100644
--- a/pc/iceserverparsing_unittest.cc
+++ b/pc/iceserverparsing_unittest.cc
@@ -11,8 +11,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/pc/iceserverparsing.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "pc/iceserverparsing.h"
+#include "rtc_base/gunit.h"
 
 namespace webrtc {
 

pc/jsepicecandidate.cc

diff --git a/pc/jsepicecandidate.cc b/pc/jsepicecandidate.cc
index dbe05e4..48feb89 100644
--- a/pc/jsepicecandidate.cc
+++ b/pc/jsepicecandidate.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/api/jsepicecandidate.h"
+#include "api/jsepicecandidate.h"
 
 #include <vector>
 
-#include "webrtc/pc/webrtcsdp.h"
-#include "webrtc/rtc_base/stringencode.h"
+#include "pc/webrtcsdp.h"
+#include "rtc_base/stringencode.h"
 
 namespace webrtc {
 

pc/jsepsessiondescription.cc

diff --git a/pc/jsepsessiondescription.cc b/pc/jsepsessiondescription.cc
index bdb3695..3844f94 100644
--- a/pc/jsepsessiondescription.cc
+++ b/pc/jsepsessiondescription.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/api/jsepsessiondescription.h"
+#include "api/jsepsessiondescription.h"
 
 #include <memory>
 
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/pc/webrtcsdp.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/stringencode.h"
+#include "pc/mediasession.h"
+#include "pc/webrtcsdp.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/stringencode.h"
 
 using cricket::SessionDescription;
 

pc/jsepsessiondescription_unittest.cc

diff --git a/pc/jsepsessiondescription_unittest.cc b/pc/jsepsessiondescription_unittest.cc
index 62052af..473e7a0 100644
--- a/pc/jsepsessiondescription_unittest.cc
+++ b/pc/jsepsessiondescription_unittest.cc
@@ -11,17 +11,17 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/api/jsepicecandidate.h"
-#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/api/webrtcsdp.h"
-#include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/p2p/base/sessiondescription.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/rtc_base/stringencode.h"
+#include "api/jsepicecandidate.h"
+#include "api/jsepsessiondescription.h"
+#include "api/webrtcsdp.h"
+#include "p2p/base/candidate.h"
+#include "p2p/base/p2pconstants.h"
+#include "p2p/base/sessiondescription.h"
+#include "pc/mediasession.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/helpers.h"
+#include "rtc_base/ssladapter.h"
+#include "rtc_base/stringencode.h"
 
 using webrtc::IceCandidateCollection;
 using webrtc::IceCandidateInterface;

pc/localaudiosource.cc

diff --git a/pc/localaudiosource.cc b/pc/localaudiosource.cc
index 5454cdf..5c86dd3 100644
--- a/pc/localaudiosource.cc
+++ b/pc/localaudiosource.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/localaudiosource.h"
+#include "pc/localaudiosource.h"
 
 #include <vector>
 
-#include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/media/base/mediaengine.h"
+#include "api/mediaconstraintsinterface.h"
+#include "media/base/mediaengine.h"
 
 using webrtc::MediaConstraintsInterface;
 using webrtc::MediaSourceInterface;

pc/localaudiosource.h

diff --git a/pc/localaudiosource.h b/pc/localaudiosource.h
index ffa465d..cd17330 100644
--- a/pc/localaudiosource.h
+++ b/pc/localaudiosource.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_LOCALAUDIOSOURCE_H_
-#define WEBRTC_PC_LOCALAUDIOSOURCE_H_
+#ifndef PC_LOCALAUDIOSOURCE_H_
+#define PC_LOCALAUDIOSOURCE_H_
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/notifier.h"
-#include "webrtc/media/base/mediachannel.h"
+#include "api/mediastreaminterface.h"
+#include "api/notifier.h"
+#include "media/base/mediachannel.h"
 
 // LocalAudioSource implements AudioSourceInterface.
 // This contains settings for switching audio processing on and off.
@@ -52,4 +52,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_LOCALAUDIOSOURCE_H_
+#endif  // PC_LOCALAUDIOSOURCE_H_

pc/localaudiosource_unittest.cc

diff --git a/pc/localaudiosource_unittest.cc b/pc/localaudiosource_unittest.cc
index 9b26095..7b74bce 100644
--- a/pc/localaudiosource_unittest.cc
+++ b/pc/localaudiosource_unittest.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/localaudiosource.h"
+#include "pc/localaudiosource.h"
 
 #include <string>
 #include <vector>
 
-#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/fakevideorenderer.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "api/test/fakeconstraints.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/fakevideorenderer.h"
+#include "rtc_base/gunit.h"
 
 using webrtc::LocalAudioSource;
 using webrtc::MediaConstraintsInterface;

pc/mediaconstraintsinterface_unittest.cc

diff --git a/pc/mediaconstraintsinterface_unittest.cc b/pc/mediaconstraintsinterface_unittest.cc
index 81b5fb4..21c547a 100644
--- a/pc/mediaconstraintsinterface_unittest.cc
+++ b/pc/mediaconstraintsinterface_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/api/mediaconstraintsinterface.h"
+#include "api/mediaconstraintsinterface.h"
 
-#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "api/test/fakeconstraints.h"
+#include "rtc_base/gunit.h"
 
 namespace webrtc {
 

pc/mediamonitor.cc

diff --git a/pc/mediamonitor.cc b/pc/mediamonitor.cc
index 22e16dc..e2e3da8 100644
--- a/pc/mediamonitor.cc
+++ b/pc/mediamonitor.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/mediamonitor.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/rtc_base/checks.h"
+#include "pc/mediamonitor.h"
+#include "pc/channelmanager.h"
+#include "rtc_base/checks.h"
 
 namespace cricket {
 

pc/mediamonitor.h

diff --git a/pc/mediamonitor.h b/pc/mediamonitor.h
index b4efefb..fcd2410 100644
--- a/pc/mediamonitor.h
+++ b/pc/mediamonitor.h
@@ -10,14 +10,14 @@
 
 // Class to collect statistics from a media channel
 
-#ifndef WEBRTC_PC_MEDIAMONITOR_H_
-#define WEBRTC_PC_MEDIAMONITOR_H_
+#ifndef PC_MEDIAMONITOR_H_
+#define PC_MEDIAMONITOR_H_
 
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "media/base/mediachannel.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/sigslot.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/thread_annotations.h"
 
 namespace cricket {
 
@@ -79,4 +79,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_MEDIAMONITOR_H_
+#endif  // PC_MEDIAMONITOR_H_

pc/mediasession.cc

diff --git a/pc/mediasession.cc b/pc/mediasession.cc
index e1c3dd4..45a8e94 100644
--- a/pc/mediasession.cc
+++ b/pc/mediasession.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/mediasession.h"
+#include "pc/mediasession.h"
 
 #include <algorithm>  // For std::find_if, std::sort.
 #include <functional>
@@ -18,19 +18,19 @@
 #include <unordered_map>
 #include <utility>
 
-#include "webrtc/api/optional.h"
-#include "webrtc/common_types.h"
-#include "webrtc/media/base/cryptoparams.h"
-#include "webrtc/media/base/h264_profile_level_id.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/pc/srtpfilter.h"
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "api/optional.h"
+#include "common_types.h"
+#include "media/base/cryptoparams.h"
+#include "media/base/h264_profile_level_id.h"
+#include "media/base/mediaconstants.h"
+#include "p2p/base/p2pconstants.h"
+#include "pc/channelmanager.h"
+#include "pc/srtpfilter.h"
+#include "rtc_base/base64.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/helpers.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
 
 namespace {
 const char kInline[] = "inline:";

pc/mediasession.h

diff --git a/pc/mediasession.h b/pc/mediasession.h
index ee7183f..6de9de9 100644
--- a/pc/mediasession.h
+++ b/pc/mediasession.h
@@ -10,24 +10,24 @@
 
 // Types and classes used in media session descriptions.
 
-#ifndef WEBRTC_PC_MEDIASESSION_H_
-#define WEBRTC_PC_MEDIASESSION_H_
+#ifndef PC_MEDIASESSION_H_
+#define PC_MEDIASESSION_H_
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "webrtc/api/mediatypes.h"
-#include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/cryptoparams.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/base/mediaengine.h"  // For DataChannelType
-#include "webrtc/media/base/streamparams.h"
-#include "webrtc/p2p/base/sessiondescription.h"
-#include "webrtc/p2p/base/jseptransport.h"
-#include "webrtc/p2p/base/transportdescriptionfactory.h"
+#include "api/mediatypes.h"
+#include "media/base/codec.h"
+#include "media/base/cryptoparams.h"
+#include "media/base/mediachannel.h"
+#include "media/base/mediaconstants.h"
+#include "media/base/mediaengine.h"  // For DataChannelType
+#include "media/base/streamparams.h"
+#include "p2p/base/sessiondescription.h"
+#include "p2p/base/jseptransport.h"
+#include "p2p/base/transportdescriptionfactory.h"
 
 namespace cricket {
 
@@ -651,4 +651,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_MEDIASESSION_H_
+#endif  // PC_MEDIASESSION_H_

pc/mediasession_unittest.cc

diff --git a/pc/mediasession_unittest.cc b/pc/mediasession_unittest.cc
index 28883f2..03ef0d8 100644
--- a/pc/mediasession_unittest.cc
+++ b/pc/mediasession_unittest.cc
@@ -12,18 +12,18 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/testutils.h"
-#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/p2p/base/transportdescription.h"
-#include "webrtc/p2p/base/transportinfo.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/pc/srtpfilter.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fakesslidentity.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/messagedigest.h"
-#include "webrtc/rtc_base/ssladapter.h"
+#include "media/base/codec.h"
+#include "media/base/testutils.h"
+#include "p2p/base/p2pconstants.h"
+#include "p2p/base/transportdescription.h"
+#include "p2p/base/transportinfo.h"
+#include "pc/mediasession.h"
+#include "pc/srtpfilter.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/messagedigest.h"
+#include "rtc_base/ssladapter.h"
 
 #define ASSERT_CRYPTO(cd, s, cs) \
     ASSERT_EQ(s, cd->cryptos().size()); \

pc/mediastream.cc

diff --git a/pc/mediastream.cc b/pc/mediastream.cc
index c13d80d..0e24ee6 100644
--- a/pc/mediastream.cc
+++ b/pc/mediastream.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/mediastream.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "pc/mediastream.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
 
 namespace webrtc {
 

pc/mediastream.h

diff --git a/pc/mediastream.h b/pc/mediastream.h
index 56fbed9..081b8c9 100644
--- a/pc/mediastream.h
+++ b/pc/mediastream.h
@@ -10,14 +10,14 @@
 
 // This file contains the implementation of MediaStreamInterface interface.
 
-#ifndef WEBRTC_PC_MEDIASTREAM_H_
-#define WEBRTC_PC_MEDIASTREAM_H_
+#ifndef PC_MEDIASTREAM_H_
+#define PC_MEDIASTREAM_H_
 
 #include <string>
 #include <vector>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/notifier.h"
+#include "api/mediastreaminterface.h"
+#include "api/notifier.h"
 
 namespace webrtc {
 
@@ -55,4 +55,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_MEDIASTREAM_H_
+#endif  // PC_MEDIASTREAM_H_

pc/mediastream_unittest.cc

diff --git a/pc/mediastream_unittest.cc b/pc/mediastream_unittest.cc
index 1a96a56..cfd1b50 100644
--- a/pc/mediastream_unittest.cc
+++ b/pc/mediastream_unittest.cc
@@ -10,14 +10,14 @@
 
 #include <string>
 
-#include "webrtc/pc/audiotrack.h"
-#include "webrtc/pc/mediastream.h"
-#include "webrtc/pc/test/fakevideotracksource.h"
-#include "webrtc/pc/videotrack.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
+#include "pc/audiotrack.h"
+#include "pc/mediastream.h"
+#include "pc/test/fakevideotracksource.h"
+#include "pc/videotrack.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/refcount.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
 
 static const char kStreamLabel1[] = "local_stream_1";
 static const char kVideoTrackId[] = "dummy_video_cam_1";

pc/mediastreamobserver.cc

diff --git a/pc/mediastreamobserver.cc b/pc/mediastreamobserver.cc
index bf17582..c0344ef 100644
--- a/pc/mediastreamobserver.cc
+++ b/pc/mediastreamobserver.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/mediastreamobserver.h"
+#include "pc/mediastreamobserver.h"
 
 #include <algorithm>
 

pc/mediastreamobserver.h

diff --git a/pc/mediastreamobserver.h b/pc/mediastreamobserver.h
index d80c732..1aed50b 100644
--- a/pc/mediastreamobserver.h
+++ b/pc/mediastreamobserver.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_MEDIASTREAMOBSERVER_H_
-#define WEBRTC_PC_MEDIASTREAMOBSERVER_H_
+#ifndef PC_MEDIASTREAMOBSERVER_H_
+#define PC_MEDIASTREAMOBSERVER_H_
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "api/mediastreaminterface.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/sigslot.h"
 
 namespace webrtc {
 
@@ -45,4 +45,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_MEDIASTREAMOBSERVER_H_
+#endif  // PC_MEDIASTREAMOBSERVER_H_

pc/mediastreamtrack.h

diff --git a/pc/mediastreamtrack.h b/pc/mediastreamtrack.h
index 0fb2de2..33ffbe2 100644
--- a/pc/mediastreamtrack.h
+++ b/pc/mediastreamtrack.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_MEDIASTREAMTRACK_H_
-#define WEBRTC_PC_MEDIASTREAMTRACK_H_
+#ifndef PC_MEDIASTREAMTRACK_H_
+#define PC_MEDIASTREAMTRACK_H_
 
 #include <string>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/notifier.h"
+#include "api/mediastreaminterface.h"
+#include "api/notifier.h"
 
 namespace webrtc {
 
@@ -59,4 +59,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_MEDIASTREAMTRACK_H_
+#endif  // PC_MEDIASTREAMTRACK_H_

pc/peerconnection.cc

diff --git a/pc/peerconnection.cc b/pc/peerconnection.cc
index 64b842b..91d0c90 100644
--- a/pc/peerconnection.cc
+++ b/pc/peerconnection.cc
@@ -8,39 +8,39 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/peerconnection.h"
+#include "pc/peerconnection.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
-#include "webrtc/api/jsepicecandidate.h"
-#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/api/mediastreamproxy.h"
-#include "webrtc/api/mediastreamtrackproxy.h"
-#include "webrtc/call/call.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/sctp/sctptransport.h"
-#include "webrtc/pc/audiotrack.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/pc/dtmfsender.h"
-#include "webrtc/pc/mediastream.h"
-#include "webrtc/pc/mediastreamobserver.h"
-#include "webrtc/pc/remoteaudiosource.h"
-#include "webrtc/pc/rtpreceiver.h"
-#include "webrtc/pc/rtpsender.h"
-#include "webrtc/pc/streamcollection.h"
-#include "webrtc/pc/videocapturertracksource.h"
-#include "webrtc/pc/videotrack.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/trace_event.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
+#include "api/jsepicecandidate.h"
+#include "api/jsepsessiondescription.h"
+#include "api/mediaconstraintsinterface.h"
+#include "api/mediastreamproxy.h"
+#include "api/mediastreamtrackproxy.h"
+#include "call/call.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/sctp/sctptransport.h"
+#include "pc/audiotrack.h"
+#include "pc/channelmanager.h"
+#include "pc/dtmfsender.h"
+#include "pc/mediastream.h"
+#include "pc/mediastreamobserver.h"
+#include "pc/remoteaudiosource.h"
+#include "pc/rtpreceiver.h"
+#include "pc/rtpsender.h"
+#include "pc/streamcollection.h"
+#include "pc/videocapturertracksource.h"
+#include "pc/videotrack.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/stringencode.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/trace_event.h"
+#include "system_wrappers/include/clock.h"
+#include "system_wrappers/include/field_trial.h"
 
 namespace {
 

pc/peerconnection.h

diff --git a/pc/peerconnection.h b/pc/peerconnection.h
index 5889629..2d6be60 100644
--- a/pc/peerconnection.h
+++ b/pc/peerconnection.h
@@ -8,23 +8,23 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_PEERCONNECTION_H_
-#define WEBRTC_PC_PEERCONNECTION_H_
+#ifndef PC_PEERCONNECTION_H_
+#define PC_PEERCONNECTION_H_
 
 #include <string>
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/pc/iceserverparsing.h"
-#include "webrtc/pc/peerconnectionfactory.h"
-#include "webrtc/pc/rtcstatscollector.h"
-#include "webrtc/pc/rtpreceiver.h"
-#include "webrtc/pc/rtpsender.h"
-#include "webrtc/pc/statscollector.h"
-#include "webrtc/pc/streamcollection.h"
-#include "webrtc/pc/webrtcsession.h"
+#include "api/peerconnectioninterface.h"
+#include "pc/iceserverparsing.h"
+#include "pc/peerconnectionfactory.h"
+#include "pc/rtcstatscollector.h"
+#include "pc/rtpreceiver.h"
+#include "pc/rtpsender.h"
+#include "pc/statscollector.h"
+#include "pc/streamcollection.h"
+#include "pc/webrtcsession.h"
 
 namespace webrtc {
 
@@ -446,4 +446,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_PEERCONNECTION_H_
+#endif  // PC_PEERCONNECTION_H_

pc/peerconnection_integrationtest.cc

diff --git a/pc/peerconnection_integrationtest.cc b/pc/peerconnection_integrationtest.cc
index 6760b14..57f9e73 100644
--- a/pc/peerconnection_integrationtest.cc
+++ b/pc/peerconnection_integrationtest.cc
@@ -22,34 +22,34 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/api/fakemetricsobserver.h"
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/media/engine/fakewebrtcvideoengine.h"
-#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/p2p/base/portinterface.h"
-#include "webrtc/p2p/base/sessiondescription.h"
-#include "webrtc/p2p/base/testturnserver.h"
-#include "webrtc/p2p/client/basicportallocator.h"
-#include "webrtc/pc/dtmfsender.h"
-#include "webrtc/pc/localaudiosource.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/pc/peerconnection.h"
-#include "webrtc/pc/peerconnectionfactory.h"
-#include "webrtc/pc/test/fakeaudiocapturemodule.h"
-#include "webrtc/pc/test/fakeperiodicvideocapturer.h"
-#include "webrtc/pc/test/fakertccertificategenerator.h"
-#include "webrtc/pc/test/fakevideotrackrenderer.h"
-#include "webrtc/pc/test/mockpeerconnectionobservers.h"
-#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/rtc_base/fakenetwork.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "api/fakemetricsobserver.h"
+#include "api/mediastreaminterface.h"
+#include "api/peerconnectioninterface.h"
+#include "api/test/fakeconstraints.h"
+#include "media/engine/fakewebrtcvideoengine.h"
+#include "p2p/base/p2pconstants.h"
+#include "p2p/base/portinterface.h"
+#include "p2p/base/sessiondescription.h"
+#include "p2p/base/testturnserver.h"
+#include "p2p/client/basicportallocator.h"
+#include "pc/dtmfsender.h"
+#include "pc/localaudiosource.h"
+#include "pc/mediasession.h"
+#include "pc/peerconnection.h"
+#include "pc/peerconnectionfactory.h"
+#include "pc/test/fakeaudiocapturemodule.h"
+#include "pc/test/fakeperiodicvideocapturer.h"
+#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/fakevideotrackrenderer.h"
+#include "pc/test/mockpeerconnectionobservers.h"
+#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/fakenetwork.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/helpers.h"
+#include "rtc_base/ssladapter.h"
+#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/virtualsocketserver.h"
 
 using cricket::ContentInfo;
 using cricket::FakeWebRtcVideoDecoder;

pc/peerconnectionendtoend_unittest.cc

diff --git a/pc/peerconnectionendtoend_unittest.cc b/pc/peerconnectionendtoend_unittest.cc
index f7cd91f..1dca5ff 100644
--- a/pc/peerconnectionendtoend_unittest.cc
+++ b/pc/peerconnectionendtoend_unittest.cc
@@ -10,24 +10,24 @@
 
 #include <memory>
 
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/ptr_util.h"
+#include "rtc_base/ssladapter.h"
+#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/stringencode.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/thread.h"
 #ifdef WEBRTC_ANDROID
-#include "webrtc/pc/test/androidtestinitializer.h"
+#include "pc/test/androidtestinitializer.h"
 #endif
-#include "webrtc/pc/test/peerconnectiontestwrapper.h"
+#include "pc/test/peerconnectiontestwrapper.h"
 // Notice that mockpeerconnectionobservers.h must be included after the above!
-#include "webrtc/pc/test/mockpeerconnectionobservers.h"
-#include "webrtc/test/mock_audio_decoder.h"
-#include "webrtc/test/mock_audio_decoder_factory.h"
+#include "pc/test/mockpeerconnectionobservers.h"
+#include "test/mock_audio_decoder.h"
+#include "test/mock_audio_decoder_factory.h"
 
 using testing::AtLeast;
 using testing::Invoke;

pc/peerconnectionfactory.cc

diff --git a/pc/peerconnectionfactory.cc b/pc/peerconnectionfactory.cc
index 2ff95f7..cb88e25 100644
--- a/pc/peerconnectionfactory.cc
+++ b/pc/peerconnectionfactory.cc
@@ -8,36 +8,36 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/peerconnectionfactory.h"
+#include "pc/peerconnectionfactory.h"
 
 #include <utility>
 
-#include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/api/mediastreamproxy.h"
-#include "webrtc/api/mediastreamtrackproxy.h"
-#include "webrtc/api/peerconnectionfactoryproxy.h"
-#include "webrtc/api/peerconnectionproxy.h"
-#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/ptr_util.h"
+#include "api/mediaconstraintsinterface.h"
+#include "api/mediastreamproxy.h"
+#include "api/mediastreamtrackproxy.h"
+#include "api/peerconnectionfactoryproxy.h"
+#include "api/peerconnectionproxy.h"
+#include "api/videosourceproxy.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#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 "webrtc/media/engine/webrtcmediaengine.h"             // nogncheck
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h"     // nogncheck
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"     // nogncheck
-#include "webrtc/modules/audio_device/include/audio_device.h"  // nogncheck
-#include "webrtc/p2p/base/basicpacketsocketfactory.h"
-#include "webrtc/p2p/client/basicportallocator.h"
-#include "webrtc/pc/audiotrack.h"
-#include "webrtc/pc/localaudiosource.h"
-#include "webrtc/pc/mediastream.h"
-#include "webrtc/pc/peerconnection.h"
-#include "webrtc/pc/videocapturertracksource.h"
-#include "webrtc/pc/videotrack.h"
+#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 "p2p/base/basicpacketsocketfactory.h"
+#include "p2p/client/basicportallocator.h"
+#include "pc/audiotrack.h"
+#include "pc/localaudiosource.h"
+#include "pc/mediastream.h"
+#include "pc/peerconnection.h"
+#include "pc/videocapturertracksource.h"
+#include "pc/videotrack.h"
 
 namespace webrtc {
 

pc/peerconnectionfactory.h

diff --git a/pc/peerconnectionfactory.h b/pc/peerconnectionfactory.h
index 82440e7..dc62137 100644
--- a/pc/peerconnectionfactory.h
+++ b/pc/peerconnectionfactory.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_PEERCONNECTIONFACTORY_H_
-#define WEBRTC_PC_PEERCONNECTIONFACTORY_H_
+#ifndef PC_PEERCONNECTIONFACTORY_H_
+#define PC_PEERCONNECTIONFACTORY_H_
 
 #include <memory>
 #include <string>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/rtc_base/rtccertificategenerator.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/thread.h"
+#include "api/mediastreaminterface.h"
+#include "api/peerconnectioninterface.h"
+#include "pc/channelmanager.h"
+#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/thread.h"
 
 namespace rtc {
 class BasicNetworkManager;
@@ -154,4 +154,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_PEERCONNECTIONFACTORY_H_
+#endif  // PC_PEERCONNECTIONFACTORY_H_

pc/peerconnectionfactory_unittest.cc

diff --git a/pc/peerconnectionfactory_unittest.cc b/pc/peerconnectionfactory_unittest.cc
index cbabc25..36553a7 100644
--- a/pc/peerconnectionfactory_unittest.cc
+++ b/pc/peerconnectionfactory_unittest.cc
@@ -12,19 +12,19 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/media/base/fakevideocapturer.h"
-#include "webrtc/media/engine/webrtccommon.h"
-#include "webrtc/media/engine/webrtcvoe.h"
-#include "webrtc/p2p/base/fakeportallocator.h"
-#include "webrtc/pc/peerconnectionfactory.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/thread.h"
+#include "api/mediastreaminterface.h"
+#include "media/base/fakevideocapturer.h"
+#include "media/engine/webrtccommon.h"
+#include "media/engine/webrtcvoe.h"
+#include "p2p/base/fakeportallocator.h"
+#include "pc/peerconnectionfactory.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/thread.h"
 #ifdef WEBRTC_ANDROID
-#include "webrtc/pc/test/androidtestinitializer.h"
+#include "pc/test/androidtestinitializer.h"
 #endif
-#include "webrtc/pc/test/fakertccertificategenerator.h"
-#include "webrtc/pc/test/fakevideotrackrenderer.h"
+#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/fakevideotrackrenderer.h"
 
 using webrtc::DataChannelInterface;
 using webrtc::FakeVideoTrackRenderer;

pc/peerconnectioninterface_unittest.cc

diff --git a/pc/peerconnectioninterface_unittest.cc b/pc/peerconnectioninterface_unittest.cc
index ccf64d2..c1facac 100644
--- a/pc/peerconnectioninterface_unittest.cc
+++ b/pc/peerconnectioninterface_unittest.cc
@@ -14,41 +14,41 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/media/base/fakevideocapturer.h"
-#include "webrtc/media/engine/webrtcmediaengine.h"
-#include "webrtc/media/sctp/sctptransportinternal.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/p2p/base/fakeportallocator.h"
-#include "webrtc/pc/audiotrack.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/pc/mediastream.h"
-#include "webrtc/pc/peerconnection.h"
-#include "webrtc/pc/streamcollection.h"
-#include "webrtc/pc/test/fakeaudiocapturemodule.h"
-#include "webrtc/pc/test/fakertccertificategenerator.h"
-#include "webrtc/pc/test/fakevideotracksource.h"
-#include "webrtc/pc/test/mockpeerconnectionobservers.h"
-#include "webrtc/pc/test/testsdpstrings.h"
-#include "webrtc/pc/videocapturertracksource.h"
-#include "webrtc/pc/videotrack.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
-#include "webrtc/test/gmock.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/jsepsessiondescription.h"
+#include "api/mediastreaminterface.h"
+#include "api/peerconnectioninterface.h"
+#include "api/rtpreceiverinterface.h"
+#include "api/rtpsenderinterface.h"
+#include "api/test/fakeconstraints.h"
+#include "media/base/fakevideocapturer.h"
+#include "media/engine/webrtcmediaengine.h"
+#include "media/sctp/sctptransportinternal.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "p2p/base/fakeportallocator.h"
+#include "pc/audiotrack.h"
+#include "pc/mediasession.h"
+#include "pc/mediastream.h"
+#include "pc/peerconnection.h"
+#include "pc/streamcollection.h"
+#include "pc/test/fakeaudiocapturemodule.h"
+#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/fakevideotracksource.h"
+#include "pc/test/mockpeerconnectionobservers.h"
+#include "pc/test/testsdpstrings.h"
+#include "pc/videocapturertracksource.h"
+#include "pc/videotrack.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/ssladapter.h"
+#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/virtualsocketserver.h"
+#include "test/gmock.h"
 
 #ifdef WEBRTC_ANDROID
-#include "webrtc/pc/test/androidtestinitializer.h"
+#include "pc/test/androidtestinitializer.h"
 #endif
 
 static const char kStreamLabel1[] = "local_stream_1";

pc/proxy_unittest.cc

diff --git a/pc/proxy_unittest.cc b/pc/proxy_unittest.cc
index c21599d..00d2195 100644
--- a/pc/proxy_unittest.cc
+++ b/pc/proxy_unittest.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/api/proxy.h"
+#include "api/proxy.h"
 
 #include <memory>
 #include <string>
 
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/test/gmock.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/refcount.h"
+#include "rtc_base/thread.h"
+#include "test/gmock.h"
 
 using ::testing::_;
 using ::testing::DoAll;

pc/quicdatachannel.cc

diff --git a/pc/quicdatachannel.cc b/pc/quicdatachannel.cc
index ab8675d..3f09b5a 100644
--- a/pc/quicdatachannel.cc
+++ b/pc/quicdatachannel.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/quicdatachannel.h"
+#include "pc/quicdatachannel.h"
 
-#include "webrtc/p2p/quic/quictransportchannel.h"
-#include "webrtc/p2p/quic/reliablequicstream.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/bytebuffer.h"
-#include "webrtc/rtc_base/copyonwritebuffer.h"
-#include "webrtc/rtc_base/logging.h"
+#include "p2p/quic/quictransportchannel.h"
+#include "p2p/quic/reliablequicstream.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/bytebuffer.h"
+#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/logging.h"
 
 namespace webrtc {
 

pc/quicdatachannel.h

diff --git a/pc/quicdatachannel.h b/pc/quicdatachannel.h
index f580c4b..347d227 100644
--- a/pc/quicdatachannel.h
+++ b/pc/quicdatachannel.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_QUICDATACHANNEL_H_
-#define WEBRTC_PC_QUICDATACHANNEL_H_
+#ifndef PC_QUICDATACHANNEL_H_
+#define PC_QUICDATACHANNEL_H_
 
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 
-#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/thread.h"
+#include "api/datachannelinterface.h"
+#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/sigslot.h"
+#include "rtc_base/thread.h"
 
 namespace cricket {
 class QuicTransportChannel;
@@ -217,4 +217,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_QUICDATACHANNEL_H_
+#endif  // PC_QUICDATACHANNEL_H_

pc/quicdatachannel_unittest.cc

diff --git a/pc/quicdatachannel_unittest.cc b/pc/quicdatachannel_unittest.cc
index 173d6df..d1e34f5 100644
--- a/pc/quicdatachannel_unittest.cc
+++ b/pc/quicdatachannel_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/quicdatachannel.h"
+#include "pc/quicdatachannel.h"
 
 #include <map>
 #include <memory>
@@ -16,12 +16,12 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/p2p/base/faketransportcontroller.h"
-#include "webrtc/p2p/quic/quictransportchannel.h"
-#include "webrtc/p2p/quic/reliablequicstream.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "p2p/base/faketransportcontroller.h"
+#include "p2p/quic/quictransportchannel.h"
+#include "p2p/quic/reliablequicstream.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/scoped_ref_ptr.h"
 
 using cricket::FakeTransportChannel;
 using cricket::QuicTransportChannel;

pc/quicdatatransport.cc

diff --git a/pc/quicdatatransport.cc b/pc/quicdatatransport.cc
index 142085e..5c46af7 100644
--- a/pc/quicdatatransport.cc
+++ b/pc/quicdatatransport.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/quicdatatransport.h"
+#include "pc/quicdatatransport.h"
 
-#include "webrtc/p2p/quic/quictransportchannel.h"
-#include "webrtc/p2p/quic/reliablequicstream.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/logging.h"
+#include "p2p/quic/quictransportchannel.h"
+#include "p2p/quic/reliablequicstream.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/logging.h"
 
 namespace webrtc {
 

pc/quicdatatransport.h

diff --git a/pc/quicdatatransport.h b/pc/quicdatatransport.h
index 946e6b0..b534b27 100644
--- a/pc/quicdatatransport.h
+++ b/pc/quicdatatransport.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_QUICDATATRANSPORT_H_
-#define WEBRTC_PC_QUICDATATRANSPORT_H_
+#ifndef PC_QUICDATATRANSPORT_H_
+#define PC_QUICDATATRANSPORT_H_
 
 #include <string>
 #include <unordered_map>
 
-#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/p2p/base/transportcontroller.h"
-#include "webrtc/pc/quicdatachannel.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/thread.h"
+#include "api/datachannelinterface.h"
+#include "p2p/base/transportcontroller.h"
+#include "pc/quicdatachannel.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/sigslot.h"
+#include "rtc_base/thread.h"
 
 namespace cricket {
 class QuicTransportChannel;
@@ -112,4 +112,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_QUICDATATRANSPORT_H_
+#endif  // PC_QUICDATATRANSPORT_H_

pc/quicdatatransport_unittest.cc

diff --git a/pc/quicdatatransport_unittest.cc b/pc/quicdatatransport_unittest.cc
index 8d6c189..2f6d13f 100644
--- a/pc/quicdatatransport_unittest.cc
+++ b/pc/quicdatatransport_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/quicdatatransport.h"
+#include "pc/quicdatatransport.h"
 
 #include <memory>
 #include <set>
@@ -16,12 +16,12 @@
 #include <unordered_map>
 #include <vector>
 
-#include "webrtc/p2p/base/faketransportcontroller.h"
-#include "webrtc/p2p/quic/quictransportchannel.h"
-#include "webrtc/p2p/quic/reliablequicstream.h"
-#include "webrtc/pc/quicdatachannel.h"
-#include "webrtc/rtc_base/bytebuffer.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "p2p/base/faketransportcontroller.h"
+#include "p2p/quic/quictransportchannel.h"
+#include "p2p/quic/reliablequicstream.h"
+#include "pc/quicdatachannel.h"
+#include "rtc_base/bytebuffer.h"
+#include "rtc_base/gunit.h"
 
 using webrtc::DataBuffer;
 using webrtc::DataChannelInit;

pc/remoteaudiosource.cc

diff --git a/pc/remoteaudiosource.cc b/pc/remoteaudiosource.cc
index f6f23c3..6fcc2ab 100644
--- a/pc/remoteaudiosource.cc
+++ b/pc/remoteaudiosource.cc
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/remoteaudiosource.h"
+#include "pc/remoteaudiosource.h"
 
 #include <algorithm>
 #include <functional>
 #include <memory>
 #include <utility>
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/thread.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/thread.h"
 
 namespace webrtc {
 

pc/remoteaudiosource.h

diff --git a/pc/remoteaudiosource.h b/pc/remoteaudiosource.h
index 14c16a7..3759d6f 100644
--- a/pc/remoteaudiosource.h
+++ b/pc/remoteaudiosource.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_REMOTEAUDIOSOURCE_H_
-#define WEBRTC_PC_REMOTEAUDIOSOURCE_H_
+#ifndef PC_REMOTEAUDIOSOURCE_H_
+#define PC_REMOTEAUDIOSOURCE_H_
 
 #include <list>
 #include <string>
 
-#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/api/notifier.h"
-#include "webrtc/pc/channel.h"
-#include "webrtc/rtc_base/criticalsection.h"
+#include "api/call/audio_sink.h"
+#include "api/notifier.h"
+#include "pc/channel.h"
+#include "rtc_base/criticalsection.h"
 
 namespace rtc {
 struct Message;
@@ -73,4 +73,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_REMOTEAUDIOSOURCE_H_
+#endif  // PC_REMOTEAUDIOSOURCE_H_

pc/rtcpmuxfilter.cc

diff --git a/pc/rtcpmuxfilter.cc b/pc/rtcpmuxfilter.cc
index 67293b3..b37b0d3 100644
--- a/pc/rtcpmuxfilter.cc
+++ b/pc/rtcpmuxfilter.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/rtcpmuxfilter.h"
+#include "pc/rtcpmuxfilter.h"
 
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/logging.h"
 
 namespace cricket {
 

pc/rtcpmuxfilter.h

diff --git a/pc/rtcpmuxfilter.h b/pc/rtcpmuxfilter.h
index 95a9d5f..c2dad5b 100644
--- a/pc/rtcpmuxfilter.h
+++ b/pc/rtcpmuxfilter.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_RTCPMUXFILTER_H_
-#define WEBRTC_PC_RTCPMUXFILTER_H_
+#ifndef PC_RTCPMUXFILTER_H_
+#define PC_RTCPMUXFILTER_H_
 
-#include "webrtc/p2p/base/sessiondescription.h"
+#include "p2p/base/sessiondescription.h"
 
 namespace cricket {
 
@@ -75,4 +75,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_RTCPMUXFILTER_H_
+#endif  // PC_RTCPMUXFILTER_H_

pc/rtcpmuxfilter_unittest.cc

diff --git a/pc/rtcpmuxfilter_unittest.cc b/pc/rtcpmuxfilter_unittest.cc
index bd2fea1..555ab5c 100644
--- a/pc/rtcpmuxfilter_unittest.cc
+++ b/pc/rtcpmuxfilter_unittest.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/rtcpmuxfilter.h"
-#include "webrtc/media/base/testutils.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "pc/rtcpmuxfilter.h"
+#include "media/base/testutils.h"
+#include "rtc_base/gunit.h"
 
 TEST(RtcpMuxFilterTest, IsActiveSender) {
   cricket::RtcpMuxFilter filter;

pc/rtcstats_integrationtest.cc

diff --git a/pc/rtcstats_integrationtest.cc b/pc/rtcstats_integrationtest.cc
index 7967633..a498dc8 100644
--- a/pc/rtcstats_integrationtest.cc
+++ b/pc/rtcstats_integrationtest.cc
@@ -11,21 +11,21 @@
 #include <set>
 #include <vector>
 
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/stats/rtcstats_objects.h"
-#include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/pc/test/peerconnectiontestwrapper.h"
-#include "webrtc/pc/test/rtcstatsobtainer.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/event_tracer.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/refcountedobject.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/trace_event.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "api/datachannelinterface.h"
+#include "api/peerconnectioninterface.h"
+#include "api/stats/rtcstats_objects.h"
+#include "api/stats/rtcstatsreport.h"
+#include "pc/test/peerconnectiontestwrapper.h"
+#include "pc/test/rtcstatsobtainer.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/event_tracer.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/refcountedobject.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/trace_event.h"
+#include "rtc_base/virtualsocketserver.h"
 
 namespace webrtc {
 

pc/rtcstatscollector.cc

diff --git a/pc/rtcstatscollector.cc b/pc/rtcstatscollector.cc
index 5b84ea5..9a6b26c 100644
--- a/pc/rtcstatscollector.cc
+++ b/pc/rtcstatscollector.cc
@@ -8,25 +8,25 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/rtcstatscollector.h"
+#include "pc/rtcstatscollector.h"
 
 #include <memory>
 #include <sstream>
 #include <utility>
 #include <vector>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/p2p/base/port.h"
-#include "webrtc/pc/peerconnection.h"
-#include "webrtc/pc/webrtcsession.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "api/mediastreaminterface.h"
+#include "api/peerconnectioninterface.h"
+#include "media/base/mediachannel.h"
+#include "p2p/base/candidate.h"
+#include "p2p/base/p2pconstants.h"
+#include "p2p/base/port.h"
+#include "pc/peerconnection.h"
+#include "pc/webrtcsession.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/timeutils.h"
+#include "rtc_base/trace_event.h"
 
 namespace webrtc {
 

pc/rtcstatscollector.h

diff --git a/pc/rtcstatscollector.h b/pc/rtcstatscollector.h
index 5ba4bfd..a3a9c1e 100644
--- a/pc/rtcstatscollector.h
+++ b/pc/rtcstatscollector.h
@@ -8,28 +8,28 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_RTCSTATSCOLLECTOR_H_
-#define WEBRTC_PC_RTCSTATSCOLLECTOR_H_
+#ifndef PC_RTCSTATSCOLLECTOR_H_
+#define PC_RTCSTATSCOLLECTOR_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
 
-#include "webrtc/api/optional.h"
-#include "webrtc/api/stats/rtcstats_objects.h"
-#include "webrtc/api/stats/rtcstatscollectorcallback.h"
-#include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/call/call.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/pc/datachannel.h"
-#include "webrtc/pc/trackmediainfomap.h"
-#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "api/optional.h"
+#include "api/stats/rtcstats_objects.h"
+#include "api/stats/rtcstatscollectorcallback.h"
+#include "api/stats/rtcstatsreport.h"
+#include "call/call.h"
+#include "media/base/mediachannel.h"
+#include "pc/datachannel.h"
+#include "pc/trackmediainfomap.h"
+#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/refcount.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/sigslot.h"
+#include "rtc_base/sslidentity.h"
+#include "rtc_base/timeutils.h"
 
 namespace cricket {
 class Candidate;
@@ -194,4 +194,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_RTCSTATSCOLLECTOR_H_
+#endif  // PC_RTCSTATSCOLLECTOR_H_

pc/rtcstatscollector_unittest.cc

diff --git a/pc/rtcstatscollector_unittest.cc b/pc/rtcstatscollector_unittest.cc
index cc258ed..48048c2 100644
--- a/pc/rtcstatscollector_unittest.cc
+++ b/pc/rtcstatscollector_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/rtcstatscollector.h"
+#include "pc/rtcstatscollector.h"
 
 #include <initializer_list>
 #include <memory>
@@ -16,32 +16,32 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/api/rtpparameters.h"
-#include "webrtc/api/stats/rtcstats_objects.h"
-#include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/api/test/mock_rtpreceiver.h"
-#include "webrtc/api/test/mock_rtpsender.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/test/mock_mediachannel.h"
-#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/p2p/base/port.h"
-#include "webrtc/pc/mediastream.h"
-#include "webrtc/pc/mediastreamtrack.h"
-#include "webrtc/pc/test/mock_datachannel.h"
-#include "webrtc/pc/test/mock_peerconnection.h"
-#include "webrtc/pc/test/mock_webrtcsession.h"
-#include "webrtc/pc/test/rtcstatsobtainer.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/fakesslidentity.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/socketaddress.h"
-#include "webrtc/rtc_base/thread_checker.h"
-#include "webrtc/rtc_base/timedelta.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "api/jsepsessiondescription.h"
+#include "api/rtpparameters.h"
+#include "api/stats/rtcstats_objects.h"
+#include "api/stats/rtcstatsreport.h"
+#include "api/test/mock_rtpreceiver.h"
+#include "api/test/mock_rtpsender.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/test/mock_mediachannel.h"
+#include "p2p/base/p2pconstants.h"
+#include "p2p/base/port.h"
+#include "pc/mediastream.h"
+#include "pc/mediastreamtrack.h"
+#include "pc/test/mock_datachannel.h"
+#include "pc/test/mock_peerconnection.h"
+#include "pc/test/mock_webrtcsession.h"
+#include "pc/test/rtcstatsobtainer.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/fakeclock.h"
+#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/socketaddress.h"
+#include "rtc_base/thread_checker.h"
+#include "rtc_base/timedelta.h"
+#include "rtc_base/timeutils.h"
 
 using testing::_;
 using testing::Invoke;

pc/rtpreceiver.cc

diff --git a/pc/rtpreceiver.cc b/pc/rtpreceiver.cc
index 99c4010..4f88f1c 100644
--- a/pc/rtpreceiver.cc
+++ b/pc/rtpreceiver.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/rtpreceiver.h"
+#include "pc/rtpreceiver.h"
 
-#include "webrtc/api/mediastreamtrackproxy.h"
-#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/pc/audiotrack.h"
-#include "webrtc/pc/videotrack.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "api/mediastreamtrackproxy.h"
+#include "api/videosourceproxy.h"
+#include "pc/audiotrack.h"
+#include "pc/videotrack.h"
+#include "rtc_base/trace_event.h"
 
 namespace webrtc {
 

pc/rtpreceiver.h

diff --git a/pc/rtpreceiver.h b/pc/rtpreceiver.h
index 9809b73..6b9ca99 100644
--- a/pc/rtpreceiver.h
+++ b/pc/rtpreceiver.h
@@ -12,21 +12,21 @@
 // An RtpReceiver associates a MediaStreamTrackInterface with an underlying
 // transport (provided by cricket::VoiceChannel/cricket::VideoChannel)
 
-#ifndef WEBRTC_PC_RTPRECEIVER_H_
-#define WEBRTC_PC_RTPRECEIVER_H_
+#ifndef PC_RTPRECEIVER_H_
+#define PC_RTPRECEIVER_H_
 
 #include <stdint.h>
 
 #include <string>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/media/base/videobroadcaster.h"
-#include "webrtc/pc/channel.h"
-#include "webrtc/pc/remoteaudiosource.h"
-#include "webrtc/pc/videotracksource.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "api/mediastreaminterface.h"
+#include "api/rtpreceiverinterface.h"
+#include "media/base/videobroadcaster.h"
+#include "pc/channel.h"
+#include "pc/remoteaudiosource.h"
+#include "pc/videotracksource.h"
+#include "rtc_base/basictypes.h"
+#include "rtc_base/sigslot.h"
 
 namespace webrtc {
 
@@ -166,4 +166,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_RTPRECEIVER_H_
+#endif  // PC_RTPRECEIVER_H_

pc/rtpsender.cc

diff --git a/pc/rtpsender.cc b/pc/rtpsender.cc
index c95befd..3d5594c 100644
--- a/pc/rtpsender.cc
+++ b/pc/rtpsender.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/rtpsender.h"
+#include "pc/rtpsender.h"
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/pc/localaudiosource.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "api/mediastreaminterface.h"
+#include "pc/localaudiosource.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/helpers.h"
+#include "rtc_base/trace_event.h"
 
 namespace webrtc {
 

pc/rtpsender.h

diff --git a/pc/rtpsender.h b/pc/rtpsender.h
index de679cf..672637f 100644
--- a/pc/rtpsender.h
+++ b/pc/rtpsender.h
@@ -12,22 +12,22 @@
 // An RtpSender associates a MediaStreamTrackInterface with an underlying
 // transport (provided by AudioProviderInterface/VideoProviderInterface)
 
-#ifndef WEBRTC_PC_RTPSENDER_H_
-#define WEBRTC_PC_RTPSENDER_H_
+#ifndef PC_RTPSENDER_H_
+#define PC_RTPSENDER_H_
 
 #include <memory>
 #include <string>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/criticalsection.h"
+#include "api/mediastreaminterface.h"
+#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 "webrtc/media/base/audiosource.h"  // nogncheck
-#include "webrtc/pc/channel.h"
-#include "webrtc/pc/dtmfsender.h"
-#include "webrtc/pc/statscollector.h"
+#include "media/base/audiosource.h"  // nogncheck
+#include "pc/channel.h"
+#include "pc/dtmfsender.h"
+#include "pc/statscollector.h"
 
 namespace webrtc {
 
@@ -258,4 +258,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_RTPSENDER_H_
+#endif  // PC_RTPSENDER_H_

pc/rtpsenderreceiver_unittest.cc

diff --git a/pc/rtpsenderreceiver_unittest.cc b/pc/rtpsenderreceiver_unittest.cc
index a00b980..b4b28bd 100644
--- a/pc/rtpsenderreceiver_unittest.cc
+++ b/pc/rtpsenderreceiver_unittest.cc
@@ -12,26 +12,26 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/engine/fakewebrtccall.h"
-#include "webrtc/p2p/base/faketransportcontroller.h"
-#include "webrtc/pc/audiotrack.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/pc/localaudiosource.h"
-#include "webrtc/pc/mediastream.h"
-#include "webrtc/pc/remoteaudiosource.h"
-#include "webrtc/pc/rtpreceiver.h"
-#include "webrtc/pc/rtpsender.h"
-#include "webrtc/pc/streamcollection.h"
-#include "webrtc/pc/test/fakevideotracksource.h"
-#include "webrtc/pc/videotrack.h"
-#include "webrtc/pc/videotracksource.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/mediachannel.h"
+#include "media/engine/fakewebrtccall.h"
+#include "p2p/base/faketransportcontroller.h"
+#include "pc/audiotrack.h"
+#include "pc/channelmanager.h"
+#include "pc/localaudiosource.h"
+#include "pc/mediastream.h"
+#include "pc/remoteaudiosource.h"
+#include "pc/rtpreceiver.h"
+#include "pc/rtpsender.h"
+#include "pc/streamcollection.h"
+#include "pc/test/fakevideotracksource.h"
+#include "pc/videotrack.h"
+#include "pc/videotracksource.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/sigslot.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
 
 using ::testing::_;
 using ::testing::Exactly;

pc/rtptransport.cc

diff --git a/pc/rtptransport.cc b/pc/rtptransport.cc
index b267832..78a2af5 100644
--- a/pc/rtptransport.cc
+++ b/pc/rtptransport.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/rtptransport.h"
+#include "pc/rtptransport.h"
 
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/p2p/base/packettransportinterface.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/copyonwritebuffer.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "media/base/rtputils.h"
+#include "p2p/base/packettransportinterface.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/trace_event.h"
 
 namespace webrtc {
 

pc/rtptransport.h

diff --git a/pc/rtptransport.h b/pc/rtptransport.h
index 94c5877..5e1aa20 100644
--- a/pc/rtptransport.h
+++ b/pc/rtptransport.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_RTPTRANSPORT_H_
-#define WEBRTC_PC_RTPTRANSPORT_H_
+#ifndef PC_RTPTRANSPORT_H_
+#define PC_RTPTRANSPORT_H_
 
-#include "webrtc/pc/bundlefilter.h"
-#include "webrtc/pc/rtptransportinternal.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "pc/bundlefilter.h"
+#include "pc/rtptransportinternal.h"
+#include "rtc_base/sigslot.h"
 
 namespace rtc {
 
@@ -112,4 +112,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_RTPTRANSPORT_H_
+#endif  // PC_RTPTRANSPORT_H_

pc/rtptransport_unittest.cc

diff --git a/pc/rtptransport_unittest.cc b/pc/rtptransport_unittest.cc
index 0ed77ee..1e1657d 100644
--- a/pc/rtptransport_unittest.cc
+++ b/pc/rtptransport_unittest.cc
@@ -10,10 +10,10 @@
 
 #include <string>
 
-#include "webrtc/p2p/base/fakepackettransport.h"
-#include "webrtc/pc/rtptransport.h"
-#include "webrtc/pc/rtptransporttestutil.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "p2p/base/fakepackettransport.h"
+#include "pc/rtptransport.h"
+#include "pc/rtptransporttestutil.h"
+#include "rtc_base/gunit.h"
 
 namespace webrtc {
 

pc/rtptransportinternal.h

diff --git a/pc/rtptransportinternal.h b/pc/rtptransportinternal.h
index 684afc4..e589619 100644
--- a/pc/rtptransportinternal.h
+++ b/pc/rtptransportinternal.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_RTPTRANSPORTINTERNAL_H_
-#define WEBRTC_PC_RTPTRANSPORTINTERNAL_H_
+#ifndef PC_RTPTRANSPORTINTERNAL_H_
+#define PC_RTPTRANSPORTINTERNAL_H_
 
-#include "webrtc/api/ortc/rtptransportinterface.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "api/ortc/rtptransportinterface.h"
+#include "rtc_base/sigslot.h"
 
 namespace rtc {
 class CopyOnWriteBuffer;
@@ -69,4 +69,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_RTPTRANSPORTINTERNAL_H_
+#endif  // PC_RTPTRANSPORTINTERNAL_H_

pc/rtptransporttestutil.h

diff --git a/pc/rtptransporttestutil.h b/pc/rtptransporttestutil.h
index 92cfaec..c2bdaad 100644
--- a/pc/rtptransporttestutil.h
+++ b/pc/rtptransporttestutil.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_RTPTRANSPORTTESTUTIL_H_
-#define WEBRTC_PC_RTPTRANSPORTTESTUTIL_H_
+#ifndef PC_RTPTRANSPORTTESTUTIL_H_
+#define PC_RTPTRANSPORTTESTUTIL_H_
 
-#include "webrtc/pc/rtptransportinternal.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "pc/rtptransportinternal.h"
+#include "rtc_base/sigslot.h"
 
 namespace webrtc {
 
@@ -41,4 +41,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_RTPTRANSPORTTESTUTIL_H_
+#endif  // PC_RTPTRANSPORTTESTUTIL_H_

pc/sctputils.cc

diff --git a/pc/sctputils.cc b/pc/sctputils.cc
index 48f380b..3433b00 100644
--- a/pc/sctputils.cc
+++ b/pc/sctputils.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/sctputils.h"
+#include "pc/sctputils.h"
 
-#include "webrtc/rtc_base/bytebuffer.h"
-#include "webrtc/rtc_base/copyonwritebuffer.h"
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/bytebuffer.h"
+#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/logging.h"
 
 namespace webrtc {
 

pc/sctputils.h

diff --git a/pc/sctputils.h b/pc/sctputils.h
index 940bd36..7a4708a 100644
--- a/pc/sctputils.h
+++ b/pc/sctputils.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_SCTPUTILS_H_
-#define WEBRTC_PC_SCTPUTILS_H_
+#ifndef PC_SCTPUTILS_H_
+#define PC_SCTPUTILS_H_
 
 #include <string>
 
-#include "webrtc/api/datachannelinterface.h"
+#include "api/datachannelinterface.h"
 
 namespace rtc {
 class CopyOnWriteBuffer;
@@ -38,4 +38,4 @@
 void WriteDataChannelOpenAckMessage(rtc::CopyOnWriteBuffer* payload);
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_SCTPUTILS_H_
+#endif  // PC_SCTPUTILS_H_

pc/sctputils_unittest.cc

diff --git a/pc/sctputils_unittest.cc b/pc/sctputils_unittest.cc
index 5ef3fcb..86cdc47 100644
--- a/pc/sctputils_unittest.cc
+++ b/pc/sctputils_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/sctputils.h"
-#include "webrtc/rtc_base/bytebuffer.h"
-#include "webrtc/rtc_base/copyonwritebuffer.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "pc/sctputils.h"
+#include "rtc_base/bytebuffer.h"
+#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/gunit.h"
 
 class SctpUtilsTest : public testing::Test {
  public:

pc/srtpfilter.cc

diff --git a/pc/srtpfilter.cc b/pc/srtpfilter.cc
index 560dac8..fbea08f 100644
--- a/pc/srtpfilter.cc
+++ b/pc/srtpfilter.cc
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/srtpfilter.h"
+#include "pc/srtpfilter.h"
 
 #include <string.h>
 
 #include <algorithm>
 
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/pc/srtpsession.h"
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "media/base/rtputils.h"
+#include "pc/srtpsession.h"
+#include "rtc_base/base64.h"
+#include "rtc_base/byteorder.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/stringencode.h"
+#include "rtc_base/timeutils.h"
 
 namespace cricket {
 

pc/srtpfilter.h

diff --git a/pc/srtpfilter.h b/pc/srtpfilter.h
index 2a90360..ffdf637 100644
--- a/pc/srtpfilter.h
+++ b/pc/srtpfilter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_SRTPFILTER_H_
-#define WEBRTC_PC_SRTPFILTER_H_
+#ifndef PC_SRTPFILTER_H_
+#define PC_SRTPFILTER_H_
 
 #include <list>
 #include <map>
@@ -17,15 +17,15 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/api/optional.h"
-#include "webrtc/media/base/cryptoparams.h"
-#include "webrtc/p2p/base/sessiondescription.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "api/optional.h"
+#include "media/base/cryptoparams.h"
+#include "p2p/base/sessiondescription.h"
+#include "rtc_base/basictypes.h"
+#include "rtc_base/buffer.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/thread_checker.h"
 
 // Forward declaration to avoid pulling in libsrtp headers here
 struct srtp_event_data_t;
@@ -140,4 +140,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_SRTPFILTER_H_
+#endif  // PC_SRTPFILTER_H_

pc/srtpfilter_unittest.cc

diff --git a/pc/srtpfilter_unittest.cc b/pc/srtpfilter_unittest.cc
index c4ad305..a71762c 100644
--- a/pc/srtpfilter_unittest.cc
+++ b/pc/srtpfilter_unittest.cc
@@ -10,10 +10,10 @@
 
 #include <algorithm>
 
-#include "webrtc/pc/srtpfilter.h"
+#include "pc/srtpfilter.h"
 
-#include "webrtc/media/base/cryptoparams.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "media/base/cryptoparams.h"
+#include "rtc_base/gunit.h"
 
 using cricket::CryptoParams;
 using cricket::CS_LOCAL;

pc/srtpsession.cc

diff --git a/pc/srtpsession.cc b/pc/srtpsession.cc
index 67ae9a6..ba49b16 100644
--- a/pc/srtpsession.cc
+++ b/pc/srtpsession.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/srtpsession.h"
+#include "pc/srtpsession.h"
 
 #include "third_party/libsrtp/include/srtp.h"
 #include "third_party/libsrtp/include/srtp_priv.h"
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/pc/externalhmac.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "media/base/rtputils.h"
+#include "pc/externalhmac.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/sslstreamadapter.h"
 
 namespace cricket {
 

pc/srtpsession.h

diff --git a/pc/srtpsession.h b/pc/srtpsession.h
index c490c48..2d4dd6f 100644
--- a/pc/srtpsession.h
+++ b/pc/srtpsession.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_SRTPSESSION_H_
-#define WEBRTC_PC_SRTPSESSION_H_
+#ifndef PC_SRTPSESSION_H_
+#define PC_SRTPSESSION_H_
 
 #include <vector>
 
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "rtc_base/basictypes.h"
+#include "rtc_base/thread_checker.h"
 
 // Forward declaration to avoid pulling in libsrtp headers here
 struct srtp_event_data_t;
@@ -106,4 +106,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_PC_SRTPSESSION_H_
+#endif  // PC_SRTPSESSION_H_

pc/srtpsession_unittest.cc

diff --git a/pc/srtpsession_unittest.cc b/pc/srtpsession_unittest.cc
index d10989d..b89b3ad 100644
--- a/pc/srtpsession_unittest.cc
+++ b/pc/srtpsession_unittest.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/srtpsession.h"
+#include "pc/srtpsession.h"
 
 #include <string>
 
-#include "webrtc/media/base/fakertp.h"
-#include "webrtc/pc/srtptestutil.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"  // For rtc::SRTP_*
+#include "media/base/fakertp.h"
+#include "pc/srtptestutil.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/sslstreamadapter.h"  // For rtc::SRTP_*
 
 namespace rtc {
 

pc/srtptestutil.h

diff --git a/pc/srtptestutil.h b/pc/srtptestutil.h
index daf7eb0..edb3d76 100644
--- a/pc/srtptestutil.h
+++ b/pc/srtptestutil.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_SRTPTESTUTIL_H_
-#define WEBRTC_PC_SRTPTESTUTIL_H_
+#ifndef PC_SRTPTESTUTIL_H_
+#define PC_SRTPTESTUTIL_H_
 
 #include <string>
 
@@ -42,4 +42,4 @@
 
 }  // namespace rtc
 
-#endif  // WEBRTC_PC_SRTPTESTUTIL_H_
+#endif  // PC_SRTPTESTUTIL_H_

pc/srtptransport.cc

diff --git a/pc/srtptransport.cc b/pc/srtptransport.cc
index d9f054b..f3b5309 100644
--- a/pc/srtptransport.cc
+++ b/pc/srtptransport.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/srtptransport.h"
+#include "pc/srtptransport.h"
 
 #include <string>
 
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/pc/rtptransport.h"
-#include "webrtc/pc/srtpsession.h"
-#include "webrtc/rtc_base/asyncpacketsocket.h"
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/copyonwritebuffer.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "media/base/rtputils.h"
+#include "pc/rtptransport.h"
+#include "pc/srtpsession.h"
+#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/base64.h"
+#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/ptr_util.h"
+#include "rtc_base/trace_event.h"
 
 namespace webrtc {
 

pc/srtptransport.h

diff --git a/pc/srtptransport.h b/pc/srtptransport.h
index 769df06..9f20e1d 100644
--- a/pc/srtptransport.h
+++ b/pc/srtptransport.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_SRTPTRANSPORT_H_
-#define WEBRTC_PC_SRTPTRANSPORT_H_
+#ifndef PC_SRTPTRANSPORT_H_
+#define PC_SRTPTRANSPORT_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "webrtc/pc/rtptransportinternal.h"
-#include "webrtc/pc/srtpfilter.h"
-#include "webrtc/pc/srtpsession.h"
-#include "webrtc/rtc_base/checks.h"
+#include "pc/rtptransportinternal.h"
+#include "pc/srtpfilter.h"
+#include "pc/srtpsession.h"
+#include "rtc_base/checks.h"
 
 namespace webrtc {
 
@@ -195,4 +195,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_SRTPTRANSPORT_H_
+#endif  // PC_SRTPTRANSPORT_H_

pc/srtptransport_unittest.cc

diff --git a/pc/srtptransport_unittest.cc b/pc/srtptransport_unittest.cc
index e097ff1..d3bc259 100644
--- a/pc/srtptransport_unittest.cc
+++ b/pc/srtptransport_unittest.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/srtptransport.h"
+#include "pc/srtptransport.h"
 
-#include "webrtc/media/base/fakertp.h"
-#include "webrtc/p2p/base/dtlstransportinternal.h"
-#include "webrtc/p2p/base/fakepackettransport.h"
-#include "webrtc/pc/rtptransport.h"
-#include "webrtc/pc/rtptransporttestutil.h"
-#include "webrtc/pc/srtptestutil.h"
-#include "webrtc/rtc_base/asyncpacketsocket.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "media/base/fakertp.h"
+#include "p2p/base/dtlstransportinternal.h"
+#include "p2p/base/fakepackettransport.h"
+#include "pc/rtptransport.h"
+#include "pc/rtptransporttestutil.h"
+#include "pc/srtptestutil.h"
+#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/ptr_util.h"
+#include "rtc_base/sslstreamadapter.h"
 
 using rtc::kTestKey1;
 using rtc::kTestKey2;

pc/statscollector.cc

diff --git a/pc/statscollector.cc b/pc/statscollector.cc
index a14967a..070c942 100644
--- a/pc/statscollector.cc
+++ b/pc/statscollector.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/statscollector.h"
+#include "pc/statscollector.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include "webrtc/pc/channel.h"
-#include "webrtc/pc/peerconnection.h"
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/checks.h"
+#include "pc/channel.h"
+#include "pc/peerconnection.h"
+#include "rtc_base/base64.h"
+#include "rtc_base/checks.h"
 
 namespace webrtc {
 namespace {

pc/statscollector.h

diff --git a/pc/statscollector.h b/pc/statscollector.h
index 955bfdd..568d1ee 100644
--- a/pc/statscollector.h
+++ b/pc/statscollector.h
@@ -11,17 +11,17 @@
 // This file contains a class used for gathering statistics from an ongoing
 // libjingle PeerConnection.
 
-#ifndef WEBRTC_PC_STATSCOLLECTOR_H_
-#define WEBRTC_PC_STATSCOLLECTOR_H_
+#ifndef PC_STATSCOLLECTOR_H_
+#define PC_STATSCOLLECTOR_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/statstypes.h"
-#include "webrtc/pc/webrtcsession.h"
+#include "api/mediastreaminterface.h"
+#include "api/peerconnectioninterface.h"
+#include "api/statstypes.h"
+#include "pc/webrtcsession.h"
 
 namespace webrtc {
 
@@ -150,4 +150,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_STATSCOLLECTOR_H_
+#endif  // PC_STATSCOLLECTOR_H_

pc/statscollector_unittest.cc

diff --git a/pc/statscollector_unittest.cc b/pc/statscollector_unittest.cc
index 6597e95..d2d34b5 100644
--- a/pc/statscollector_unittest.cc
+++ b/pc/statscollector_unittest.cc
@@ -13,29 +13,29 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/pc/statscollector.h"
+#include "pc/statscollector.h"
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/test/mock_mediachannel.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/pc/mediastream.h"
-#include "webrtc/pc/mediastreamtrack.h"
-#include "webrtc/pc/peerconnection.h"
-#include "webrtc/pc/peerconnectionfactory.h"
-#include "webrtc/pc/test/fakedatachannelprovider.h"
-#include "webrtc/pc/test/fakevideotracksource.h"
-#include "webrtc/pc/test/mock_peerconnection.h"
-#include "webrtc/pc/test/mock_webrtcsession.h"
-#include "webrtc/pc/videotrack.h"
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/fakesslidentity.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/network.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
+#include "api/mediastreaminterface.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/test/mock_mediachannel.h"
+#include "pc/channelmanager.h"
+#include "pc/mediastream.h"
+#include "pc/mediastreamtrack.h"
+#include "pc/peerconnection.h"
+#include "pc/peerconnectionfactory.h"
+#include "pc/test/fakedatachannelprovider.h"
+#include "pc/test/fakevideotracksource.h"
+#include "pc/test/mock_peerconnection.h"
+#include "pc/test/mock_webrtcsession.h"
+#include "pc/videotrack.h"
+#include "rtc_base/base64.h"
+#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/network.h"
+#include "rtc_base/stringencode.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
 
 using testing::_;
 using testing::DoAll;

pc/streamcollection.h

diff --git a/pc/streamcollection.h b/pc/streamcollection.h
index b4d1f27..19ddca9 100644
--- a/pc/streamcollection.h
+++ b/pc/streamcollection.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_STREAMCOLLECTION_H_
-#define WEBRTC_PC_STREAMCOLLECTION_H_
+#ifndef PC_STREAMCOLLECTION_H_
+#define PC_STREAMCOLLECTION_H_
 
 #include <string>
 #include <vector>
 
-#include "webrtc/api/peerconnectioninterface.h"
+#include "api/peerconnectioninterface.h"
 
 namespace webrtc {
 
@@ -105,4 +105,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_STREAMCOLLECTION_H_
+#endif  // PC_STREAMCOLLECTION_H_

pc/test/DEPS

diff --git a/pc/test/DEPS b/pc/test/DEPS
index 17d20c1..fff21d9 100644
--- a/pc/test/DEPS
+++ b/pc/test/DEPS
@@ -2,5 +2,5 @@
   # Allow include of Chrome base/android to allow inclusion of headers needed
   # for accessing the JVM and Application context in gtest.
   "+base/android",
-  "+webrtc/modules/utility/include/jvm_android.h",
+  "+modules/utility/include/jvm_android.h",
 ]

pc/test/androidtestinitializer.cc

diff --git a/pc/test/androidtestinitializer.cc b/pc/test/androidtestinitializer.cc
index d1b0dab..c9525f8 100644
--- a/pc/test/androidtestinitializer.cc
+++ b/pc/test/androidtestinitializer.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/test/androidtestinitializer.h"
+#include "pc/test/androidtestinitializer.h"
 
 #include <pthread.h>
 
-#include "webrtc/rtc_base/ignore_wundef.h"
+#include "rtc_base/ignore_wundef.h"
 
 // Note: this dependency is dangerous since it reaches into Chromium's base.
 // There's a risk of e.g. macro clashes. This file may only be used in tests.
@@ -22,9 +22,9 @@
 #include "base/android/jni_android.h"
 RTC_POP_IGNORING_WUNDEF()
 
-#include "webrtc/modules/utility/include/jvm_android.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/ssladapter.h"
+#include "modules/utility/include/jvm_android.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/ssladapter.h"
 
 namespace webrtc {
 

pc/test/androidtestinitializer.h

diff --git a/pc/test/androidtestinitializer.h b/pc/test/androidtestinitializer.h
index 48df9cc..9c00a63 100644
--- a/pc/test/androidtestinitializer.h
+++ b/pc/test/androidtestinitializer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_ANDROIDTESTINITIALIZER_H_
-#define WEBRTC_PC_TEST_ANDROIDTESTINITIALIZER_H_
+#ifndef PC_TEST_ANDROIDTESTINITIALIZER_H_
+#define PC_TEST_ANDROIDTESTINITIALIZER_H_
 
 namespace webrtc {
 
@@ -17,4 +17,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TEST_ANDROIDTESTINITIALIZER_H_
+#endif  // PC_TEST_ANDROIDTESTINITIALIZER_H_

pc/test/fakeaudiocapturemodule.cc

diff --git a/pc/test/fakeaudiocapturemodule.cc b/pc/test/fakeaudiocapturemodule.cc
index 0d367cb..ffee283 100644
--- a/pc/test/fakeaudiocapturemodule.cc
+++ b/pc/test/fakeaudiocapturemodule.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/test/fakeaudiocapturemodule.h"
+#include "pc/test/fakeaudiocapturemodule.h"
 
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/refcount.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/timeutils.h"
 
 // Audio sample value that is high enough that it doesn't occur naturally when
 // frames are being faked. E.g. NetEq will not generate this large sample value

pc/test/fakeaudiocapturemodule.h

diff --git a/pc/test/fakeaudiocapturemodule.h b/pc/test/fakeaudiocapturemodule.h
index 91879b0..26c5060 100644
--- a/pc/test/fakeaudiocapturemodule.h
+++ b/pc/test/fakeaudiocapturemodule.h
@@ -17,17 +17,17 @@
 // Note P postfix of a function indicates that it should only be called by the
 // processing thread.
 
-#ifndef WEBRTC_PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
-#define WEBRTC_PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
+#ifndef PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
+#define PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
 
 #include <memory>
 
-#include "webrtc/common_types.h"
-#include "webrtc/modules/audio_device/include/audio_device.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "common_types.h"
+#include "modules/audio_device/include/audio_device.h"
+#include "rtc_base/basictypes.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {
 class Thread;
@@ -254,4 +254,4 @@
   rtc::CriticalSection crit_callback_;
 };
 
-#endif  // WEBRTC_PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
+#endif  // PC_TEST_FAKEAUDIOCAPTUREMODULE_H_

pc/test/fakeaudiocapturemodule_unittest.cc

diff --git a/pc/test/fakeaudiocapturemodule_unittest.cc b/pc/test/fakeaudiocapturemodule_unittest.cc
index 62885c2..6fc44a5 100644
--- a/pc/test/fakeaudiocapturemodule_unittest.cc
+++ b/pc/test/fakeaudiocapturemodule_unittest.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/test/fakeaudiocapturemodule.h"
+#include "pc/test/fakeaudiocapturemodule.h"
 
 #include <algorithm>
 
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/thread.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/thread.h"
 
 using std::min;
 

pc/test/fakedatachannelprovider.h

diff --git a/pc/test/fakedatachannelprovider.h b/pc/test/fakedatachannelprovider.h
index ecc0aa6..bafcb17 100644
--- a/pc/test/fakedatachannelprovider.h
+++ b/pc/test/fakedatachannelprovider.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_
-#define WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_
+#ifndef PC_TEST_FAKEDATACHANNELPROVIDER_H_
+#define PC_TEST_FAKEDATACHANNELPROVIDER_H_
 
-#include "webrtc/pc/datachannel.h"
-#include "webrtc/rtc_base/checks.h"
+#include "pc/datachannel.h"
+#include "rtc_base/checks.h"
 
 class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface {
  public:
@@ -145,4 +145,4 @@
   std::set<uint32_t> send_ssrcs_;
   std::set<uint32_t> recv_ssrcs_;
 };
-#endif  // WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_
+#endif  // PC_TEST_FAKEDATACHANNELPROVIDER_H_

pc/test/fakeperiodicvideocapturer.h

diff --git a/pc/test/fakeperiodicvideocapturer.h b/pc/test/fakeperiodicvideocapturer.h
index 02b4e4b..38f2c75 100644
--- a/pc/test/fakeperiodicvideocapturer.h
+++ b/pc/test/fakeperiodicvideocapturer.h
@@ -11,13 +11,13 @@
 // FakePeriodicVideoCapturer implements a fake cricket::VideoCapturer that
 // creates video frames periodically after it has been started.
 
-#ifndef WEBRTC_PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_
-#define WEBRTC_PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_
+#ifndef PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_
+#define PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_
 
 #include <vector>
 
-#include "webrtc/media/base/fakevideocapturer.h"
-#include "webrtc/rtc_base/thread.h"
+#include "media/base/fakevideocapturer.h"
+#include "rtc_base/thread.h"
 
 namespace webrtc {
 
@@ -71,4 +71,4 @@
 
 }  // namespace webrtc
 
-#endif  //  WEBRTC_PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_
+#endif  //  PC_TEST_FAKEPERIODICVIDEOCAPTURER_H_

pc/test/fakertccertificategenerator.h

diff --git a/pc/test/fakertccertificategenerator.h b/pc/test/fakertccertificategenerator.h
index 7b47378..cac33e4 100644
--- a/pc/test/fakertccertificategenerator.h
+++ b/pc/test/fakertccertificategenerator.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
-#define WEBRTC_PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
+#ifndef PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
+#define PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/rtc_base/rtccertificate.h"
-#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "api/peerconnectioninterface.h"
+#include "rtc_base/rtccertificate.h"
+#include "rtc_base/rtccertificategenerator.h"
 
 // RSA with mod size 1024, pub exp 0x10001.
 static const rtc::RTCCertificatePEM kRsaPems[] = {
@@ -228,4 +228,4 @@
   int generated_certificates_ = 0;
 };
 
-#endif  // WEBRTC_PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
+#endif  // PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_

pc/test/fakevideotrackrenderer.h

diff --git a/pc/test/fakevideotrackrenderer.h b/pc/test/fakevideotrackrenderer.h
index 9bf0b95..caec548 100644
--- a/pc/test/fakevideotrackrenderer.h
+++ b/pc/test/fakevideotrackrenderer.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_FAKEVIDEOTRACKRENDERER_H_
-#define WEBRTC_PC_TEST_FAKEVIDEOTRACKRENDERER_H_
+#ifndef PC_TEST_FAKEVIDEOTRACKRENDERER_H_
+#define PC_TEST_FAKEVIDEOTRACKRENDERER_H_
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/media/base/fakevideorenderer.h"
+#include "api/mediastreaminterface.h"
+#include "media/base/fakevideorenderer.h"
 
 namespace webrtc {
 
@@ -30,4 +30,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TEST_FAKEVIDEOTRACKRENDERER_H_
+#endif  // PC_TEST_FAKEVIDEOTRACKRENDERER_H_

pc/test/fakevideotracksource.h

diff --git a/pc/test/fakevideotracksource.h b/pc/test/fakevideotracksource.h
index aa5f3f5..46216c7 100644
--- a/pc/test/fakevideotracksource.h
+++ b/pc/test/fakevideotracksource.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_FAKEVIDEOTRACKSOURCE_H_
-#define WEBRTC_PC_TEST_FAKEVIDEOTRACKSOURCE_H_
+#ifndef PC_TEST_FAKEVIDEOTRACKSOURCE_H_
+#define PC_TEST_FAKEVIDEOTRACKSOURCE_H_
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/media/base/fakevideocapturer.h"
-#include "webrtc/pc/videotracksource.h"
+#include "api/mediastreaminterface.h"
+#include "media/base/fakevideocapturer.h"
+#include "pc/videotracksource.h"
 
 namespace webrtc {
 
@@ -46,4 +46,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TEST_FAKEVIDEOTRACKSOURCE_H_
+#endif  // PC_TEST_FAKEVIDEOTRACKSOURCE_H_

pc/test/mock_datachannel.h

diff --git a/pc/test/mock_datachannel.h b/pc/test/mock_datachannel.h
index 105fcba..4a77a6b 100644
--- a/pc/test/mock_datachannel.h
+++ b/pc/test/mock_datachannel.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_MOCK_DATACHANNEL_H_
-#define WEBRTC_PC_TEST_MOCK_DATACHANNEL_H_
+#ifndef PC_TEST_MOCK_DATACHANNEL_H_
+#define PC_TEST_MOCK_DATACHANNEL_H_
 
-#include "webrtc/pc/datachannel.h"
-#include "webrtc/test/gmock.h"
+#include "pc/datachannel.h"
+#include "test/gmock.h"
 
 namespace webrtc {
 
@@ -55,4 +55,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TEST_MOCK_DATACHANNEL_H_
+#endif  // PC_TEST_MOCK_DATACHANNEL_H_

pc/test/mock_peerconnection.h

diff --git a/pc/test/mock_peerconnection.h b/pc/test/mock_peerconnection.h
index e743cd8..e4343ff 100644
--- a/pc/test/mock_peerconnection.h
+++ b/pc/test/mock_peerconnection.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_MOCK_PEERCONNECTION_H_
-#define WEBRTC_PC_TEST_MOCK_PEERCONNECTION_H_
+#ifndef PC_TEST_MOCK_PEERCONNECTION_H_
+#define PC_TEST_MOCK_PEERCONNECTION_H_
 
 #include <vector>
 
-#include "webrtc/call/call.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/pc/peerconnection.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/test/gmock.h"
+#include "call/call.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "pc/peerconnection.h"
+#include "rtc_base/thread.h"
+#include "test/gmock.h"
 
 namespace webrtc {
 
@@ -64,4 +64,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TEST_MOCK_PEERCONNECTION_H_
+#endif  // PC_TEST_MOCK_PEERCONNECTION_H_

pc/test/mock_webrtcsession.h

diff --git a/pc/test/mock_webrtcsession.h b/pc/test/mock_webrtcsession.h
index 75e3b87..afd1473 100644
--- a/pc/test/mock_webrtcsession.h
+++ b/pc/test/mock_webrtcsession.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_
-#define WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_
+#ifndef PC_TEST_MOCK_WEBRTCSESSION_H_
+#define PC_TEST_MOCK_WEBRTCSESSION_H_
 
 #include <memory>
 #include <string>
 
-#include "webrtc/pc/webrtcsession.h"
-#include "webrtc/media/sctp/sctptransportinternal.h"
-#include "webrtc/test/gmock.h"
+#include "pc/webrtcsession.h"
+#include "media/sctp/sctptransportinternal.h"
+#include "test/gmock.h"
 
 namespace webrtc {
 
@@ -69,4 +69,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TEST_MOCK_WEBRTCSESSION_H_
+#endif  // PC_TEST_MOCK_WEBRTCSESSION_H_

pc/test/mockpeerconnectionobservers.h

diff --git a/pc/test/mockpeerconnectionobservers.h b/pc/test/mockpeerconnectionobservers.h
index 84c80f8..e8e78ad 100644
--- a/pc/test/mockpeerconnectionobservers.h
+++ b/pc/test/mockpeerconnectionobservers.h
@@ -10,14 +10,14 @@
 
 // This file contains mock implementations of observers used in PeerConnection.
 
-#ifndef WEBRTC_PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
-#define WEBRTC_PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
+#ifndef PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
+#define PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
 
 #include <memory>
 #include <string>
 
-#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/rtc_base/checks.h"
+#include "api/datachannelinterface.h"
+#include "rtc_base/checks.h"
 
 namespace webrtc {
 
@@ -266,4 +266,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
+#endif  // PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_

pc/test/peerconnectiontestwrapper.cc

diff --git a/pc/test/peerconnectiontestwrapper.cc b/pc/test/peerconnectiontestwrapper.cc
index 0cd2804..cc91217 100644
--- a/pc/test/peerconnectiontestwrapper.cc
+++ b/pc/test/peerconnectiontestwrapper.cc
@@ -10,12 +10,12 @@
 
 #include <utility>
 
-#include "webrtc/p2p/base/fakeportallocator.h"
-#include "webrtc/pc/test/fakeperiodicvideocapturer.h"
-#include "webrtc/pc/test/fakertccertificategenerator.h"
-#include "webrtc/pc/test/mockpeerconnectionobservers.h"
-#include "webrtc/pc/test/peerconnectiontestwrapper.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "p2p/base/fakeportallocator.h"
+#include "pc/test/fakeperiodicvideocapturer.h"
+#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/mockpeerconnectionobservers.h"
+#include "pc/test/peerconnectiontestwrapper.h"
+#include "rtc_base/gunit.h"
 
 static const char kStreamLabelBase[] = "stream_label";
 static const char kVideoTrackLabelBase[] = "video_track";

pc/test/peerconnectiontestwrapper.h

diff --git a/pc/test/peerconnectiontestwrapper.h b/pc/test/peerconnectiontestwrapper.h
index c0d1ea3..d9488b4 100644
--- a/pc/test/peerconnectiontestwrapper.h
+++ b/pc/test/peerconnectiontestwrapper.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
-#define WEBRTC_PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
+#ifndef PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
+#define PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
 
 #include <memory>
 
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/pc/test/fakeaudiocapturemodule.h"
-#include "webrtc/pc/test/fakevideotrackrenderer.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "api/peerconnectioninterface.h"
+#include "api/test/fakeconstraints.h"
+#include "pc/test/fakeaudiocapturemodule.h"
+#include "pc/test/fakevideotrackrenderer.h"
+#include "rtc_base/sigslot.h"
 
 class PeerConnectionTestWrapper
     : public webrtc::PeerConnectionObserver,
@@ -107,4 +107,4 @@
   std::unique_ptr<webrtc::FakeVideoTrackRenderer> renderer_;
 };
 
-#endif  // WEBRTC_PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
+#endif  // PC_TEST_PEERCONNECTIONTESTWRAPPER_H_

pc/test/rtcstatsobtainer.h

diff --git a/pc/test/rtcstatsobtainer.h b/pc/test/rtcstatsobtainer.h
index 62e995e..cb8ecd5 100644
--- a/pc/test/rtcstatsobtainer.h
+++ b/pc/test/rtcstatsobtainer.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TEST_RTCSTATSOBTAINER_H_
-#define WEBRTC_PC_TEST_RTCSTATSOBTAINER_H_
+#ifndef PC_TEST_RTCSTATSOBTAINER_H_
+#define PC_TEST_RTCSTATSOBTAINER_H_
 
-#include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "api/stats/rtcstatsreport.h"
+#include "rtc_base/gunit.h"
 
 namespace webrtc {
 
@@ -50,4 +50,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TEST_RTCSTATSOBTAINER_H_
+#endif  // PC_TEST_RTCSTATSOBTAINER_H_

pc/test/testsdpstrings.h

diff --git a/pc/test/testsdpstrings.h b/pc/test/testsdpstrings.h
index ff097b2..2c9912e 100644
--- a/pc/test/testsdpstrings.h
+++ b/pc/test/testsdpstrings.h
@@ -10,8 +10,8 @@
 
 // This file contain SDP strings used for testing.
 
-#ifndef WEBRTC_PC_TEST_TESTSDPSTRINGS_H_
-#define WEBRTC_PC_TEST_TESTSDPSTRINGS_H_
+#ifndef PC_TEST_TESTSDPSTRINGS_H_
+#define PC_TEST_TESTSDPSTRINGS_H_
 
 namespace webrtc {
 
@@ -129,4 +129,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TEST_TESTSDPSTRINGS_H_
+#endif  // PC_TEST_TESTSDPSTRINGS_H_

pc/trackmediainfomap.cc

diff --git a/pc/trackmediainfomap.cc b/pc/trackmediainfomap.cc
index b5c5ac6..2a7fe9c 100644
--- a/pc/trackmediainfomap.cc
+++ b/pc/trackmediainfomap.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/trackmediainfomap.h"
+#include "pc/trackmediainfomap.h"
 
 #include <utility>
 

pc/trackmediainfomap.h

diff --git a/pc/trackmediainfomap.h b/pc/trackmediainfomap.h
index 174d331..acc0b14 100644
--- a/pc/trackmediainfomap.h
+++ b/pc/trackmediainfomap.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_TRACKMEDIAINFOMAP_H_
-#define WEBRTC_PC_TRACKMEDIAINFOMAP_H_
+#ifndef PC_TRACKMEDIAINFOMAP_H_
+#define PC_TRACKMEDIAINFOMAP_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/rtc_base/refcount.h"
+#include "api/mediastreaminterface.h"
+#include "api/rtpreceiverinterface.h"
+#include "api/rtpsenderinterface.h"
+#include "media/base/mediachannel.h"
+#include "rtc_base/refcount.h"
 
 namespace webrtc {
 
@@ -99,4 +99,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_TRACKMEDIAINFOMAP_H_
+#endif  // PC_TRACKMEDIAINFOMAP_H_

pc/trackmediainfomap_unittest.cc

diff --git a/pc/trackmediainfomap_unittest.cc b/pc/trackmediainfomap_unittest.cc
index f0a3f1a..4f71d3b 100644
--- a/pc/trackmediainfomap_unittest.cc
+++ b/pc/trackmediainfomap_unittest.cc
@@ -8,23 +8,23 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/trackmediainfomap.h"
+#include "pc/trackmediainfomap.h"
 
 #include <initializer_list>
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/api/test/mock_rtpreceiver.h"
-#include "webrtc/api/test/mock_rtpsender.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/pc/audiotrack.h"
-#include "webrtc/pc/test/fakevideotracksource.h"
-#include "webrtc/pc/videotrack.h"
-#include "webrtc/rtc_base/refcount.h"
-#include "webrtc/test/gtest.h"
+#include "api/rtpreceiverinterface.h"
+#include "api/rtpsenderinterface.h"
+#include "api/test/mock_rtpreceiver.h"
+#include "api/test/mock_rtpsender.h"
+#include "media/base/mediachannel.h"
+#include "pc/audiotrack.h"
+#include "pc/test/fakevideotracksource.h"
+#include "pc/videotrack.h"
+#include "rtc_base/refcount.h"
+#include "test/gtest.h"
 
 namespace webrtc {
 

pc/videocapturertracksource.cc

diff --git a/pc/videocapturertracksource.cc b/pc/videocapturertracksource.cc
index 4cddf7f..97c0994 100644
--- a/pc/videocapturertracksource.cc
+++ b/pc/videocapturertracksource.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/videocapturertracksource.h"
+#include "pc/videocapturertracksource.h"
 
 #include <cstdlib>
 #include <string>
 #include <vector>
 
-#include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
+#include "api/mediaconstraintsinterface.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/checks.h"
 
 using cricket::CaptureState;
 using webrtc::MediaConstraintsInterface;

pc/videocapturertracksource.h

diff --git a/pc/videocapturertracksource.h b/pc/videocapturertracksource.h
index 0e6eb27..b80323f 100644
--- a/pc/videocapturertracksource.h
+++ b/pc/videocapturertracksource.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_VIDEOCAPTURERTRACKSOURCE_H_
-#define WEBRTC_PC_VIDEOCAPTURERTRACKSOURCE_H_
+#ifndef PC_VIDEOCAPTURERTRACKSOURCE_H_
+#define PC_VIDEOCAPTURERTRACKSOURCE_H_
 
 #include <memory>
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/media/base/videocapturer.h"
-#include "webrtc/media/base/videocommon.h"
-#include "webrtc/pc/videotracksource.h"
-#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/rtc_base/sigslot.h"
+#include "api/mediastreaminterface.h"
+#include "media/base/videocapturer.h"
+#include "media/base/videocommon.h"
+#include "pc/videotracksource.h"
+#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/sigslot.h"
 
 // VideoCapturerTrackSource implements VideoTrackSourceInterface. It owns a
 // cricket::VideoCapturer and make sure the camera is started at a resolution
@@ -76,4 +76,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_VIDEOCAPTURERTRACKSOURCE_H_
+#endif  // PC_VIDEOCAPTURERTRACKSOURCE_H_

pc/videocapturertracksource_unittest.cc

diff --git a/pc/videocapturertracksource_unittest.cc b/pc/videocapturertracksource_unittest.cc
index b6e50ae..c64c83e 100644
--- a/pc/videocapturertracksource_unittest.cc
+++ b/pc/videocapturertracksource_unittest.cc
@@ -12,12 +12,12 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/fakevideocapturer.h"
-#include "webrtc/media/base/fakevideorenderer.h"
-#include "webrtc/pc/videocapturertracksource.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "api/test/fakeconstraints.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/fakevideocapturer.h"
+#include "media/base/fakevideorenderer.h"
+#include "pc/videocapturertracksource.h"
+#include "rtc_base/gunit.h"
 
 using webrtc::FakeConstraints;
 using webrtc::VideoCapturerTrackSource;

pc/videotrack.cc

diff --git a/pc/videotrack.cc b/pc/videotrack.cc
index f106460..00adb3d 100644
--- a/pc/videotrack.cc
+++ b/pc/videotrack.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/videotrack.h"
+#include "pc/videotrack.h"
 
 #include <string>
 

pc/videotrack.h

diff --git a/pc/videotrack.h b/pc/videotrack.h
index d0f0618..e669e08 100644
--- a/pc/videotrack.h
+++ b/pc/videotrack.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_VIDEOTRACK_H_
-#define WEBRTC_PC_VIDEOTRACK_H_
+#ifndef PC_VIDEOTRACK_H_
+#define PC_VIDEOTRACK_H_
 
 #include <string>
 #include <vector>
 
-#include "webrtc/media/base/videosourcebase.h"
-#include "webrtc/pc/mediastreamtrack.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "media/base/videosourcebase.h"
+#include "pc/mediastreamtrack.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/thread_checker.h"
 
 namespace webrtc {
 
@@ -60,4 +60,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_VIDEOTRACK_H_
+#endif  // PC_VIDEOTRACK_H_

pc/videotrack_unittest.cc

diff --git a/pc/videotrack_unittest.cc b/pc/videotrack_unittest.cc
index 1f569eb..ceaac8c 100644
--- a/pc/videotrack_unittest.cc
+++ b/pc/videotrack_unittest.cc
@@ -11,12 +11,12 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/fakevideocapturer.h"
-#include "webrtc/pc/test/fakevideotrackrenderer.h"
-#include "webrtc/pc/videocapturertracksource.h"
-#include "webrtc/pc/videotrack.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/fakevideocapturer.h"
+#include "pc/test/fakevideotrackrenderer.h"
+#include "pc/videocapturertracksource.h"
+#include "pc/videotrack.h"
+#include "rtc_base/gunit.h"
 
 using webrtc::FakeVideoTrackRenderer;
 using webrtc::MediaSourceInterface;

pc/videotracksource.cc

diff --git a/pc/videotracksource.cc b/pc/videotracksource.cc
index f3ca8d7..56f48e7 100644
--- a/pc/videotracksource.cc
+++ b/pc/videotracksource.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/videotracksource.h"
+#include "pc/videotracksource.h"
 
 #include <string>
 

pc/videotracksource.h

diff --git a/pc/videotracksource.h b/pc/videotracksource.h
index 41252d8..3ab5909 100644
--- a/pc/videotracksource.h
+++ b/pc/videotracksource.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_VIDEOTRACKSOURCE_H_
-#define WEBRTC_PC_VIDEOTRACKSOURCE_H_
+#ifndef PC_VIDEOTRACKSOURCE_H_
+#define PC_VIDEOTRACKSOURCE_H_
 
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/notifier.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/base/videosinkinterface.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "api/mediastreaminterface.h"
+#include "api/notifier.h"
+#include "media/base/mediachannel.h"
+#include "media/base/videosinkinterface.h"
+#include "rtc_base/thread_checker.h"
 
 // VideoTrackSource implements VideoTrackSourceInterface.
 namespace webrtc {
@@ -52,4 +52,4 @@
 
 }  // namespace webrtc
 
-#endif  //  WEBRTC_PC_VIDEOTRACKSOURCE_H_
+#endif  //  PC_VIDEOTRACKSOURCE_H_

pc/voicechannel.h

diff --git a/pc/voicechannel.h b/pc/voicechannel.h
index 78524ab..852ef17 100644
--- a/pc/voicechannel.h
+++ b/pc/voicechannel.h
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_VOICECHANNEL_H_
-#define WEBRTC_PC_VOICECHANNEL_H_
+#ifndef PC_VOICECHANNEL_H_
+#define PC_VOICECHANNEL_H_
 
-#include "webrtc/pc/channel.h"
+#include "pc/channel.h"
 
-#endif  // WEBRTC_PC_VOICECHANNEL_H_
+#endif  // PC_VOICECHANNEL_H_

pc/webrtcsdp.cc

diff --git a/pc/webrtcsdp.cc b/pc/webrtcsdp.cc
index 7dc2605..dba2ba8 100644
--- a/pc/webrtcsdp.cc
+++ b/pc/webrtcsdp.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/webrtcsdp.h"
+#include "pc/webrtcsdp.h"
 
 #include <ctype.h>
 #include <limits.h>
@@ -20,24 +20,24 @@
 #include <unordered_map>
 #include <vector>
 
-#include "webrtc/api/jsepicecandidate.h"
-#include "webrtc/api/jsepsessiondescription.h"
+#include "api/jsepicecandidate.h"
+#include "api/jsepsessiondescription.h"
 // for RtpExtension
-#include "webrtc/api/rtpparameters.h"
-#include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/cryptoparams.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/media/sctp/sctptransportinternal.h"
-#include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/p2p/base/port.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/messagedigest.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "api/rtpparameters.h"
+#include "media/base/codec.h"
+#include "media/base/cryptoparams.h"
+#include "media/base/mediaconstants.h"
+#include "media/base/rtputils.h"
+#include "media/sctp/sctptransportinternal.h"
+#include "p2p/base/candidate.h"
+#include "p2p/base/p2pconstants.h"
+#include "p2p/base/port.h"
+#include "pc/mediasession.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/messagedigest.h"
+#include "rtc_base/stringutils.h"
 
 using cricket::AudioContentDescription;
 using cricket::Candidate;

pc/webrtcsdp.h

diff --git a/pc/webrtcsdp.h b/pc/webrtcsdp.h
index beaf0c5..83cc768 100644
--- a/pc/webrtcsdp.h
+++ b/pc/webrtcsdp.h
@@ -17,8 +17,8 @@
 // * draft-lennox-mmusic-sdp-source-selection-02 -
 //   Mechanisms for Media Source Selection in SDP
 
-#ifndef WEBRTC_PC_WEBRTCSDP_H_
-#define WEBRTC_PC_WEBRTCSDP_H_
+#ifndef PC_WEBRTCSDP_H_
+#define PC_WEBRTCSDP_H_
 
 #include <string>
 
@@ -84,4 +84,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_WEBRTCSDP_H_
+#endif  // PC_WEBRTCSDP_H_

pc/webrtcsdp_unittest.cc

diff --git a/pc/webrtcsdp_unittest.cc b/pc/webrtcsdp_unittest.cc
index 56066cf..3acad29 100644
--- a/pc/webrtcsdp_unittest.cc
+++ b/pc/webrtcsdp_unittest.cc
@@ -13,23 +13,23 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/engine/webrtcvideoengine.h"
-#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
-#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/messagedigest.h"
-#include "webrtc/rtc_base/sslfingerprint.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "api/jsepsessiondescription.h"
+#include "media/base/mediaconstants.h"
+#include "media/engine/webrtcvideoengine.h"
+#include "modules/video_coding/codecs/h264/include/h264.h"
+#include "p2p/base/p2pconstants.h"
+#include "pc/mediasession.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/messagedigest.h"
+#include "rtc_base/sslfingerprint.h"
+#include "rtc_base/stringencode.h"
+#include "rtc_base/stringutils.h"
 #ifdef WEBRTC_ANDROID
-#include "webrtc/pc/test/androidtestinitializer.h"
+#include "pc/test/androidtestinitializer.h"
 #endif
-#include "webrtc/pc/webrtcsdp.h"
+#include "pc/webrtcsdp.h"
 
 using cricket::AudioCodec;
 using cricket::AudioContentDescription;

pc/webrtcsession.cc

diff --git a/pc/webrtcsession.cc b/pc/webrtcsession.cc
index 0753081..86015a7 100644
--- a/pc/webrtcsession.cc
+++ b/pc/webrtcsession.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/webrtcsession.h"
+#include "pc/webrtcsession.h"
 
 #include <limits.h>
 
@@ -17,29 +17,29 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/api/jsepicecandidate.h"
-#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/call/call.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/sctp/sctptransportinternal.h"
-#include "webrtc/p2p/base/portallocator.h"
-#include "webrtc/pc/channel.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/pc/sctputils.h"
-#include "webrtc/pc/webrtcsessiondescriptionfactory.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/stringencode.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "api/call/audio_sink.h"
+#include "api/jsepicecandidate.h"
+#include "api/jsepsessiondescription.h"
+#include "api/peerconnectioninterface.h"
+#include "call/call.h"
+#include "media/base/mediaconstants.h"
+#include "media/sctp/sctptransportinternal.h"
+#include "p2p/base/portallocator.h"
+#include "pc/channel.h"
+#include "pc/channelmanager.h"
+#include "pc/mediasession.h"
+#include "pc/sctputils.h"
+#include "pc/webrtcsessiondescriptionfactory.h"
+#include "rtc_base/basictypes.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/helpers.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/stringencode.h"
+#include "rtc_base/stringutils.h"
 
 #ifdef HAVE_QUIC
-#include "webrtc/p2p/quic/quictransportchannel.h"
+#include "p2p/quic/quictransportchannel.h"
 #endif  // HAVE_QUIC
 
 using cricket::ContentInfo;

pc/webrtcsession.h

diff --git a/pc/webrtcsession.h b/pc/webrtcsession.h
index 8be828f..7e8d5e4 100644
--- a/pc/webrtcsession.h
+++ b/pc/webrtcsession.h
@@ -8,29 +8,29 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_WEBRTCSESSION_H_
-#define WEBRTC_PC_WEBRTCSESSION_H_
+#ifndef PC_WEBRTCSESSION_H_
+#define PC_WEBRTCSESSION_H_
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "webrtc/api/optional.h"
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/statstypes.h"
-#include "webrtc/call/call.h"
-#include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/transportcontroller.h"
-#include "webrtc/pc/datachannel.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/sigslot.h"
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/rtc_base/thread.h"
+#include "api/optional.h"
+#include "api/peerconnectioninterface.h"
+#include "api/statstypes.h"
+#include "call/call.h"
+#include "p2p/base/candidate.h"
+#include "p2p/base/transportcontroller.h"
+#include "pc/datachannel.h"
+#include "pc/mediasession.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/sigslot.h"
+#include "rtc_base/sslidentity.h"
+#include "rtc_base/thread.h"
 
 #ifdef HAVE_QUIC
-#include "webrtc/pc/quicdatatransport.h"
+#include "pc/quicdatatransport.h"
 #endif  // HAVE_QUIC
 
 namespace cricket {
@@ -677,4 +677,4 @@
 };
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_WEBRTCSESSION_H_
+#endif  // PC_WEBRTCSESSION_H_

pc/webrtcsession_unittest.cc

diff --git a/pc/webrtcsession_unittest.cc b/pc/webrtcsession_unittest.cc
index 497daff..8c2331a 100644
--- a/pc/webrtcsession_unittest.cc
+++ b/pc/webrtcsession_unittest.cc
@@ -12,41 +12,41 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/api/fakemetricsobserver.h"
-#include "webrtc/api/jsepicecandidate.h"
-#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/fakevideorenderer.h"
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/engine/fakewebrtccall.h"
-#include "webrtc/media/sctp/sctptransportinternal.h"
-#include "webrtc/p2p/base/packettransportinternal.h"
-#include "webrtc/p2p/base/stunserver.h"
-#include "webrtc/p2p/base/teststunserver.h"
-#include "webrtc/p2p/base/testturnserver.h"
-#include "webrtc/p2p/client/basicportallocator.h"
-#include "webrtc/pc/audiotrack.h"
-#include "webrtc/pc/channelmanager.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/pc/peerconnection.h"
-#include "webrtc/pc/sctputils.h"
-#include "webrtc/pc/test/fakertccertificategenerator.h"
-#include "webrtc/pc/videotrack.h"
-#include "webrtc/pc/webrtcsession.h"
-#include "webrtc/pc/webrtcsessiondescriptionfactory.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fakenetwork.h"
-#include "webrtc/rtc_base/firewallsocketserver.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/network.h"
-#include "webrtc/rtc_base/ssladapter.h"
-#include "webrtc/rtc_base/sslidentity.h"
-#include "webrtc/rtc_base/sslstreamadapter.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/virtualsocketserver.h"
+#include "api/fakemetricsobserver.h"
+#include "api/jsepicecandidate.h"
+#include "api/jsepsessiondescription.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/fakevideorenderer.h"
+#include "media/base/mediachannel.h"
+#include "media/engine/fakewebrtccall.h"
+#include "media/sctp/sctptransportinternal.h"
+#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/stunserver.h"
+#include "p2p/base/teststunserver.h"
+#include "p2p/base/testturnserver.h"
+#include "p2p/client/basicportallocator.h"
+#include "pc/audiotrack.h"
+#include "pc/channelmanager.h"
+#include "pc/mediasession.h"
+#include "pc/peerconnection.h"
+#include "pc/sctputils.h"
+#include "pc/test/fakertccertificategenerator.h"
+#include "pc/videotrack.h"
+#include "pc/webrtcsession.h"
+#include "pc/webrtcsessiondescriptionfactory.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/fakenetwork.h"
+#include "rtc_base/firewallsocketserver.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/network.h"
+#include "rtc_base/ssladapter.h"
+#include "rtc_base/sslidentity.h"
+#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/virtualsocketserver.h"
 
 using cricket::FakeVoiceMediaChannel;
 using cricket::TransportInfo;

pc/webrtcsessiondescriptionfactory.cc

diff --git a/pc/webrtcsessiondescriptionfactory.cc b/pc/webrtcsessiondescriptionfactory.cc
index beb8d1e..ea3e6ae 100644
--- a/pc/webrtcsessiondescriptionfactory.cc
+++ b/pc/webrtcsessiondescriptionfactory.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/pc/webrtcsessiondescriptionfactory.h"
+#include "pc/webrtcsessiondescriptionfactory.h"
 
 #include <utility>
 
-#include "webrtc/api/jsep.h"
-#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/pc/webrtcsession.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/sslidentity.h"
+#include "api/jsep.h"
+#include "api/jsepsessiondescription.h"
+#include "api/mediaconstraintsinterface.h"
+#include "pc/webrtcsession.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/sslidentity.h"
 
 using cricket::MediaSessionOptions;
 

pc/webrtcsessiondescriptionfactory.h

diff --git a/pc/webrtcsessiondescriptionfactory.h b/pc/webrtcsessiondescriptionfactory.h
index 04a4fd8..231f718 100644
--- a/pc/webrtcsessiondescriptionfactory.h
+++ b/pc/webrtcsessiondescriptionfactory.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
-#define WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
+#ifndef PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
+#define PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
 
 #include <memory>
 
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/p2p/base/transportdescriptionfactory.h"
-#include "webrtc/pc/mediasession.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/rtccertificate.h"
-#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "api/peerconnectioninterface.h"
+#include "p2p/base/transportdescriptionfactory.h"
+#include "pc/mediasession.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/rtccertificate.h"
+#include "rtc_base/rtccertificategenerator.h"
 
 namespace cricket {
 class ChannelManager;
@@ -170,4 +170,4 @@
 };
 }  // namespace webrtc
 
-#endif  // WEBRTC_PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
+#endif  // PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_