diff --git a/media/engine/adm_helpers.cc b/media/engine/adm_helpers.cc
index 7902889..bb2ecc3 100644
--- a/media/engine/adm_helpers.cc
+++ b/media/engine/adm_helpers.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/adm_helpers.h"
+#include "media/engine/adm_helpers.h"
 
-#include "webrtc/modules/audio_device/include/audio_device.h"
-#include "webrtc/rtc_base/logging.h"
+#include "modules/audio_device/include/audio_device.h"
+#include "rtc_base/logging.h"
 
 namespace webrtc {
 namespace adm_helpers {
diff --git a/media/engine/adm_helpers.h b/media/engine/adm_helpers.h
index 1a3eb45..209ff07 100644
--- a/media/engine/adm_helpers.h
+++ b/media/engine/adm_helpers.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_ADM_HELPERS_H_
-#define WEBRTC_MEDIA_ENGINE_ADM_HELPERS_H_
+#ifndef MEDIA_ENGINE_ADM_HELPERS_H_
+#define MEDIA_ENGINE_ADM_HELPERS_H_
 
-#include "webrtc/common_types.h"
+#include "common_types.h"
 
 namespace webrtc {
 
@@ -25,4 +25,4 @@
 }  // namespace adm_helpers
 }  // namespace webrtc
 
-#endif  // WEBRTC_MEDIA_ENGINE_ADM_HELPERS_H_
+#endif  // MEDIA_ENGINE_ADM_HELPERS_H_
diff --git a/media/engine/apm_helpers.cc b/media/engine/apm_helpers.cc
index 784b47c..d6c45a6 100644
--- a/media/engine/apm_helpers.cc
+++ b/media/engine/apm_helpers.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/apm_helpers.h"
+#include "media/engine/apm_helpers.h"
 
-#include "webrtc/modules/audio_device/include/audio_device.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/voice_engine/transmit_mixer.h"
+#include "modules/audio_device/include/audio_device.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "rtc_base/logging.h"
+#include "voice_engine/transmit_mixer.h"
 
 namespace webrtc {
 namespace apm_helpers {
diff --git a/media/engine/apm_helpers.h b/media/engine/apm_helpers.h
index eff7133c..50f2e2b 100644
--- a/media/engine/apm_helpers.h
+++ b/media/engine/apm_helpers.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_APM_HELPERS_H_
-#define WEBRTC_MEDIA_ENGINE_APM_HELPERS_H_
+#ifndef MEDIA_ENGINE_APM_HELPERS_H_
+#define MEDIA_ENGINE_APM_HELPERS_H_
 
 namespace webrtc {
 
@@ -46,4 +46,4 @@
 }  // namespace apm_helpers
 }  // namespace webrtc
 
-#endif  // WEBRTC_MEDIA_ENGINE_APM_HELPERS_H_
+#endif  // MEDIA_ENGINE_APM_HELPERS_H_
diff --git a/media/engine/apm_helpers_unittest.cc b/media/engine/apm_helpers_unittest.cc
index a869903..315cdc8 100644
--- a/media/engine/apm_helpers_unittest.cc
+++ b/media/engine/apm_helpers_unittest.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/apm_helpers.h"
+#include "media/engine/apm_helpers.h"
 
-#include "webrtc/media/engine/webrtcvoe.h"
-#include "webrtc/modules/audio_device/include/mock_audio_device.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/mock_audio_decoder_factory.h"
-#include "webrtc/voice_engine/transmit_mixer.h"
+#include "media/engine/webrtcvoe.h"
+#include "modules/audio_device/include/mock_audio_device.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+#include "test/mock_audio_decoder_factory.h"
+#include "voice_engine/transmit_mixer.h"
 
 namespace webrtc {
 namespace {
diff --git a/media/engine/constants.h b/media/engine/constants.h
index 19d06a1..cd4c0a2 100644
--- a/media/engine/constants.h
+++ b/media/engine/constants.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_CONSTANTS_H_
-#define WEBRTC_MEDIA_ENGINE_CONSTANTS_H_
+#ifndef MEDIA_ENGINE_CONSTANTS_H_
+#define MEDIA_ENGINE_CONSTANTS_H_
 
 namespace cricket {
 
@@ -22,4 +22,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_CONSTANTS_H_
+#endif  // MEDIA_ENGINE_CONSTANTS_H_
diff --git a/media/engine/fakewebrtccall.cc b/media/engine/fakewebrtccall.cc
index 8081819..8556cc7 100644
--- a/media/engine/fakewebrtccall.cc
+++ b/media/engine/fakewebrtccall.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/fakewebrtccall.h"
+#include "media/engine/fakewebrtccall.h"
 
 #include <algorithm>
 #include <utility>
 
-#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/platform_file.h"
+#include "api/call/audio_sink.h"
+#include "media/base/rtputils.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/platform_file.h"
 
 namespace cricket {
 FakeAudioSendStream::FakeAudioSendStream(
diff --git a/media/engine/fakewebrtccall.h b/media/engine/fakewebrtccall.h
index 0b4496b..04dc5d9 100644
--- a/media/engine/fakewebrtccall.h
+++ b/media/engine/fakewebrtccall.h
@@ -17,22 +17,22 @@
 //   webrtc::VideoSendStream
 //   webrtc::VideoReceiveStream
 
-#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_
-#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_
+#ifndef MEDIA_ENGINE_FAKEWEBRTCCALL_H_
+#define MEDIA_ENGINE_FAKEWEBRTCCALL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/call/audio_receive_stream.h"
-#include "webrtc/call/audio_send_stream.h"
-#include "webrtc/call/call.h"
-#include "webrtc/call/flexfec_receive_stream.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/call/video_receive_stream.h"
-#include "webrtc/call/video_send_stream.h"
+#include "api/video/video_frame.h"
+#include "call/audio_receive_stream.h"
+#include "call/audio_send_stream.h"
+#include "call/call.h"
+#include "call/flexfec_receive_stream.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "rtc_base/buffer.h"
+#include "call/video_receive_stream.h"
+#include "call/video_send_stream.h"
 
 namespace cricket {
 class FakeAudioSendStream final : public webrtc::AudioSendStream {
@@ -325,4 +325,4 @@
 };
 
 }  // namespace cricket
-#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_
+#endif  // MEDIA_ENGINE_FAKEWEBRTCCALL_H_
diff --git a/media/engine/fakewebrtcdeviceinfo.h b/media/engine/fakewebrtcdeviceinfo.h
index 38f9810..b32db65 100644
--- a/media/engine/fakewebrtcdeviceinfo.h
+++ b/media/engine/fakewebrtcdeviceinfo.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
-#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
+#ifndef MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
+#define MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
 
 #include <vector>
 
-#include "webrtc/media/engine/webrtcvideocapturer.h"
-#include "webrtc/rtc_base/stringutils.h"
+#include "media/engine/webrtcvideocapturer.h"
+#include "rtc_base/stringutils.h"
 
 // Fake class for mocking out webrtc::VideoCaptureModule::DeviceInfo.
 class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo {
@@ -105,4 +105,4 @@
   std::vector<Device> devices_;
 };
 
-#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
+#endif  // MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
diff --git a/media/engine/fakewebrtcvcmfactory.h b/media/engine/fakewebrtcvcmfactory.h
index 3124cd8..70931e1 100644
--- a/media/engine/fakewebrtcvcmfactory.h
+++ b/media/engine/fakewebrtcvcmfactory.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
-#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
+#ifndef MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
+#define MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
 
 #include <vector>
 
-#include "webrtc/media/engine/fakewebrtcdeviceinfo.h"
-#include "webrtc/media/engine/fakewebrtcvideocapturemodule.h"
-#include "webrtc/media/engine/webrtcvideocapturer.h"
+#include "media/engine/fakewebrtcdeviceinfo.h"
+#include "media/engine/fakewebrtcvideocapturemodule.h"
+#include "media/engine/webrtcvideocapturer.h"
 
 // Factory class to allow the fakes above to be injected into
 // WebRtcVideoCapturer.
@@ -46,4 +46,4 @@
     factory_->OnDestroyed(this);
 }
 
-#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
+#endif  // MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
diff --git a/media/engine/fakewebrtcvideocapturemodule.h b/media/engine/fakewebrtcvideocapturemodule.h
index 0d52999..2531e1a 100644
--- a/media/engine/fakewebrtcvideocapturemodule.h
+++ b/media/engine/fakewebrtcvideocapturemodule.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
-#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
+#ifndef MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
+#define MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
 
 #include <vector>
 
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/media/base/testutils.h"
-#include "webrtc/media/engine/webrtcvideocapturer.h"
+#include "api/video/i420_buffer.h"
+#include "media/base/testutils.h"
+#include "media/engine/webrtcvideocapturer.h"
 
 class FakeWebRtcVcmFactory;
 
@@ -87,4 +87,4 @@
   webrtc::VideoCaptureCapability cap_;
 };
 
-#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
+#endif  // MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
diff --git a/media/engine/fakewebrtcvideoengine.h b/media/engine/fakewebrtcvideoengine.h
index e9afc76..2153f6b 100644
--- a/media/engine/fakewebrtcvideoengine.h
+++ b/media/engine/fakewebrtcvideoengine.h
@@ -8,25 +8,25 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
-#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
+#ifndef MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
+#define MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
 
 #include <map>
 #include <set>
 #include <vector>
 #include <string>
 
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/media/base/codec.h"
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-#include "webrtc/modules/video_coding/include/video_error_codes.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread_annotations.h"
+#include "api/video_codecs/video_decoder.h"
+#include "api/video_codecs/video_encoder.h"
+#include "media/base/codec.h"
+#include "media/engine/webrtcvideodecoderfactory.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "rtc_base/basictypes.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/thread_annotations.h"
 
 namespace cricket {
 static const int kEventTimeoutMs = 10000;
@@ -257,4 +257,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
+#endif  // MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
diff --git a/media/engine/fakewebrtcvoiceengine.h b/media/engine/fakewebrtcvoiceengine.h
index 13df1fc..479cf26 100644
--- a/media/engine/fakewebrtcvoiceengine.h
+++ b/media/engine/fakewebrtcvoiceengine.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
-#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
+#ifndef MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
+#define MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
 
 #include <map>
 #include <vector>
 
-#include "webrtc/media/engine/webrtcvoe.h"
-#include "webrtc/rtc_base/checks.h"
+#include "media/engine/webrtcvoe.h"
+#include "rtc_base/checks.h"
 
 namespace webrtc {
 namespace voe {
@@ -132,4 +132,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
+#endif  // MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
diff --git a/media/engine/internaldecoderfactory.cc b/media/engine/internaldecoderfactory.cc
index 7a1c099..5e69602 100644
--- a/media/engine/internaldecoderfactory.cc
+++ b/media/engine/internaldecoderfactory.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/internaldecoderfactory.h"
+#include "media/engine/internaldecoderfactory.h"
 
 #include <utility>
 
-#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
-#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
-#include "webrtc/rtc_base/logging.h"
+#include "modules/video_coding/codecs/h264/include/h264.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
+#include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/media/engine/internaldecoderfactory.h b/media/engine/internaldecoderfactory.h
index 20ceecc..283d103 100644
--- a/media/engine/internaldecoderfactory.h
+++ b/media/engine/internaldecoderfactory.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
-#define WEBRTC_MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
+#ifndef MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
+#define MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
 
 #include <vector>
 
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
+#include "media/engine/webrtcvideodecoderfactory.h"
 
 namespace cricket {
 
@@ -31,4 +31,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
+#endif  // MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
diff --git a/media/engine/internaldecoderfactory_unittest.cc b/media/engine/internaldecoderfactory_unittest.cc
index bf1ca50..cbf39df 100644
--- a/media/engine/internaldecoderfactory_unittest.cc
+++ b/media/engine/internaldecoderfactory_unittest.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/internaldecoderfactory.h"
+#include "media/engine/internaldecoderfactory.h"
 
-#include "webrtc/test/gtest.h"
+#include "test/gtest.h"
 
 TEST(InternalDecoderFactory, TestVP8) {
   cricket::InternalDecoderFactory factory;
diff --git a/media/engine/internalencoderfactory.cc b/media/engine/internalencoderfactory.cc
index 004db79..5f7a4ba 100644
--- a/media/engine/internalencoderfactory.cc
+++ b/media/engine/internalencoderfactory.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/internalencoderfactory.h"
+#include "media/engine/internalencoderfactory.h"
 
 #include <utility>
 
-#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
-#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
+#include "modules/video_coding/codecs/h264/include/h264.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
+#include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "system_wrappers/include/field_trial.h"
 
 namespace cricket {
 
diff --git a/media/engine/internalencoderfactory.h b/media/engine/internalencoderfactory.h
index cfc6101..b64d904 100644
--- a/media/engine/internalencoderfactory.h
+++ b/media/engine/internalencoderfactory.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
-#define WEBRTC_MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
+#ifndef MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
+#define MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
 
 #include <vector>
 
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
 
 namespace cricket {
 
@@ -34,4 +34,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
+#endif  // MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
diff --git a/media/engine/nullwebrtcvideoengine.h b/media/engine/nullwebrtcvideoengine.h
index 9c687b9..0ff997d 100644
--- a/media/engine/nullwebrtcvideoengine.h
+++ b/media/engine/nullwebrtcvideoengine.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
-#define WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
+#ifndef MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
+#define MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
 
 #include <vector>
 
-#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/base/mediaengine.h"
+#include "media/base/mediachannel.h"
+#include "media/base/mediaengine.h"
 
 namespace webrtc {
 
@@ -46,4 +46,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
+#endif  // MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
diff --git a/media/engine/nullwebrtcvideoengine_unittest.cc b/media/engine/nullwebrtcvideoengine_unittest.cc
index 5fa7b01..84f330a 100644
--- a/media/engine/nullwebrtcvideoengine_unittest.cc
+++ b/media/engine/nullwebrtcvideoengine_unittest.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/nullwebrtcvideoengine.h"
-#include "webrtc/media/engine/webrtcvoiceengine.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/mock_audio_decoder_factory.h"
-#include "webrtc/test/mock_audio_encoder_factory.h"
+#include "media/engine/nullwebrtcvideoengine.h"
+#include "media/engine/webrtcvoiceengine.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "test/gtest.h"
+#include "test/mock_audio_decoder_factory.h"
+#include "test/mock_audio_encoder_factory.h"
 
 namespace cricket {
 
diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc
index 1dbc431..a6d93a5 100644
--- a/media/engine/payload_type_mapper.cc
+++ b/media/engine/payload_type_mapper.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/payload_type_mapper.h"
+#include "media/engine/payload_type_mapper.h"
 
-#include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/common_types.h"
-#include "webrtc/media/base/mediaconstants.h"
+#include "api/audio_codecs/audio_format.h"
+#include "common_types.h"
+#include "media/base/mediaconstants.h"
 
 namespace cricket {
 
diff --git a/media/engine/payload_type_mapper.h b/media/engine/payload_type_mapper.h
index 128f557..914c08c 100644
--- a/media/engine/payload_type_mapper.h
+++ b/media/engine/payload_type_mapper.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_
-#define WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_
+#ifndef MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_
+#define MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_
 
 #include <map>
 #include <set>
 
-#include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/api/optional.h"
-#include "webrtc/media/base/codec.h"
+#include "api/audio_codecs/audio_format.h"
+#include "api/optional.h"
+#include "media/base/codec.h"
 
 namespace cricket {
 
@@ -53,4 +53,4 @@
 };
 
 }  // namespace cricket
-#endif  // WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_
+#endif  // MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_
diff --git a/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc
index 628eb0c..dca8e61 100644
--- a/media/engine/payload_type_mapper_unittest.cc
+++ b/media/engine/payload_type_mapper_unittest.cc
@@ -11,8 +11,8 @@
 #include <set>
 #include <string>
 
-#include "webrtc/media/engine/payload_type_mapper.h"
-#include "webrtc/test/gtest.h"
+#include "media/engine/payload_type_mapper.h"
+#include "test/gtest.h"
 
 namespace cricket {
 
diff --git a/media/engine/scopedvideodecoder.cc b/media/engine/scopedvideodecoder.cc
index b328286..a9f8537 100644
--- a/media/engine/scopedvideodecoder.cc
+++ b/media/engine/scopedvideodecoder.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/scopedvideodecoder.h"
+#include "media/engine/scopedvideodecoder.h"
 
 #include <vector>
 
-#include "webrtc/api/video_codecs/video_decoder.h"
+#include "api/video_codecs/video_decoder.h"
 
 namespace cricket {
 
diff --git a/media/engine/scopedvideodecoder.h b/media/engine/scopedvideodecoder.h
index c76c9fc..983059b 100644
--- a/media/engine/scopedvideodecoder.h
+++ b/media/engine/scopedvideodecoder.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
-#define WEBRTC_MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
+#ifndef MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
+#define MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
 
 #include <memory>
 
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
+#include "media/engine/webrtcvideodecoderfactory.h"
 
 namespace cricket {
 
@@ -31,4 +31,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
+#endif  // MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
diff --git a/media/engine/scopedvideoencoder.cc b/media/engine/scopedvideoencoder.cc
index 0c07d8c..0f56364 100644
--- a/media/engine/scopedvideoencoder.cc
+++ b/media/engine/scopedvideoencoder.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/scopedvideoencoder.h"
+#include "media/engine/scopedvideoencoder.h"
 
 #include <vector>
 
-#include "webrtc/api/video_codecs/video_encoder.h"
+#include "api/video_codecs/video_encoder.h"
 
 namespace cricket {
 
diff --git a/media/engine/scopedvideoencoder.h b/media/engine/scopedvideoencoder.h
index f0ff40f..ac452d7 100644
--- a/media/engine/scopedvideoencoder.h
+++ b/media/engine/scopedvideoencoder.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
-#define WEBRTC_MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
+#ifndef MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
+#define MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
 
 #include <memory>
 
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
 
 namespace cricket {
 
@@ -30,4 +30,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
+#endif  // MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
diff --git a/media/engine/simulcast.cc b/media/engine/simulcast.cc
index f25eaf9..6ebf66d 100644
--- a/media/engine/simulcast.cc
+++ b/media/engine/simulcast.cc
@@ -10,12 +10,12 @@
 
 #include <stdio.h>
 
-#include "webrtc/media/base/streamparams.h"
-#include "webrtc/media/engine/constants.h"
-#include "webrtc/media/engine/simulcast.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
+#include "media/base/streamparams.h"
+#include "media/engine/constants.h"
+#include "media/engine/simulcast.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/field_trial.h"
 
 namespace cricket {
 
diff --git a/media/engine/simulcast.h b/media/engine/simulcast.h
index 81668e4..29ecfde 100644
--- a/media/engine/simulcast.h
+++ b/media/engine/simulcast.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_SIMULCAST_H_
-#define WEBRTC_MEDIA_ENGINE_SIMULCAST_H_
+#ifndef MEDIA_ENGINE_SIMULCAST_H_
+#define MEDIA_ENGINE_SIMULCAST_H_
 
 #include <vector>
 
-#include "webrtc/call/video_config.h"
-#include "webrtc/rtc_base/basictypes.h"
+#include "call/video_config.h"
+#include "rtc_base/basictypes.h"
 
 namespace cricket {
 struct StreamParams;
@@ -59,4 +59,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_SIMULCAST_H_
+#endif  // MEDIA_ENGINE_SIMULCAST_H_
diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc
index af84b85..ecd415d 100644
--- a/media/engine/simulcast_encoder_adapter.cc
+++ b/media/engine/simulcast_encoder_adapter.cc
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/simulcast_encoder_adapter.h"
+#include "media/engine/simulcast_encoder_adapter.h"
 
 #include <algorithm>
 
 // NOTE(ajm): Path provided by gyp.
 #include "libyuv/scale.h"  // NOLINT
 
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/media/engine/scopedvideoencoder.h"
-#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h"
-#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "api/video/i420_buffer.h"
+#include "media/engine/scopedvideoencoder.h"
+#include "modules/video_coding/codecs/vp8/screenshare_layers.h"
+#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/clock.h"
 
 namespace {
 
diff --git a/media/engine/simulcast_encoder_adapter.h b/media/engine/simulcast_encoder_adapter.h
index 03576f6..8833908 100644
--- a/media/engine/simulcast_encoder_adapter.h
+++ b/media/engine/simulcast_encoder_adapter.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_
-#define WEBRTC_MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_
+#ifndef MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_
+#define MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_
 
 #include <memory>
 #include <stack>
@@ -18,10 +18,10 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/rtc_base/atomicops.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
+#include "rtc_base/atomicops.h"
+#include "rtc_base/sequenced_task_checker.h"
 
 namespace webrtc {
 
@@ -112,4 +112,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_
+#endif  // MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_
diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index 7865e5f..91b47de 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -12,11 +12,11 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/common_video/include/video_frame_buffer.h"
-#include "webrtc/media/engine/simulcast_encoder_adapter.h"
-#include "webrtc/modules/video_coding/codecs/vp8/simulcast_test_utility.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/test/gmock.h"
+#include "common_video/include/video_frame_buffer.h"
+#include "media/engine/simulcast_encoder_adapter.h"
+#include "modules/video_coding/codecs/vp8/simulcast_test_utility.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "test/gmock.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/media/engine/simulcast_unittest.cc b/media/engine/simulcast_unittest.cc
index 8377d4f..1433c5c 100644
--- a/media/engine/simulcast_unittest.cc
+++ b/media/engine/simulcast_unittest.cc
@@ -10,8 +10,8 @@
 
 #include <string>
 
-#include "webrtc/media/engine/simulcast.h"
-#include "webrtc/test/gtest.h"
+#include "media/engine/simulcast.h"
+#include "test/gtest.h"
 
 namespace cricket {
 
diff --git a/media/engine/videodecodersoftwarefallbackwrapper.cc b/media/engine/videodecodersoftwarefallbackwrapper.cc
index 0e7632b..e99ea28 100644
--- a/media/engine/videodecodersoftwarefallbackwrapper.cc
+++ b/media/engine/videodecodersoftwarefallbackwrapper.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
+#include "media/engine/videodecodersoftwarefallbackwrapper.h"
 
 #include <string>
 
-#include "webrtc/media/engine/internaldecoderfactory.h"
-#include "webrtc/modules/video_coding/include/video_error_codes.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/trace_event.h"
+#include "media/engine/internaldecoderfactory.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/trace_event.h"
 
 namespace webrtc {
 
diff --git a/media/engine/videodecodersoftwarefallbackwrapper.h b/media/engine/videodecodersoftwarefallbackwrapper.h
index d6c3e0e..84a86ca 100644
--- a/media/engine/videodecodersoftwarefallbackwrapper.h
+++ b/media/engine/videodecodersoftwarefallbackwrapper.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_
-#define WEBRTC_MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_
+#ifndef MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_
+#define MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_
 
 #include <memory>
 #include <string>
 
-#include "webrtc/api/video_codecs/video_decoder.h"
+#include "api/video_codecs/video_decoder.h"
 
 namespace webrtc {
 
@@ -59,4 +59,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_
+#endif  // MEDIA_ENGINE_VIDEODECODERSOFTWAREFALLBACKWRAPPER_H_
diff --git a/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc b/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
index 84a6a59..3a313b1 100644
--- a/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
+++ b/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/modules/video_coding/include/video_error_codes.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/test/gtest.h"
+#include "media/engine/videodecodersoftwarefallbackwrapper.h"
+#include "api/video_codecs/video_decoder.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "rtc_base/checks.h"
+#include "test/gtest.h"
 
 namespace webrtc {
 
diff --git a/media/engine/videoencodersoftwarefallbackwrapper.cc b/media/engine/videoencodersoftwarefallbackwrapper.cc
index 7e2a678..f908b6e 100644
--- a/media/engine/videoencodersoftwarefallbackwrapper.cc
+++ b/media/engine/videoencodersoftwarefallbackwrapper.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
+#include "media/engine/videoencodersoftwarefallbackwrapper.h"
 
-#include "webrtc/media/base/h264_profile_level_id.h"
-#include "webrtc/media/engine/internalencoderfactory.h"
-#include "webrtc/modules/video_coding/include/video_error_codes.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
+#include "media/base/h264_profile_level_id.h"
+#include "media/engine/internalencoderfactory.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/timeutils.h"
+#include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
 namespace {
diff --git a/media/engine/videoencodersoftwarefallbackwrapper.h b/media/engine/videoencodersoftwarefallbackwrapper.h
index 8dec2f5..bd7560d 100644
--- a/media/engine/videoencodersoftwarefallbackwrapper.h
+++ b/media/engine/videoencodersoftwarefallbackwrapper.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_
-#define WEBRTC_MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_
+#ifndef MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_
+#define MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/media/base/codec.h"
+#include "api/video_codecs/video_encoder.h"
+#include "media/base/codec.h"
 
 namespace webrtc {
 
@@ -109,4 +109,4 @@
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_
+#endif  // MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_
diff --git a/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
index f8521ab..c3ac434 100644
--- a/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
+++ b/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
+#include "media/engine/videoencodersoftwarefallbackwrapper.h"
 
 #include <utility>
 
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h"
-#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/include/video_error_codes.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/test/gtest.h"
+#include "api/video/i420_buffer.h"
+#include "modules/video_coding/codecs/vp8/simulcast_rate_allocator.h"
+#include "modules/video_coding/codecs/vp8/temporal_layers.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/fakeclock.h"
+#include "test/field_trial.h"
+#include "test/gtest.h"
 
 namespace webrtc {
 namespace {
diff --git a/media/engine/webrtccommon.h b/media/engine/webrtccommon.h
index 21fc192..8d10835 100644
--- a/media/engine/webrtccommon.h
+++ b/media/engine/webrtccommon.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_
-#define WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_
+#ifndef MEDIA_ENGINE_WEBRTCCOMMON_H_
+#define MEDIA_ENGINE_WEBRTCCOMMON_H_
 
-#include "webrtc/common_types.h"
+#include "common_types.h"
 
 namespace cricket {
 
@@ -55,4 +55,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_
+#endif  // MEDIA_ENGINE_WEBRTCCOMMON_H_
diff --git a/media/engine/webrtcmediaengine.cc b/media/engine/webrtcmediaengine.cc
index 3a61ad7..99b6041 100644
--- a/media/engine/webrtcmediaengine.cc
+++ b/media/engine/webrtcmediaengine.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtcmediaengine.h"
 
 #include <algorithm>
 
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/media/engine/webrtcvoiceengine.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "media/engine/webrtcvoiceengine.h"
 
 #ifdef HAVE_WEBRTC_VIDEO
-#include "webrtc/media/engine/webrtcvideoengine.h"
+#include "media/engine/webrtcvideoengine.h"
 #else
-#include "webrtc/media/engine/nullwebrtcvideoengine.h"
+#include "media/engine/nullwebrtcvideoengine.h"
 #endif
 
 namespace cricket {
diff --git a/media/engine/webrtcmediaengine.h b/media/engine/webrtcmediaengine.h
index 8740917..f24f7c7 100644
--- a/media/engine/webrtcmediaengine.h
+++ b/media/engine/webrtcmediaengine.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
-#define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
+#ifndef MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
+#define MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
 
 #include <string>
 #include <vector>
 
-#include "webrtc/call/call.h"
-#include "webrtc/media/base/mediaengine.h"
+#include "call/call.h"
+#include "media/base/mediaengine.h"
 
 namespace webrtc {
 class AudioDecoderFactory;
@@ -100,4 +100,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
+#endif  // MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
diff --git a/media/engine/webrtcmediaengine_unittest.cc b/media/engine/webrtcmediaengine_unittest.cc
index d22a8da..3726217 100644
--- a/media/engine/webrtcmediaengine_unittest.cc
+++ b/media/engine/webrtcmediaengine_unittest.cc
@@ -8,10 +8,10 @@
  *  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/media/engine/webrtcmediaengine.h"
-#include "webrtc/test/gtest.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "media/engine/webrtcmediaengine.h"
+#include "test/gtest.h"
 
 using webrtc::RtpExtension;
 
diff --git a/media/engine/webrtcvideocapturer.cc b/media/engine/webrtcvideocapturer.cc
index 9b872fb..47bbbe8 100644
--- a/media/engine/webrtcvideocapturer.cc
+++ b/media/engine/webrtcvideocapturer.cc
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/webrtcvideocapturer.h"
+#include "media/engine/webrtcvideocapturer.h"
 
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/bind.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/thread.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/bind.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/safe_conversions.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/timeutils.h"
 
-#include "webrtc/modules/video_capture/video_capture_factory.h"
-#include "webrtc/rtc_base/win32.h"  // Need this to #include the impl files.
-#include "webrtc/system_wrappers/include/field_trial.h"
+#include "modules/video_capture/video_capture_factory.h"
+#include "rtc_base/win32.h"  // Need this to #include the impl files.
+#include "system_wrappers/include/field_trial.h"
 
 namespace cricket {
 
diff --git a/media/engine/webrtcvideocapturer.h b/media/engine/webrtcvideocapturer.h
index 6fbfcf2..2454f81 100644
--- a/media/engine/webrtcvideocapturer.h
+++ b/media/engine/webrtcvideocapturer.h
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_
-#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_
+#ifndef MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_
+#define MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/media/base/device.h"
-#include "webrtc/media/base/videocapturer.h"
-#include "webrtc/modules/video_capture/video_capture.h"
-#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/rtc_base/messagehandler.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "media/base/device.h"
+#include "media/base/videocapturer.h"
+#include "modules/video_capture/video_capture.h"
+#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/scoped_ref_ptr.h"
 
 namespace cricket {
 
@@ -82,4 +82,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
+#endif  // MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
diff --git a/media/engine/webrtcvideocapturer_unittest.cc b/media/engine/webrtcvideocapturer_unittest.cc
index a4414f1..24cb65d 100644
--- a/media/engine/webrtcvideocapturer_unittest.cc
+++ b/media/engine/webrtcvideocapturer_unittest.cc
@@ -15,14 +15,14 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/media/base/testutils.h"
-#include "webrtc/media/base/videocommon.h"
-#include "webrtc/media/engine/fakewebrtcvcmfactory.h"
-#include "webrtc/media/engine/webrtcvideocapturer.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/thread.h"
+#include "media/base/testutils.h"
+#include "media/base/videocommon.h"
+#include "media/engine/fakewebrtcvcmfactory.h"
+#include "media/engine/webrtcvideocapturer.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/thread.h"
 
 using cricket::VideoFormat;
 
diff --git a/media/engine/webrtcvideocapturerfactory.cc b/media/engine/webrtcvideocapturerfactory.cc
index 6ee361a..e770001 100644
--- a/media/engine/webrtcvideocapturerfactory.cc
+++ b/media/engine/webrtcvideocapturerfactory.cc
@@ -10,8 +10,8 @@
 
 #include <memory>
 
-#include "webrtc/media/engine/webrtcvideocapturer.h"
-#include "webrtc/media/engine/webrtcvideocapturerfactory.h"
+#include "media/engine/webrtcvideocapturer.h"
+#include "media/engine/webrtcvideocapturerfactory.h"
 
 namespace cricket {
 
diff --git a/media/engine/webrtcvideocapturerfactory.h b/media/engine/webrtcvideocapturerfactory.h
index c1f91b7..da39afd 100644
--- a/media/engine/webrtcvideocapturerfactory.h
+++ b/media/engine/webrtcvideocapturerfactory.h
@@ -9,10 +9,10 @@
  */
 
 // TODO(pthatcher): Rename file to match class name.
-#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
-#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
+#ifndef MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
+#define MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
 
-#include "webrtc/media/base/videocapturerfactory.h"
+#include "media/base/videocapturerfactory.h"
 
 namespace cricket {
 
@@ -24,4 +24,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
+#endif  // MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
diff --git a/media/engine/webrtcvideodecoderfactory.h b/media/engine/webrtcvideodecoderfactory.h
index e4d1c98..1bb770f 100644
--- a/media/engine/webrtcvideodecoderfactory.h
+++ b/media/engine/webrtcvideodecoderfactory.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
-#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
+#ifndef MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
+#define MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
 
-#include "webrtc/common_types.h"
-#include "webrtc/media/base/codec.h"
-#include "webrtc/rtc_base/refcount.h"
+#include "common_types.h"
+#include "media/base/codec.h"
+#include "rtc_base/refcount.h"
 
 namespace webrtc {
 class VideoDecoder;
@@ -60,4 +60,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
+#endif  // MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
diff --git a/media/engine/webrtcvideoencoderfactory.h b/media/engine/webrtcvideoencoderfactory.h
index 284f1ef..9f06616 100644
--- a/media/engine/webrtcvideoencoderfactory.h
+++ b/media/engine/webrtcvideoencoderfactory.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
-#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
+#ifndef MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
+#define MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
 
 #include <vector>
 
-#include "webrtc/common_types.h"
-#include "webrtc/media/base/codec.h"
+#include "common_types.h"
+#include "media/base/codec.h"
 
 namespace webrtc {
 class VideoEncoder;
@@ -48,4 +48,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
+#endif  // MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
diff --git a/media/engine/webrtcvideoencoderfactory_unittest.cc b/media/engine/webrtcvideoencoderfactory_unittest.cc
index 5d3c9ab..2b156a8 100644
--- a/media/engine/webrtcvideoencoderfactory_unittest.cc
+++ b/media/engine/webrtcvideoencoderfactory_unittest.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
 
-#include "webrtc/test/gtest.h"
+#include "test/gtest.h"
 
 class WebRtcVideoEncoderFactoryForTest
     : public cricket::WebRtcVideoEncoderFactory {
diff --git a/media/engine/webrtcvideoengine.cc b/media/engine/webrtcvideoengine.cc
index 26b9397..29fc442 100644
--- a/media/engine/webrtcvideoengine.cc
+++ b/media/engine/webrtcvideoengine.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/engine/webrtcvideoengine.h"
+#include "media/engine/webrtcvideoengine.h"
 
 #include <stdio.h>
 #include <algorithm>
@@ -16,32 +16,32 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/api/video_codecs/sdp_video_format.h"
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/api/video_codecs/video_decoder_factory.h"
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/api/video_codecs/video_encoder_factory.h"
-#include "webrtc/call/call.h"
-#include "webrtc/common_video/h264/profile_level_id.h"
-#include "webrtc/media/engine/constants.h"
-#include "webrtc/media/engine/internaldecoderfactory.h"
-#include "webrtc/media/engine/internalencoderfactory.h"
-#include "webrtc/media/engine/scopedvideodecoder.h"
-#include "webrtc/media/engine/scopedvideoencoder.h"
-#include "webrtc/media/engine/simulcast.h"
-#include "webrtc/media/engine/simulcast_encoder_adapter.h"
-#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
-#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
-#include "webrtc/media/engine/webrtcmediaengine.h"
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-#include "webrtc/media/engine/webrtcvoiceengine.h"
-#include "webrtc/rtc_base/copyonwritebuffer.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/rtc_base/trace_event.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
+#include "api/video/i420_buffer.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_decoder.h"
+#include "api/video_codecs/video_decoder_factory.h"
+#include "api/video_codecs/video_encoder.h"
+#include "api/video_codecs/video_encoder_factory.h"
+#include "call/call.h"
+#include "common_video/h264/profile_level_id.h"
+#include "media/engine/constants.h"
+#include "media/engine/internaldecoderfactory.h"
+#include "media/engine/internalencoderfactory.h"
+#include "media/engine/scopedvideodecoder.h"
+#include "media/engine/scopedvideoencoder.h"
+#include "media/engine/simulcast.h"
+#include "media/engine/simulcast_encoder_adapter.h"
+#include "media/engine/videodecodersoftwarefallbackwrapper.h"
+#include "media/engine/videoencodersoftwarefallbackwrapper.h"
+#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtcvoiceengine.h"
+#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/timeutils.h"
+#include "rtc_base/trace_event.h"
+#include "system_wrappers/include/field_trial.h"
 
 using DegradationPreference = webrtc::VideoSendStream::DegradationPreference;
 
diff --git a/media/engine/webrtcvideoengine.h b/media/engine/webrtcvideoengine.h
index ff55059..23d9b48 100644
--- a/media/engine/webrtcvideoengine.h
+++ b/media/engine/webrtcvideoengine.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
-#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
+#ifndef MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
+#define MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
 
 #include <map>
 #include <memory>
@@ -17,24 +17,24 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/api/call/transport.h"
-#include "webrtc/api/optional.h"
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/api/video_codecs/sdp_video_format.h"
-#include "webrtc/call/call.h"
-#include "webrtc/call/flexfec_receive_stream.h"
-#include "webrtc/call/video_receive_stream.h"
-#include "webrtc/call/video_send_stream.h"
-#include "webrtc/media/base/mediaengine.h"
-#include "webrtc/media/base/videosinkinterface.h"
-#include "webrtc/media/base/videosourceinterface.h"
-#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-#include "webrtc/rtc_base/asyncinvoker.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/networkroute.h"
-#include "webrtc/rtc_base/thread_annotations.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "api/call/transport.h"
+#include "api/optional.h"
+#include "api/video/video_frame.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "call/call.h"
+#include "call/flexfec_receive_stream.h"
+#include "call/video_receive_stream.h"
+#include "call/video_send_stream.h"
+#include "media/base/mediaengine.h"
+#include "media/base/videosinkinterface.h"
+#include "media/base/videosourceinterface.h"
+#include "media/engine/webrtcvideodecoderfactory.h"
+#include "media/engine/webrtcvideoencoderfactory.h"
+#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/networkroute.h"
+#include "rtc_base/thread_annotations.h"
+#include "rtc_base/thread_checker.h"
 
 namespace webrtc {
 class VideoDecoder;
@@ -534,4 +534,4 @@
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
+#endif  // MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
diff --git a/media/engine/webrtcvideoengine_unittest.cc b/media/engine/webrtcvideoengine_unittest.cc
index 195f757..936bc73 100644
--- a/media/engine/webrtcvideoengine_unittest.cc
+++ b/media/engine/webrtcvideoengine_unittest.cc
@@ -13,28 +13,28 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/api/video_codecs/sdp_video_format.h"
-#include "webrtc/api/video_codecs/video_decoder_factory.h"
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/api/video_codecs/video_encoder_factory.h"
-#include "webrtc/call/flexfec_receive_stream.h"
-#include "webrtc/common_video/h264/profile_level_id.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/media/base/testutils.h"
-#include "webrtc/media/base/videoengine_unittest.h"
-#include "webrtc/media/engine/constants.h"
-#include "webrtc/media/engine/fakewebrtccall.h"
-#include "webrtc/media/engine/fakewebrtcvideoengine.h"
-#include "webrtc/media/engine/simulcast.h"
-#include "webrtc/media/engine/webrtcvideoengine.h"
-#include "webrtc/media/engine/webrtcvoiceengine.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/rtc_base/stringutils.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/test/gmock.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_decoder_factory.h"
+#include "api/video_codecs/video_encoder.h"
+#include "api/video_codecs/video_encoder_factory.h"
+#include "call/flexfec_receive_stream.h"
+#include "common_video/h264/profile_level_id.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/base/mediaconstants.h"
+#include "media/base/rtputils.h"
+#include "media/base/testutils.h"
+#include "media/base/videoengine_unittest.h"
+#include "media/engine/constants.h"
+#include "media/engine/fakewebrtccall.h"
+#include "media/engine/fakewebrtcvideoengine.h"
+#include "media/engine/simulcast.h"
+#include "media/engine/webrtcvideoengine.h"
+#include "media/engine/webrtcvoiceengine.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/stringutils.h"
+#include "test/field_trial.h"
+#include "test/gmock.h"
 
 using webrtc::RtpExtension;
 
diff --git a/media/engine/webrtcvoe.h b/media/engine/webrtcvoe.h
index 79f0ed6..bdff21c 100644
--- a/media/engine/webrtcvoe.h
+++ b/media/engine/webrtcvoe.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_
-#define WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_
+#ifndef MEDIA_ENGINE_WEBRTCVOE_H_
+#define MEDIA_ENGINE_WEBRTCVOE_H_
 
 #include <memory>
 
-#include "webrtc/media/engine/webrtccommon.h"
+#include "media/engine/webrtccommon.h"
 
-#include "webrtc/common_types.h"
-#include "webrtc/modules/audio_device/include/audio_device.h"
-#include "webrtc/voice_engine/include/voe_base.h"
-#include "webrtc/voice_engine/include/voe_codec.h"
-#include "webrtc/voice_engine/include/voe_errors.h"
+#include "common_types.h"
+#include "modules/audio_device/include/audio_device.h"
+#include "voice_engine/include/voe_base.h"
+#include "voice_engine/include/voe_codec.h"
+#include "voice_engine/include/voe_errors.h"
 
 namespace cricket {
 // automatically handles lifetime of WebRtc VoiceEngine
@@ -91,4 +91,4 @@
 };
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_
+#endif  // MEDIA_ENGINE_WEBRTCVOE_H_
diff --git a/media/engine/webrtcvoiceengine.cc b/media/engine/webrtcvoiceengine.cc
index d202106..271ace1 100644
--- a/media/engine/webrtcvoiceengine.cc
+++ b/media/engine/webrtcvoiceengine.cc
@@ -10,7 +10,7 @@
 
 #ifdef HAVE_WEBRTC_VOICE
 
-#include "webrtc/media/engine/webrtcvoiceengine.h"
+#include "media/engine/webrtcvoiceengine.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -18,32 +18,32 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/media/base/audiosource.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/base/streamparams.h"
-#include "webrtc/media/engine/adm_helpers.h"
-#include "webrtc/media/engine/apm_helpers.h"
-#include "webrtc/media/engine/payload_type_mapper.h"
-#include "webrtc/media/engine/webrtcmediaengine.h"
-#include "webrtc/media/engine/webrtcvoe.h"
-#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
-#include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/base64.h"
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/helpers.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/race_checker.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/field_trial.h"
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/trace.h"
-#include "webrtc/voice_engine/transmit_mixer.h"
+#include "api/call/audio_sink.h"
+#include "media/base/audiosource.h"
+#include "media/base/mediaconstants.h"
+#include "media/base/streamparams.h"
+#include "media/engine/adm_helpers.h"
+#include "media/engine/apm_helpers.h"
+#include "media/engine/payload_type_mapper.h"
+#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtcvoe.h"
+#include "modules/audio_mixer/audio_mixer_impl.h"
+#include "modules/audio_processing/aec_dump/aec_dump_factory.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/base64.h"
+#include "rtc_base/byteorder.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/helpers.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/race_checker.h"
+#include "rtc_base/stringencode.h"
+#include "rtc_base/stringutils.h"
+#include "rtc_base/trace_event.h"
+#include "system_wrappers/include/field_trial.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/trace.h"
+#include "voice_engine/transmit_mixer.h"
 
 namespace cricket {
 namespace {
diff --git a/media/engine/webrtcvoiceengine.h b/media/engine/webrtcvoiceengine.h
index a42459a..e278576 100644
--- a/media/engine/webrtcvoiceengine.h
+++ b/media/engine/webrtcvoiceengine.h
@@ -8,30 +8,30 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
-#define WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
+#ifndef MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
+#define MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "webrtc/api/audio_codecs/audio_encoder_factory.h"
-#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/call/audio_state.h"
-#include "webrtc/call/call.h"
-#include "webrtc/media/base/rtputils.h"
-#include "webrtc/media/engine/apm_helpers.h"
-#include "webrtc/media/engine/webrtccommon.h"
-#include "webrtc/media/engine/webrtcvoe.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/pc/channel.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/networkroute.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "api/audio_codecs/audio_encoder_factory.h"
+#include "api/rtpreceiverinterface.h"
+#include "call/audio_state.h"
+#include "call/call.h"
+#include "media/base/rtputils.h"
+#include "media/engine/apm_helpers.h"
+#include "media/engine/webrtccommon.h"
+#include "media/engine/webrtcvoe.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "pc/channel.h"
+#include "rtc_base/buffer.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/networkroute.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/task_queue.h"
+#include "rtc_base/thread_checker.h"
 
 namespace webrtc {
 namespace voe {
@@ -308,4 +308,4 @@
 };
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
+#endif  // MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
diff --git a/media/engine/webrtcvoiceengine_unittest.cc b/media/engine/webrtcvoiceengine_unittest.cc
index edb861e..2c31253 100644
--- a/media/engine/webrtcvoiceengine_unittest.cc
+++ b/media/engine/webrtcvoiceengine_unittest.cc
@@ -10,29 +10,29 @@
 
 #include <memory>
 
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/call/call.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/base/fakenetworkinterface.h"
-#include "webrtc/media/base/fakertp.h"
-#include "webrtc/media/base/mediaconstants.h"
-#include "webrtc/media/engine/fakewebrtccall.h"
-#include "webrtc/media/engine/fakewebrtcvoiceengine.h"
-#include "webrtc/media/engine/webrtcvoiceengine.h"
-#include "webrtc/modules/audio_device/include/mock_audio_device.h"
-#include "webrtc/modules/audio_processing/include/mock_audio_processing.h"
-#include "webrtc/pc/channel.h"
-#include "webrtc/rtc_base/arraysize.h"
-#include "webrtc/rtc_base/byteorder.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/mock_audio_decoder_factory.h"
-#include "webrtc/test/mock_audio_encoder_factory.h"
-#include "webrtc/voice_engine/transmit_mixer.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "call/call.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "media/base/fakemediaengine.h"
+#include "media/base/fakenetworkinterface.h"
+#include "media/base/fakertp.h"
+#include "media/base/mediaconstants.h"
+#include "media/engine/fakewebrtccall.h"
+#include "media/engine/fakewebrtcvoiceengine.h"
+#include "media/engine/webrtcvoiceengine.h"
+#include "modules/audio_device/include/mock_audio_device.h"
+#include "modules/audio_processing/include/mock_audio_processing.h"
+#include "pc/channel.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/byteorder.h"
+#include "rtc_base/safe_conversions.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "test/field_trial.h"
+#include "test/gtest.h"
+#include "test/mock_audio_decoder_factory.h"
+#include "test/mock_audio_encoder_factory.h"
+#include "voice_engine/transmit_mixer.h"
 
 using testing::_;
 using testing::ContainerEq;