diff --git a/webrtc/audio/audio_receive_stream.cc b/webrtc/audio/audio_receive_stream.cc
index 079e971786..6dedca5f63 100644
--- a/webrtc/audio/audio_receive_stream.cc
+++ b/webrtc/audio/audio_receive_stream.cc
@@ -17,13 +17,13 @@
 #include "webrtc/audio/audio_send_stream.h"
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/conversion.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/call/rtp_stream_receiver_controller_interface.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/voice_engine/channel_proxy.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
diff --git a/webrtc/audio/audio_receive_stream.h b/webrtc/audio/audio_receive_stream.h
index 92c4763b51..dc7992f400 100644
--- a/webrtc/audio/audio_receive_stream.h
+++ b/webrtc/audio/audio_receive_stream.h
@@ -16,11 +16,11 @@
 
 #include "webrtc/api/audio/audio_mixer.h"
 #include "webrtc/audio/audio_state.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/audio_receive_stream.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
 #include "webrtc/call/syncable.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace webrtc {
 class PacketRouter;
diff --git a/webrtc/audio/audio_send_stream.cc b/webrtc/audio/audio_send_stream.cc
index 36ad63d32e..1861cc004f 100644
--- a/webrtc/audio/audio_send_stream.cc
+++ b/webrtc/audio/audio_send_stream.cc
@@ -17,17 +17,17 @@
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/conversion.h"
 #include "webrtc/audio/scoped_voe_interface.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/function_view.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h"
 #include "webrtc/modules/pacing/paced_sender.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/function_view.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/voice_engine/channel_proxy.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 #include "webrtc/voice_engine/transmit_mixer.h"
diff --git a/webrtc/audio/audio_send_stream.h b/webrtc/audio/audio_send_stream.h
index 881c68ed4d..70cf1c874d 100644
--- a/webrtc/audio/audio_send_stream.h
+++ b/webrtc/audio/audio_send_stream.h
@@ -14,12 +14,12 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/audio_send_stream.h"
 #include "webrtc/call/audio_state.h"
 #include "webrtc/call/bitrate_allocator.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
 
 namespace webrtc {
diff --git a/webrtc/audio/audio_send_stream_unittest.cc b/webrtc/audio/audio_send_stream_unittest.cc
index b685cfbf01..b906443106 100644
--- a/webrtc/audio/audio_send_stream_unittest.cc
+++ b/webrtc/audio/audio_send_stream_unittest.cc
@@ -15,8 +15,6 @@
 #include "webrtc/audio/audio_send_stream.h"
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/conversion.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/task_queue.h"
 #include "webrtc/call/fake_rtp_transport_controller_send.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h"
@@ -27,6 +25,8 @@
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h"
 #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/task_queue.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_encoder.h"
 #include "webrtc/test/mock_audio_encoder_factory.h"
diff --git a/webrtc/audio/audio_state.cc b/webrtc/audio/audio_state.cc
index 961e772a9d..90147ca606 100644
--- a/webrtc/audio/audio_state.cc
+++ b/webrtc/audio/audio_state.cc
@@ -10,10 +10,10 @@
 
 #include "webrtc/audio/audio_state.h"
 
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 
 namespace webrtc {
diff --git a/webrtc/audio/audio_state.h b/webrtc/audio/audio_state.h
index 8a98d5739e..90bbadb029 100644
--- a/webrtc/audio/audio_state.h
+++ b/webrtc/audio/audio_state.h
@@ -13,10 +13,10 @@
 
 #include "webrtc/audio/audio_transport_proxy.h"
 #include "webrtc/audio/scoped_voe_interface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/audio_state.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 
 namespace webrtc {
diff --git a/webrtc/audio/audio_transport_proxy.h b/webrtc/audio/audio_transport_proxy.h
index fda9339171..7d2dea1f94 100644
--- a/webrtc/audio/audio_transport_proxy.h
+++ b/webrtc/audio/audio_transport_proxy.h
@@ -12,11 +12,11 @@
 #define WEBRTC_AUDIO_AUDIO_TRANSPORT_PROXY_H_
 
 #include "webrtc/api/audio/audio_mixer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/modules/audio_device/include/audio_device_defines.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 
diff --git a/webrtc/audio/scoped_voe_interface.h b/webrtc/audio/scoped_voe_interface.h
index 1029337228..59631bfd16 100644
--- a/webrtc/audio/scoped_voe_interface.h
+++ b/webrtc/audio/scoped_voe_interface.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_
 #define WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/audio/utility/audio_frame_operations.cc b/webrtc/audio/utility/audio_frame_operations.cc
index beb3e4cc93..1299e04028 100644
--- a/webrtc/audio/utility/audio_frame_operations.cc
+++ b/webrtc/audio/utility/audio_frame_operations.cc
@@ -12,9 +12,9 @@
 
 #include <algorithm>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/audio/utility/audio_frame_operations_unittest.cc b/webrtc/audio/utility/audio_frame_operations_unittest.cc
index e3e9804c6c..deab9bd97b 100644
--- a/webrtc/audio/utility/audio_frame_operations_unittest.cc
+++ b/webrtc/audio/utility/audio_frame_operations_unittest.cc
@@ -9,8 +9,8 @@
  */
 
 #include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/call/audio_receive_stream.h b/webrtc/call/audio_receive_stream.h
index e3bdd45247..5837b2ef62 100644
--- a/webrtc/call/audio_receive_stream.h
+++ b/webrtc/call/audio_receive_stream.h
@@ -19,10 +19,10 @@
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
 #include "webrtc/api/call/transport.h"
 #include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_types.h"
 #include "webrtc/config.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/call/audio_send_stream.h b/webrtc/call/audio_send_stream.h
index 6c7e707d93..e0fe47db6d 100644
--- a/webrtc/call/audio_send_stream.h
+++ b/webrtc/call/audio_send_stream.h
@@ -18,8 +18,8 @@
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
 #include "webrtc/api/call/transport.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/config.h"
+#include "webrtc/rtc_base/optional.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/call/audio_state.h b/webrtc/call/audio_state.h
index 32b7ada3f8..826b31d12a 100644
--- a/webrtc/call/audio_state.h
+++ b/webrtc/call/audio_state.h
@@ -11,8 +11,8 @@
 #define WEBRTC_CALL_AUDIO_STATE_H_
 
 #include "webrtc/api/audio/audio_mixer.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/bitrate_allocator.cc b/webrtc/call/bitrate_allocator.cc
index 9aecc6e3e8..1e22c00a97 100644
--- a/webrtc/call/bitrate_allocator.cc
+++ b/webrtc/call/bitrate_allocator.cc
@@ -14,9 +14,9 @@
 #include <algorithm>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
diff --git a/webrtc/call/bitrate_allocator.h b/webrtc/call/bitrate_allocator.h
index e92eac90e6..b36d38e652 100644
--- a/webrtc/call/bitrate_allocator.h
+++ b/webrtc/call/bitrate_allocator.h
@@ -17,7 +17,7 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc
index ef7aba83e3..de12ef7618 100644
--- a/webrtc/call/bitrate_estimator_tests.cc
+++ b/webrtc/call/bitrate_estimator_tests.cc
@@ -12,11 +12,11 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/call/call.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/test/call_test.h"
 #include "webrtc/test/direct_transport.h"
 #include "webrtc/test/encoder_settings.h"
diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc
index b4a9456d77..8f9cb2b956 100644
--- a/webrtc/call/call.cc
+++ b/webrtc/call/call.cc
@@ -20,17 +20,6 @@
 #include "webrtc/audio/audio_send_stream.h"
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/scoped_voe_interface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/call/bitrate_allocator.h"
 #include "webrtc/call/call.h"
 #include "webrtc/call/flexfec_receive_stream_impl.h"
@@ -47,6 +36,17 @@
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/trace_event.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/cpu_info.h"
 #include "webrtc/system_wrappers/include/metrics.h"
diff --git a/webrtc/call/call.h b/webrtc/call/call.h
index 842ed60887..86142f0fea 100644
--- a/webrtc/call/call.h
+++ b/webrtc/call/call.h
@@ -16,15 +16,15 @@
 #include <vector>
 
 #include "webrtc/api/rtcerror.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/platform_file.h"
-#include "webrtc/base/socket.h"
 #include "webrtc/call/audio_receive_stream.h"
 #include "webrtc/call/audio_send_stream.h"
 #include "webrtc/call/audio_state.h"
 #include "webrtc/call/flexfec_receive_stream.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/networkroute.h"
+#include "webrtc/rtc_base/platform_file.h"
+#include "webrtc/rtc_base/socket.h"
 #include "webrtc/video_receive_stream.h"
 #include "webrtc/video_send_stream.h"
 
diff --git a/webrtc/call/call_perf_tests.cc b/webrtc/call/call_perf_tests.cc
index 0c0a0cfd29..f8461bffaa 100644
--- a/webrtc/call/call_perf_tests.cc
+++ b/webrtc/call/call_perf_tests.cc
@@ -14,15 +14,15 @@
 #include <string>
 
 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/call/call.h"
 #include "webrtc/config.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/metrics_default.h"
 #include "webrtc/test/call_test.h"
 #include "webrtc/test/direct_transport.h"
diff --git a/webrtc/call/call_unittest.cc b/webrtc/call/call_unittest.cc
index 5267e7a6ee..2524de6d19 100644
--- a/webrtc/call/call_unittest.cc
+++ b/webrtc/call/call_unittest.cc
@@ -14,7 +14,6 @@
 #include <utility>
 
 #include "webrtc/api/test/mock_audio_mixer.h"
-#include "webrtc/base/ptr_util.h"
 #include "webrtc/call/audio_state.h"
 #include "webrtc/call/call.h"
 #include "webrtc/call/fake_rtp_transport_controller_send.h"
@@ -23,6 +22,7 @@
 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
 #include "webrtc/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_decoder_factory.h"
 #include "webrtc/test/mock_transport.h"
diff --git a/webrtc/call/flexfec_receive_stream_impl.cc b/webrtc/call/flexfec_receive_stream_impl.cc
index c73d9e98e5..a1e9bc64ec 100644
--- a/webrtc/call/flexfec_receive_stream_impl.cc
+++ b/webrtc/call/flexfec_receive_stream_impl.cc
@@ -12,15 +12,15 @@
 
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/call/rtp_stream_receiver_controller_interface.h"
 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/call/flexfec_receive_stream_impl.h b/webrtc/call/flexfec_receive_stream_impl.h
index a89940f8c3..81c09d6fac 100644
--- a/webrtc/call/flexfec_receive_stream_impl.h
+++ b/webrtc/call/flexfec_receive_stream_impl.h
@@ -13,9 +13,9 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/call/flexfec_receive_stream.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
+#include "webrtc/rtc_base/criticalsection.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/flexfec_receive_stream_unittest.cc b/webrtc/call/flexfec_receive_stream_unittest.cc
index ba41406094..c8e0116b5c 100644
--- a/webrtc/call/flexfec_receive_stream_unittest.cc
+++ b/webrtc/call/flexfec_receive_stream_unittest.cc
@@ -10,7 +10,6 @@
 
 #include <stdint.h>
 
-#include "webrtc/base/array_view.h"
 #include "webrtc/call/flexfec_receive_stream_impl.h"
 #include "webrtc/call/rtp_stream_receiver_controller.h"
 #include "webrtc/modules/pacing/packet_router.h"
@@ -20,6 +19,7 @@
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/utility/include/mock/mock_process_thread.h"
+#include "webrtc/rtc_base/array_view.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_transport.h"
diff --git a/webrtc/call/rampup_tests.cc b/webrtc/call/rampup_tests.cc
index 5128d50451..a50abee66b 100644
--- a/webrtc/call/rampup_tests.cc
+++ b/webrtc/call/rampup_tests.cc
@@ -10,9 +10,9 @@
 
 #include "webrtc/call/rampup_tests.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/platform_thread.h"
 #include "webrtc/test/encoder_settings.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/perf_test.h"
diff --git a/webrtc/call/rampup_tests.h b/webrtc/call/rampup_tests.h
index 6710dd12f8..eedef7bea7 100644
--- a/webrtc/call/rampup_tests.h
+++ b/webrtc/call/rampup_tests.h
@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/event.h"
 #include "webrtc/call/call.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
+#include "webrtc/rtc_base/event.h"
 #include "webrtc/test/call_test.h"
 
 namespace webrtc {
diff --git a/webrtc/call/rsid_resolution_observer.h b/webrtc/call/rsid_resolution_observer.h
index b14fa9da3f..ea08045cf1 100644
--- a/webrtc/call/rsid_resolution_observer.h
+++ b/webrtc/call/rsid_resolution_observer.h
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "webrtc/base/basictypes.h"
+#include "webrtc/rtc_base/basictypes.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/rtcp_demuxer.cc b/webrtc/call/rtcp_demuxer.cc
index 6054fc0541..a8003f86eb 100644
--- a/webrtc/call/rtcp_demuxer.cc
+++ b/webrtc/call/rtcp_demuxer.cc
@@ -10,10 +10,10 @@
 
 #include "webrtc/call/rtcp_demuxer.h"
 
-#include "webrtc/base/checks.h"
 #include "webrtc/call/rtcp_packet_sink_interface.h"
 #include "webrtc/call/rtp_rtcp_demuxer_helper.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/rtcp_demuxer.h b/webrtc/call/rtcp_demuxer.h
index c5c1621036..591e0110e8 100644
--- a/webrtc/call/rtcp_demuxer.h
+++ b/webrtc/call/rtcp_demuxer.h
@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/basictypes.h"
 #include "webrtc/call/rsid_resolution_observer.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/basictypes.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/rtcp_demuxer_unittest.cc b/webrtc/call/rtcp_demuxer_unittest.cc
index 49f037c4f5..89b712b3c6 100644
--- a/webrtc/call/rtcp_demuxer_unittest.cc
+++ b/webrtc/call/rtcp_demuxer_unittest.cc
@@ -12,13 +12,13 @@
 
 #include <memory>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ptr_util.h"
 #include "webrtc/call/rtcp_packet_sink_interface.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
diff --git a/webrtc/call/rtcp_packet_sink_interface.h b/webrtc/call/rtcp_packet_sink_interface.h
index e26bd37c50..1b3cfba4e9 100644
--- a/webrtc/call/rtcp_packet_sink_interface.h
+++ b/webrtc/call/rtcp_packet_sink_interface.h
@@ -10,7 +10,7 @@
 #ifndef WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_
 #define WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_
 
-#include "webrtc/base/array_view.h"
+#include "webrtc/rtc_base/array_view.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/rtp_demuxer.cc b/webrtc/call/rtp_demuxer.cc
index 205498fd84..ce1234208f 100644
--- a/webrtc/call/rtp_demuxer.cc
+++ b/webrtc/call/rtp_demuxer.cc
@@ -10,13 +10,13 @@
 
 #include "webrtc/call/rtp_demuxer.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/call/rsid_resolution_observer.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
 #include "webrtc/call/rtp_rtcp_demuxer_helper.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/rtp_demuxer_unittest.cc b/webrtc/call/rtp_demuxer_unittest.cc
index 6d61f57894..8c2eab11bf 100644
--- a/webrtc/call/rtp_demuxer_unittest.cc
+++ b/webrtc/call/rtp_demuxer_unittest.cc
@@ -13,16 +13,16 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ptr_util.h"
 #include "webrtc/call/rsid_resolution_observer.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ptr_util.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
diff --git a/webrtc/call/rtp_rtcp_demuxer_helper.h b/webrtc/call/rtp_rtcp_demuxer_helper.h
index 19bd603244..4791e55ca3 100644
--- a/webrtc/call/rtp_rtcp_demuxer_helper.h
+++ b/webrtc/call/rtp_rtcp_demuxer_helper.h
@@ -15,9 +15,9 @@
 #include <map>
 #include <utility>
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc b/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc
index e51002f6ad..96a1383c59 100644
--- a/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc
+++ b/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc
@@ -12,9 +12,6 @@
 
 #include "webrtc/call/rtp_rtcp_demuxer_helper.h"
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/buffer.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
@@ -22,6 +19,9 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/buffer.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/call/rtp_stream_receiver_controller.cc b/webrtc/call/rtp_stream_receiver_controller.cc
index a4b1e36ae2..1238665352 100644
--- a/webrtc/call/rtp_stream_receiver_controller.cc
+++ b/webrtc/call/rtp_stream_receiver_controller.cc
@@ -9,7 +9,7 @@
  */
 
 #include "webrtc/call/rtp_stream_receiver_controller.h"
-#include "webrtc/base/ptr_util.h"
+#include "webrtc/rtc_base/ptr_util.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/rtp_stream_receiver_controller.h b/webrtc/call/rtp_stream_receiver_controller.h
index 5c8ed6775e..0fbf669513 100644
--- a/webrtc/call/rtp_stream_receiver_controller.h
+++ b/webrtc/call/rtp_stream_receiver_controller.h
@@ -12,9 +12,9 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/call/rtp_demuxer.h"
 #include "webrtc/call/rtp_stream_receiver_controller_interface.h"
+#include "webrtc/rtc_base/criticalsection.h"
 
 namespace webrtc {
 
diff --git a/webrtc/call/rtp_transport_controller_send.h b/webrtc/call/rtp_transport_controller_send.h
index cec8a74578..da3ae007aa 100644
--- a/webrtc/call/rtp_transport_controller_send.h
+++ b/webrtc/call/rtp_transport_controller_send.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_
 #define WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 class Clock;
diff --git a/webrtc/call/syncable.h b/webrtc/call/syncable.h
index 3459f9eb81..734d20ec06 100644
--- a/webrtc/call/syncable.h
+++ b/webrtc/call/syncable.h
@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/audio_converter.cc b/webrtc/common_audio/audio_converter.cc
index e8595333f6..9e4bdaa334 100644
--- a/webrtc/common_audio/audio_converter.cc
+++ b/webrtc/common_audio/audio_converter.cc
@@ -15,10 +15,10 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_conversions.h"
 #include "webrtc/common_audio/channel_buffer.h"
 #include "webrtc/common_audio/resampler/push_sinc_resampler.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 using rtc::checked_cast;
 
diff --git a/webrtc/common_audio/audio_converter.h b/webrtc/common_audio/audio_converter.h
index d3c65acee1..8b2388f44a 100644
--- a/webrtc/common_audio/audio_converter.h
+++ b/webrtc/common_audio/audio_converter.h
@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/audio_converter_unittest.cc b/webrtc/common_audio/audio_converter_unittest.cc
index 320c1dae42..2c44998a4e 100644
--- a/webrtc/common_audio/audio_converter_unittest.cc
+++ b/webrtc/common_audio/audio_converter_unittest.cc
@@ -13,11 +13,11 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/format_macros.h"
 #include "webrtc/common_audio/audio_converter.h"
 #include "webrtc/common_audio/channel_buffer.h"
 #include "webrtc/common_audio/resampler/push_sinc_resampler.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/format_macros.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/audio_ring_buffer.cc b/webrtc/common_audio/audio_ring_buffer.cc
index a29e53a61c..e5631b2966 100644
--- a/webrtc/common_audio/audio_ring_buffer.cc
+++ b/webrtc/common_audio/audio_ring_buffer.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/common_audio/audio_ring_buffer.h"
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/ring_buffer.h"
+#include "webrtc/rtc_base/checks.h"
 
 // This is a simple multi-channel wrapper over the ring_buffer.h C interface.
 
diff --git a/webrtc/common_audio/blocker.cc b/webrtc/common_audio/blocker.cc
index 86dfdf3644..6969332836 100644
--- a/webrtc/common_audio/blocker.cc
+++ b/webrtc/common_audio/blocker.cc
@@ -12,7 +12,7 @@
 
 #include <string.h>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace {
 
diff --git a/webrtc/common_audio/blocker_unittest.cc b/webrtc/common_audio/blocker_unittest.cc
index 1c675db730..3af9699cbc 100644
--- a/webrtc/common_audio/blocker_unittest.cc
+++ b/webrtc/common_audio/blocker_unittest.cc
@@ -12,7 +12,7 @@
 
 #include "webrtc/common_audio/blocker.h"
 
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
 #include "webrtc/test/gtest.h"
 
 namespace {
diff --git a/webrtc/common_audio/channel_buffer.cc b/webrtc/common_audio/channel_buffer.cc
index 0f364114c6..e7912bbd4d 100644
--- a/webrtc/common_audio/channel_buffer.cc
+++ b/webrtc/common_audio/channel_buffer.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/common_audio/channel_buffer.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/channel_buffer.h b/webrtc/common_audio/channel_buffer.h
index 930dd73553..5d4fb88956 100644
--- a/webrtc/common_audio/channel_buffer.h
+++ b/webrtc/common_audio/channel_buffer.h
@@ -15,9 +15,9 @@
 
 #include <memory>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gtest_prod_util.h"
 #include "webrtc/common_audio/include/audio_util.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gtest_prod_util.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/fir_filter.cc b/webrtc/common_audio/fir_filter.cc
index 5f5e210ce1..f069af3b52 100644
--- a/webrtc/common_audio/fir_filter.cc
+++ b/webrtc/common_audio/fir_filter.cc
@@ -14,9 +14,9 @@
 
 #include <memory>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/fir_filter_neon.h"
 #include "webrtc/common_audio/fir_filter_sse.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/fir_filter_neon.cc b/webrtc/common_audio/fir_filter_neon.cc
index 54e58d0d7a..26d119503e 100644
--- a/webrtc/common_audio/fir_filter_neon.cc
+++ b/webrtc/common_audio/fir_filter_neon.cc
@@ -13,7 +13,7 @@
 #include <arm_neon.h>
 #include <string.h>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/aligned_malloc.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/fir_filter_sse.cc b/webrtc/common_audio/fir_filter_sse.cc
index 308eeb676f..3e7c2afe7c 100644
--- a/webrtc/common_audio/fir_filter_sse.cc
+++ b/webrtc/common_audio/fir_filter_sse.cc
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <xmmintrin.h>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/aligned_malloc.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/include/audio_util.h b/webrtc/common_audio/include/audio_util.h
index 9307c556ad..f1077c6325 100644
--- a/webrtc/common_audio/include/audio_util.h
+++ b/webrtc/common_audio/include/audio_util.h
@@ -15,7 +15,7 @@
 #include <limits>
 #include <cstring>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/lapped_transform.cc b/webrtc/common_audio/lapped_transform.cc
index 6825bebb7a..227b866c3b 100644
--- a/webrtc/common_audio/lapped_transform.cc
+++ b/webrtc/common_audio/lapped_transform.cc
@@ -14,8 +14,8 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/real_fourier.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/real_fourier.cc b/webrtc/common_audio/real_fourier.cc
index e721346f31..ed1ad111d5 100644
--- a/webrtc/common_audio/real_fourier.cc
+++ b/webrtc/common_audio/real_fourier.cc
@@ -10,10 +10,10 @@
 
 #include "webrtc/common_audio/real_fourier.h"
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/real_fourier_ooura.h"
 #include "webrtc/common_audio/real_fourier_openmax.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/real_fourier_ooura.cc b/webrtc/common_audio/real_fourier_ooura.cc
index 8cd4c86b5b..26a8a7d362 100644
--- a/webrtc/common_audio/real_fourier_ooura.cc
+++ b/webrtc/common_audio/real_fourier_ooura.cc
@@ -13,8 +13,8 @@
 #include <cmath>
 #include <algorithm>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/fft4g.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/real_fourier_openmax.cc b/webrtc/common_audio/real_fourier_openmax.cc
index bc3e7347cb..4d971da573 100644
--- a/webrtc/common_audio/real_fourier_openmax.cc
+++ b/webrtc/common_audio/real_fourier_openmax.cc
@@ -13,7 +13,7 @@
 #include <cstdlib>
 
 #include "dl/sp/api/omxSP.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/resampler/push_resampler.cc b/webrtc/common_audio/resampler/push_resampler.cc
index ec904b81c8..38cdf2b172 100644
--- a/webrtc/common_audio/resampler/push_resampler.cc
+++ b/webrtc/common_audio/resampler/push_resampler.cc
@@ -12,10 +12,10 @@
 
 #include <string.h>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/include/audio_util.h"
 #include "webrtc/common_audio/resampler/include/resampler.h"
 #include "webrtc/common_audio/resampler/push_sinc_resampler.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/common_audio/resampler/push_resampler_unittest.cc b/webrtc/common_audio/resampler/push_resampler_unittest.cc
index 9a5cb5defc..eb08f704ab 100644
--- a/webrtc/common_audio/resampler/push_resampler_unittest.cc
+++ b/webrtc/common_audio/resampler/push_resampler_unittest.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/checks.h"  // RTC_DCHECK_IS_ON
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
+#include "webrtc/rtc_base/checks.h"  // RTC_DCHECK_IS_ON
 #include "webrtc/test/gtest.h"
 
 // Quality testing of PushResampler is handled through output_mixer_unittest.cc.
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.cc b/webrtc/common_audio/resampler/push_sinc_resampler.cc
index a740423eec..3b603dbb58 100644
--- a/webrtc/common_audio/resampler/push_sinc_resampler.cc
+++ b/webrtc/common_audio/resampler/push_sinc_resampler.cc
@@ -12,8 +12,8 @@
 
 #include <cstring>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/include/audio_util.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.h b/webrtc/common_audio/resampler/push_sinc_resampler.h
index 2ba60cac9c..7af85c8c4c 100644
--- a/webrtc/common_audio/resampler/push_sinc_resampler.h
+++ b/webrtc/common_audio/resampler/push_sinc_resampler.h
@@ -13,8 +13,8 @@
 
 #include <memory>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/resampler/sinc_resampler.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
index eab46efb9b..cb156cce44 100644
--- a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
+++ b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
@@ -13,10 +13,10 @@
 #include <cstring>
 #include <memory>
 
-#include "webrtc/base/timeutils.h"
 #include "webrtc/common_audio/include/audio_util.h"
 #include "webrtc/common_audio/resampler/push_sinc_resampler.h"
 #include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/typedefs.h"
diff --git a/webrtc/common_audio/resampler/sinc_resampler.cc b/webrtc/common_audio/resampler/sinc_resampler.cc
index 1203f771f4..acf7d0fae9 100644
--- a/webrtc/common_audio/resampler/sinc_resampler.cc
+++ b/webrtc/common_audio/resampler/sinc_resampler.cc
@@ -92,7 +92,7 @@
 
 #include <limits>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
 #include "webrtc/typedefs.h"
 
diff --git a/webrtc/common_audio/resampler/sinc_resampler.h b/webrtc/common_audio/resampler/sinc_resampler.h
index ecfd64c0a6..fa92163f86 100644
--- a/webrtc/common_audio/resampler/sinc_resampler.h
+++ b/webrtc/common_audio/resampler/sinc_resampler.h
@@ -16,8 +16,8 @@
 
 #include <memory>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/gtest_prod_util.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/gtest_prod_util.h"
 #include "webrtc/system_wrappers/include/aligned_malloc.h"
 #include "webrtc/typedefs.h"
 
diff --git a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
index 990580dd2d..8a3d1ec893 100644
--- a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
+++ b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
@@ -19,10 +19,10 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/base/stringize_macros.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/common_audio/resampler/sinc_resampler.h"
 #include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h"
+#include "webrtc/rtc_base/stringize_macros.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
diff --git a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h
index 1807f86a19..80ccd8072a 100644
--- a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h
+++ b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h
@@ -14,8 +14,8 @@
 #ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_
 #define WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/resampler/sinc_resampler.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/signal_processing/dot_product_with_scale.cc b/webrtc/common_audio/signal_processing/dot_product_with_scale.cc
index 4067ab5599..7cd6e91ba3 100644
--- a/webrtc/common_audio/signal_processing/dot_product_with_scale.cc
+++ b/webrtc/common_audio/signal_processing/dot_product_with_scale.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/common_audio/signal_processing/dot_product_with_scale.h"
 
-#include "webrtc/base/safe_conversions.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1,
                                       const int16_t* vector2,
diff --git a/webrtc/common_audio/signal_processing/include/spl_inl.h b/webrtc/common_audio/signal_processing/include/spl_inl.h
index 2eb958ffc3..c5aec272de 100644
--- a/webrtc/common_audio/signal_processing/include/spl_inl.h
+++ b/webrtc/common_audio/signal_processing/include/spl_inl.h
@@ -15,7 +15,7 @@
 #ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
 #define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
 
-#include "webrtc/base/compile_assert_c.h"
+#include "webrtc/rtc_base/compile_assert_c.h"
 
 extern const int8_t kWebRtcSpl_CountLeadingZeros32_Table[64];
 
diff --git a/webrtc/common_audio/smoothing_filter.cc b/webrtc/common_audio/smoothing_filter.cc
index 91bcb22a25..d95662ca18 100644
--- a/webrtc/common_audio/smoothing_filter.cc
+++ b/webrtc/common_audio/smoothing_filter.cc
@@ -12,7 +12,7 @@
 
 #include <cmath>
 
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/smoothing_filter.h b/webrtc/common_audio/smoothing_filter.h
index 39bc56a48d..c59842ec8c 100644
--- a/webrtc/common_audio/smoothing_filter.h
+++ b/webrtc/common_audio/smoothing_filter.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_
 #define WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/smoothing_filter_unittest.cc b/webrtc/common_audio/smoothing_filter_unittest.cc
index 5075545f13..6e0bde85cb 100644
--- a/webrtc/common_audio/smoothing_filter_unittest.cc
+++ b/webrtc/common_audio/smoothing_filter_unittest.cc
@@ -11,8 +11,8 @@
 #include <cmath>
 #include <memory>
 
-#include "webrtc/base/fakeclock.h"
 #include "webrtc/common_audio/smoothing_filter.h"
+#include "webrtc/rtc_base/fakeclock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/sparse_fir_filter.cc b/webrtc/common_audio/sparse_fir_filter.cc
index 2928004a0d..299028f1ff 100644
--- a/webrtc/common_audio/sparse_fir_filter.cc
+++ b/webrtc/common_audio/sparse_fir_filter.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/common_audio/sparse_fir_filter.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/sparse_fir_filter.h b/webrtc/common_audio/sparse_fir_filter.h
index 2d406a0f19..6bc5528b5d 100644
--- a/webrtc/common_audio/sparse_fir_filter.h
+++ b/webrtc/common_audio/sparse_fir_filter.h
@@ -14,7 +14,7 @@
 #include <cstring>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/sparse_fir_filter_unittest.cc b/webrtc/common_audio/sparse_fir_filter_unittest.cc
index e7ba5d20f9..a000596c34 100644
--- a/webrtc/common_audio/sparse_fir_filter_unittest.cc
+++ b/webrtc/common_audio/sparse_fir_filter_unittest.cc
@@ -12,8 +12,8 @@
 
 #include "webrtc/common_audio/sparse_fir_filter.h"
 
-#include "webrtc/base/arraysize.h"
 #include "webrtc/common_audio/fir_filter.h"
+#include "webrtc/rtc_base/arraysize.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/vad/include/vad.h b/webrtc/common_audio/vad/include/vad.h
index 86e6f66e0d..ed649f5c48 100644
--- a/webrtc/common_audio/vad/include/vad.h
+++ b/webrtc/common_audio/vad/include/vad.h
@@ -13,8 +13,8 @@
 
 #include <memory>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/vad/include/webrtc_vad.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/common_audio/vad/vad.cc b/webrtc/common_audio/vad/vad.cc
index e634aa2ffd..5f3443e6f5 100644
--- a/webrtc/common_audio/vad/vad.cc
+++ b/webrtc/common_audio/vad/vad.cc
@@ -12,7 +12,7 @@
 
 #include <memory>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/vad/vad_unittest.cc b/webrtc/common_audio/vad/vad_unittest.cc
index f2210d9784..69d6a7b345 100644
--- a/webrtc/common_audio/vad/vad_unittest.cc
+++ b/webrtc/common_audio/vad/vad_unittest.cc
@@ -12,10 +12,10 @@
 
 #include <stdlib.h>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 #include "webrtc/common_audio/vad/include/webrtc_vad.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/typedefs.h"
 
diff --git a/webrtc/common_audio/wav_file.cc b/webrtc/common_audio/wav_file.cc
index 0f37f9cdea..3b1b9eef6c 100644
--- a/webrtc/common_audio/wav_file.cc
+++ b/webrtc/common_audio/wav_file.cc
@@ -15,10 +15,10 @@
 #include <limits>
 #include <sstream>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_conversions.h"
 #include "webrtc/common_audio/include/audio_util.h"
 #include "webrtc/common_audio/wav_header.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/wav_file.h b/webrtc/common_audio/wav_file.h
index 812c21dafa..1ec6c65449 100644
--- a/webrtc/common_audio/wav_file.h
+++ b/webrtc/common_audio/wav_file.h
@@ -17,7 +17,7 @@
 #include <cstddef>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_audio/wav_header.cc b/webrtc/common_audio/wav_header.cc
index 402ea17916..0423c089c5 100644
--- a/webrtc/common_audio/wav_header.cc
+++ b/webrtc/common_audio/wav_header.cc
@@ -19,8 +19,8 @@
 #include <limits>
 #include <string>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_audio/include/audio_util.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/common_audio/window_generator.cc b/webrtc/common_audio/window_generator.cc
index ab983b736f..ea5198a360 100644
--- a/webrtc/common_audio/window_generator.cc
+++ b/webrtc/common_audio/window_generator.cc
@@ -15,7 +15,7 @@
 #include <cmath>
 #include <complex>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 using std::complex;
 
diff --git a/webrtc/common_audio/window_generator.h b/webrtc/common_audio/window_generator.h
index 25dd233b44..3bbf21a8d0 100644
--- a/webrtc/common_audio/window_generator.h
+++ b/webrtc/common_audio/window_generator.h
@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_types.cc b/webrtc/common_types.cc
index 70e5d2e9ac..a76175fbd9 100644
--- a/webrtc/common_types.cc
+++ b/webrtc/common_types.cc
@@ -15,8 +15,8 @@
 #include <limits>
 #include <type_traits>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index 7b62dbca09..5215d312b1 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -21,9 +21,9 @@
 #include "webrtc/api/video/video_content_type.h"
 #include "webrtc/api/video/video_rotation.h"
 #include "webrtc/api/video/video_timing.h"
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/optional.h"
 #include "webrtc/typedefs.h"
 
 #if defined(_MSC_VER)
diff --git a/webrtc/common_video/bitrate_adjuster.cc b/webrtc/common_video/bitrate_adjuster.cc
index 9c5c077a83..7f58ec973c 100644
--- a/webrtc/common_video/bitrate_adjuster.cc
+++ b/webrtc/common_video/bitrate_adjuster.cc
@@ -13,8 +13,8 @@
 #include <algorithm>
 #include <cmath>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/common_video/h264/h264_bitstream_parser.cc b/webrtc/common_video/h264/h264_bitstream_parser.cc
index 8bc474749d..4661687cff 100644
--- a/webrtc/common_video/h264/h264_bitstream_parser.cc
+++ b/webrtc/common_video/h264/h264_bitstream_parser.cc
@@ -12,11 +12,11 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/checks.h"
 
 #include "webrtc/common_video/h264/h264_common.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace {
 const int kMaxAbsQpDeltaValue = 51;
diff --git a/webrtc/common_video/h264/h264_bitstream_parser.h b/webrtc/common_video/h264/h264_bitstream_parser.h
index aa0155239a..136c90317f 100644
--- a/webrtc/common_video/h264/h264_bitstream_parser.h
+++ b/webrtc/common_video/h264/h264_bitstream_parser.h
@@ -13,9 +13,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "webrtc/base/optional.h"
 #include "webrtc/common_video/h264/pps_parser.h"
 #include "webrtc/common_video/h264/sps_parser.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace rtc {
 class BitBufferWriter;
diff --git a/webrtc/common_video/h264/h264_common.h b/webrtc/common_video/h264/h264_common.h
index c63875feb5..fc3448497b 100644
--- a/webrtc/common_video/h264/h264_common.h
+++ b/webrtc/common_video/h264/h264_common.h
@@ -14,7 +14,7 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/buffer.h"
+#include "webrtc/rtc_base/buffer.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_video/h264/pps_parser.cc b/webrtc/common_video/h264/pps_parser.cc
index 228d8538d0..0df0289bdd 100644
--- a/webrtc/common_video/h264/pps_parser.cc
+++ b/webrtc/common_video/h264/pps_parser.cc
@@ -14,8 +14,8 @@
 #include <vector>
 
 #include "webrtc/common_video/h264/h264_common.h"
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/logging.h"
 
 #define RETURN_EMPTY_ON_FAIL(x)                  \
   if (!(x)) {                                    \
diff --git a/webrtc/common_video/h264/pps_parser.h b/webrtc/common_video/h264/pps_parser.h
index 02167a85c1..941b99e71e 100644
--- a/webrtc/common_video/h264/pps_parser.h
+++ b/webrtc/common_video/h264/pps_parser.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_
 #define WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace rtc {
 class BitBuffer;
diff --git a/webrtc/common_video/h264/pps_parser_unittest.cc b/webrtc/common_video/h264/pps_parser_unittest.cc
index 03490647c0..886808aa8e 100644
--- a/webrtc/common_video/h264/pps_parser_unittest.cc
+++ b/webrtc/common_video/h264/pps_parser_unittest.cc
@@ -13,9 +13,9 @@
 #include <limits>
 #include <memory>
 
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/buffer.h"
 #include "webrtc/common_video/h264/h264_common.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/buffer.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/common_video/h264/sps_parser.cc b/webrtc/common_video/h264/sps_parser.cc
index 3bf08539bf..fbf7ee7794 100644
--- a/webrtc/common_video/h264/sps_parser.cc
+++ b/webrtc/common_video/h264/sps_parser.cc
@@ -14,8 +14,8 @@
 #include <vector>
 
 #include "webrtc/common_video/h264/h264_common.h"
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/logging.h"
 
 typedef rtc::Optional<webrtc::SpsParser::SpsState> OptionalSps;
 
diff --git a/webrtc/common_video/h264/sps_parser.h b/webrtc/common_video/h264/sps_parser.h
index dfd4b6b4b1..ea14f79202 100644
--- a/webrtc/common_video/h264/sps_parser.h
+++ b/webrtc/common_video/h264/sps_parser.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_
 #define WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace rtc {
 class BitBuffer;
diff --git a/webrtc/common_video/h264/sps_parser_unittest.cc b/webrtc/common_video/h264/sps_parser_unittest.cc
index 958ddc05eb..5a0df9a1b0 100644
--- a/webrtc/common_video/h264/sps_parser_unittest.cc
+++ b/webrtc/common_video/h264/sps_parser_unittest.cc
@@ -10,10 +10,10 @@
 
 #include "webrtc/common_video/h264/sps_parser.h"
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/buffer.h"
 #include "webrtc/common_video/h264/h264_common.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/buffer.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/common_video/h264/sps_vui_rewriter.cc b/webrtc/common_video/h264/sps_vui_rewriter.cc
index 534e75c865..1d1b76e8fc 100644
--- a/webrtc/common_video/h264/sps_vui_rewriter.cc
+++ b/webrtc/common_video/h264/sps_vui_rewriter.cc
@@ -15,10 +15,10 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_minmax.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_minmax.h"
 
 #include "webrtc/common_video/h264/h264_common.h"
 #include "webrtc/common_video/h264/sps_parser.h"
diff --git a/webrtc/common_video/h264/sps_vui_rewriter.h b/webrtc/common_video/h264/sps_vui_rewriter.h
index bf052b3a23..6eff1abcea 100644
--- a/webrtc/common_video/h264/sps_vui_rewriter.h
+++ b/webrtc/common_video/h264/sps_vui_rewriter.h
@@ -12,9 +12,9 @@
 #ifndef WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_
 #define WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_
 
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/common_video/h264/sps_parser.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace rtc {
 class BitBuffer;
diff --git a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc
index 44c6287588..4f36e58f1d 100644
--- a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc
+++ b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc
@@ -10,13 +10,13 @@
 
 #include <vector>
 
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/pathutils.h"
 #include "webrtc/common_video/h264/h264_common.h"
 #include "webrtc/common_video/h264/sps_vui_rewriter.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/pathutils.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/common_video/i420_buffer_pool.cc b/webrtc/common_video/i420_buffer_pool.cc
index aa9c32ecd0..8dab614914 100644
--- a/webrtc/common_video/i420_buffer_pool.cc
+++ b/webrtc/common_video/i420_buffer_pool.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_video/i420_video_frame_unittest.cc b/webrtc/common_video/i420_video_frame_unittest.cc
index 0b564ff298..025c54b6ff 100644
--- a/webrtc/common_video/i420_video_frame_unittest.cc
+++ b/webrtc/common_video/i420_video_frame_unittest.cc
@@ -11,10 +11,10 @@
 #include <math.h>
 #include <string.h>
 
-#include "webrtc/api/video/video_frame.h"
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/api/video/video_frame.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/test/fake_texture_frame.h"
 #include "webrtc/test/frame_utils.h"
 #include "webrtc/test/gtest.h"
diff --git a/webrtc/common_video/include/bitrate_adjuster.h b/webrtc/common_video/include/bitrate_adjuster.h
index 5fd1e3851b..1b70ebdbd9 100644
--- a/webrtc/common_video/include/bitrate_adjuster.h
+++ b/webrtc/common_video/include/bitrate_adjuster.h
@@ -13,8 +13,8 @@
 
 #include <functional>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/rate_statistics.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/rate_statistics.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_video/include/i420_buffer_pool.h b/webrtc/common_video/include/i420_buffer_pool.h
index 454a8cd9d7..85206ee904 100644
--- a/webrtc/common_video/include/i420_buffer_pool.h
+++ b/webrtc/common_video/include/i420_buffer_pool.h
@@ -15,7 +15,7 @@
 #include <limits>
 
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/race_checker.h"
+#include "webrtc/rtc_base/race_checker.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_video/include/incoming_video_stream.h b/webrtc/common_video/include/incoming_video_stream.h
index ff407c56d8..927336a8e8 100644
--- a/webrtc/common_video/include/incoming_video_stream.h
+++ b/webrtc/common_video/include/incoming_video_stream.h
@@ -11,10 +11,10 @@
 #ifndef WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
 #define WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
 
-#include "webrtc/base/race_checker.h"
-#include "webrtc/base/task_queue.h"
 #include "webrtc/common_video/video_render_frames.h"
 #include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/rtc_base/race_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_video/include/video_frame_buffer.h b/webrtc/common_video/include/video_frame_buffer.h
index 8016c65521..cdeb7cd98c 100644
--- a/webrtc/common_video/include/video_frame_buffer.h
+++ b/webrtc/common_video/include/video_frame_buffer.h
@@ -14,8 +14,8 @@
 #include <memory>
 
 #include "webrtc/api/video/video_frame_buffer.h"
-#include "webrtc/base/callback.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/callback.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc
index 8f5d474870..be16cfbac0 100644
--- a/webrtc/common_video/incoming_video_stream.cc
+++ b/webrtc/common_video/incoming_video_stream.cc
@@ -12,9 +12,9 @@
 
 #include <memory>
 
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/common_video/video_render_frames.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/trace_event.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 
 namespace webrtc {
diff --git a/webrtc/common_video/libyuv/webrtc_libyuv.cc b/webrtc/common_video/libyuv/webrtc_libyuv.cc
index 0b3957a9cf..0cb3b04969 100644
--- a/webrtc/common_video/libyuv/webrtc_libyuv.cc
+++ b/webrtc/common_video/libyuv/webrtc_libyuv.cc
@@ -12,7 +12,7 @@
 
 #include <string.h>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 // TODO(nisse): Only needed for the deprecated ConvertToI420.
 #include "webrtc/api/video/i420_buffer.h"
 
diff --git a/webrtc/common_video/video_frame.cc b/webrtc/common_video/video_frame.cc
index f062b732ef..862905fd2f 100644
--- a/webrtc/common_video/video_frame.cc
+++ b/webrtc/common_video/video_frame.cc
@@ -14,8 +14,8 @@
 
 #include <algorithm>  // swap
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_video/video_frame_buffer.cc b/webrtc/common_video/video_frame_buffer.cc
index 3c4d2a0a9f..f26e627786 100644
--- a/webrtc/common_video/video_frame_buffer.cc
+++ b/webrtc/common_video/video_frame_buffer.cc
@@ -13,11 +13,11 @@
 
 #include <algorithm>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/keep_ref_until_done.h"
 #include "libyuv/convert.h"
 #include "libyuv/planar_functions.h"
 #include "libyuv/scale.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/keep_ref_until_done.h"
 
 namespace webrtc {
 
diff --git a/webrtc/common_video/video_render_frames.cc b/webrtc/common_video/video_render_frames.cc
index 31415c5306..2cb8d0cd80 100644
--- a/webrtc/common_video/video_render_frames.cc
+++ b/webrtc/common_video/video_render_frames.cc
@@ -12,9 +12,9 @@
 
 #include <utility>
 
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
diff --git a/webrtc/common_video/video_render_frames.h b/webrtc/common_video/video_render_frames.h
index 5ed076069c..4f043e16ba 100644
--- a/webrtc/common_video/video_render_frames.h
+++ b/webrtc/common_video/video_render_frames.h
@@ -16,7 +16,7 @@
 #include <list>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 
diff --git a/webrtc/examples/peerconnection/client/conductor.cc b/webrtc/examples/peerconnection/client/conductor.cc
index 7c41027474..8a1b9a276e 100644
--- a/webrtc/examples/peerconnection/client/conductor.cc
+++ b/webrtc/examples/peerconnection/client/conductor.cc
@@ -15,12 +15,12 @@
 #include <vector>
 
 #include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/json.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/examples/peerconnection/client/defaults.h"
 #include "webrtc/media/engine/webrtcvideocapturerfactory.h"
 #include "webrtc/modules/video_capture/video_capture_factory.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/json.h"
+#include "webrtc/rtc_base/logging.h"
 
 // Names used for a IceCandidate JSON object.
 const char kCandidateSdpMidName[] = "sdpMid";
diff --git a/webrtc/examples/peerconnection/client/defaults.cc b/webrtc/examples/peerconnection/client/defaults.cc
index 5a202423a9..ed8cdb1e1c 100644
--- a/webrtc/examples/peerconnection/client/defaults.cc
+++ b/webrtc/examples/peerconnection/client/defaults.cc
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #endif
 
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
 
 const char kAudioLabel[] = "audio_label";
 const char kVideoLabel[] = "video_label";
diff --git a/webrtc/examples/peerconnection/client/flagdefs.h b/webrtc/examples/peerconnection/client/flagdefs.h
index 19a2b02c36..f3dda765e5 100644
--- a/webrtc/examples/peerconnection/client/flagdefs.h
+++ b/webrtc/examples/peerconnection/client/flagdefs.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
 #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
 
-#include "webrtc/base/flags.h"
+#include "webrtc/rtc_base/flags.h"
 
 extern const uint16_t kDefaultServerPort;  // From defaults.[h|cc]
 
diff --git a/webrtc/examples/peerconnection/client/linux/main.cc b/webrtc/examples/peerconnection/client/linux/main.cc
index 7886f766f9..d57bc982f4 100644
--- a/webrtc/examples/peerconnection/client/linux/main.cc
+++ b/webrtc/examples/peerconnection/client/linux/main.cc
@@ -15,8 +15,8 @@
 #include "webrtc/examples/peerconnection/client/linux/main_wnd.h"
 #include "webrtc/examples/peerconnection/client/peer_connection_client.h"
 
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
 
 class CustomSocketServer : public rtc::PhysicalSocketServer {
  public:
diff --git a/webrtc/examples/peerconnection/client/linux/main_wnd.cc b/webrtc/examples/peerconnection/client/linux/main_wnd.cc
index 151faaaec1..d9f32bc52e 100644
--- a/webrtc/examples/peerconnection/client/linux/main_wnd.cc
+++ b/webrtc/examples/peerconnection/client/linux/main_wnd.cc
@@ -17,9 +17,9 @@
 #include "libyuv/convert_from.h"
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/examples/peerconnection/client/defaults.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 using rtc::sprintfn;
 
diff --git a/webrtc/examples/peerconnection/client/main.cc b/webrtc/examples/peerconnection/client/main.cc
index 5ec1a7ae7d..bd69be9531 100644
--- a/webrtc/examples/peerconnection/client/main.cc
+++ b/webrtc/examples/peerconnection/client/main.cc
@@ -12,11 +12,10 @@
 #include "webrtc/examples/peerconnection/client/flagdefs.h"
 #include "webrtc/examples/peerconnection/client/main_wnd.h"
 #include "webrtc/examples/peerconnection/client/peer_connection_client.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/win32socketinit.h"
-#include "webrtc/base/win32socketserver.h"
-
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/win32socketinit.h"
+#include "webrtc/rtc_base/win32socketserver.h"
 
 int PASCAL wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
                     wchar_t* cmd_line, int cmd_show) {
diff --git a/webrtc/examples/peerconnection/client/main_wnd.cc b/webrtc/examples/peerconnection/client/main_wnd.cc
index e7c4c6e922..da21c5f953 100644
--- a/webrtc/examples/peerconnection/client/main_wnd.cc
+++ b/webrtc/examples/peerconnection/client/main_wnd.cc
@@ -15,9 +15,9 @@
 #include "libyuv/convert_argb.h"
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/examples/peerconnection/client/defaults.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 ATOM MainWnd::wnd_class_ = 0;
 const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd";
diff --git a/webrtc/examples/peerconnection/client/main_wnd.h b/webrtc/examples/peerconnection/client/main_wnd.h
index 01c8823f0e..18f56a708d 100644
--- a/webrtc/examples/peerconnection/client/main_wnd.h
+++ b/webrtc/examples/peerconnection/client/main_wnd.h
@@ -17,10 +17,10 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/win32.h"
 #include "webrtc/examples/peerconnection/client/peer_connection_client.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/win32.h"
 
 class MainWndCallback {
  public:
diff --git a/webrtc/examples/peerconnection/client/peer_connection_client.cc b/webrtc/examples/peerconnection/client/peer_connection_client.cc
index 8c391a8368..2f5916774c 100644
--- a/webrtc/examples/peerconnection/client/peer_connection_client.cc
+++ b/webrtc/examples/peerconnection/client/peer_connection_client.cc
@@ -10,15 +10,15 @@
 
 #include "webrtc/examples/peerconnection/client/peer_connection_client.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/examples/peerconnection/client/defaults.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
 
 #ifdef WIN32
-#include "webrtc/base/win32socketserver.h"
+#include "webrtc/rtc_base/win32socketserver.h"
 #endif
 
 using rtc::sprintfn;
diff --git a/webrtc/examples/peerconnection/client/peer_connection_client.h b/webrtc/examples/peerconnection/client/peer_connection_client.h
index a15924bc05..2b4f35c2aa 100644
--- a/webrtc/examples/peerconnection/client/peer_connection_client.h
+++ b/webrtc/examples/peerconnection/client/peer_connection_client.h
@@ -15,10 +15,10 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/physicalsocketserver.h"
-#include "webrtc/base/sigslot.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/physicalsocketserver.h"
+#include "webrtc/rtc_base/sigslot.h"
 
 typedef std::map<int, std::string> Peers;
 
diff --git a/webrtc/examples/peerconnection/server/peer_channel.cc b/webrtc/examples/peerconnection/server/peer_channel.cc
index 35d592eb76..5a0585b799 100644
--- a/webrtc/examples/peerconnection/server/peer_channel.cc
+++ b/webrtc/examples/peerconnection/server/peer_channel.cc
@@ -18,8 +18,8 @@
 
 #include "webrtc/examples/peerconnection/server/data_socket.h"
 #include "webrtc/examples/peerconnection/server/utils.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 using rtc::sprintfn;
 
diff --git a/webrtc/examples/peerconnection/server/utils.cc b/webrtc/examples/peerconnection/server/utils.cc
index 93a6d05342..85f5f9e225 100644
--- a/webrtc/examples/peerconnection/server/utils.cc
+++ b/webrtc/examples/peerconnection/server/utils.cc
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 using rtc::ToString;
 
diff --git a/webrtc/examples/relayserver/relayserver_main.cc b/webrtc/examples/relayserver/relayserver_main.cc
index c14ea459c8..02f5438c03 100644
--- a/webrtc/examples/relayserver/relayserver_main.cc
+++ b/webrtc/examples/relayserver/relayserver_main.cc
@@ -12,7 +12,7 @@
 #include <memory>
 
 #include "webrtc/p2p/base/relayserver.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
 
 int main(int argc, char **argv) {
   if (argc != 3) {
diff --git a/webrtc/examples/stunprober/main.cc b/webrtc/examples/stunprober/main.cc
index a3ce992e9f..8c3b424f82 100644
--- a/webrtc/examples/stunprober/main.cc
+++ b/webrtc/examples/stunprober/main.cc
@@ -16,18 +16,18 @@
 #include <map>
 #include <memory>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/flags.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/stunprober/stunprober.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/flags.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 using stunprober::StunProber;
 using stunprober::AsyncCallback;
diff --git a/webrtc/examples/stunserver/stunserver_main.cc b/webrtc/examples/stunserver/stunserver_main.cc
index 9bdf58ac3f..b084606e69 100644
--- a/webrtc/examples/stunserver/stunserver_main.cc
+++ b/webrtc/examples/stunserver/stunserver_main.cc
@@ -15,7 +15,7 @@
 #include <iostream>
 
 #include "webrtc/p2p/base/stunserver.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
 
 using cricket::StunServer;
 
diff --git a/webrtc/examples/turnserver/turnserver_main.cc b/webrtc/examples/turnserver/turnserver_main.cc
index e7b464f19c..c232ce9ad7 100644
--- a/webrtc/examples/turnserver/turnserver_main.cc
+++ b/webrtc/examples/turnserver/turnserver_main.cc
@@ -12,10 +12,10 @@
 
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/turnserver.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/optionsfile.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/optionsfile.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/thread.h"
 
 static const char kSoftware[] = "libjingle TurnServer";
 
diff --git a/webrtc/examples/unityplugin/simple_peer_connection.cc b/webrtc/examples/unityplugin/simple_peer_connection.cc
index ee959b7aab..c302e9c433 100644
--- a/webrtc/examples/unityplugin/simple_peer_connection.cc
+++ b/webrtc/examples/unityplugin/simple_peer_connection.cc
@@ -13,9 +13,9 @@
 #include <utility>
 
 #include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/json.h"
 #include "webrtc/media/engine/webrtcvideocapturerfactory.h"
 #include "webrtc/modules/video_capture/video_capture_factory.h"
+#include "webrtc/rtc_base/json.h"
 
 // Names used for a IceCandidate JSON object.
 const char kCandidateSdpMidName[] = "sdpMid";
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.cc b/webrtc/logging/rtc_event_log/rtc_event_log.cc
index 6b0783116a..c2f17b7680 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log.cc
@@ -13,15 +13,6 @@
 #include <limits>
 #include <vector>
 
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/protobuf_utils.h"
-#include "webrtc/base/swap_queue.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
@@ -37,6 +28,15 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/protobuf_utils.h"
+#include "webrtc/rtc_base/swap_queue.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 
 #ifdef ENABLE_RTC_EVENT_LOG
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.h b/webrtc/logging/rtc_event_log/rtc_event_log.h
index 0d45552bb1..dc3351120c 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log.h
+++ b/webrtc/logging/rtc_event_log/rtc_event_log.h
@@ -15,8 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/platform_file.h"
 #include "webrtc/config.h"
+#include "webrtc/rtc_base/platform_file.h"
 
 namespace webrtc {
 
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc b/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
index e22f1f31a8..23d69416e7 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
@@ -14,11 +14,11 @@
 #include <string>
 
 #include "gflags/gflags.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/rtp_file_writer.h"
 
 namespace {
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc b/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc
index 8d24e318e7..eb290b8845 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc
@@ -20,10 +20,10 @@
 #include <vector>
 
 #include "gflags/gflags.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ignore_wundef.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
+#include "webrtc/rtc_base/logging.h"
 
 // Files generated at build-time by the protobuf compiler.
 RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2text.cc b/webrtc/logging/rtc_event_log/rtc_event_log2text.cc
index 7467ae62ab..c17a3b5802 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log2text.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log2text.cc
@@ -15,7 +15,6 @@
 #include <utility>  // pair
 
 #include "gflags/gflags.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/common_types.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
@@ -33,6 +32,7 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace {
 
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc
index cdc30f9c36..a98336fa52 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc
@@ -12,9 +12,9 @@
 
 #include <algorithm>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 #ifdef ENABLE_RTC_EVENT_LOG
 
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h
index e8a983c9d8..0d9ad4dc96 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h
@@ -17,12 +17,12 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/ignore_wundef.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/protobuf_utils.h"
-#include "webrtc/base/swap_queue.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/protobuf_utils.h"
+#include "webrtc/rtc_base/swap_queue.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 
 #ifdef ENABLE_RTC_EVENT_LOG
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc b/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc
index 78dd4fdce7..8a8d8e3d47 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc
@@ -19,13 +19,13 @@
 #include <map>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/protobuf_utils.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/protobuf_utils.h"
 
 namespace webrtc {
 
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_parser.h b/webrtc/logging/rtc_event_log/rtc_event_log_parser.h
index cd431bf111..cf2f22e865 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_parser.h
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_parser.h
@@ -15,10 +15,10 @@
 #include <utility>  // pair
 #include <vector>
 
-#include "webrtc/base/ignore_wundef.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
 #include "webrtc/video_receive_stream.h"
 #include "webrtc/video_send_stream.h"
 
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc b/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc
index 0a13be3a30..e908ccd5fb 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc
@@ -14,10 +14,6 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/random.h"
 #include "webrtc/call/call.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
@@ -29,6 +25,10 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/random.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
index 280158dcff..9d98855d4a 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
diff --git a/webrtc/media/base/codec.cc b/webrtc/media/base/codec.cc
index 49c990e78b..a94940227b 100644
--- a/webrtc/media/base/codec.cc
+++ b/webrtc/media/base/codec.cc
@@ -13,11 +13,11 @@
 #include <algorithm>
 #include <sstream>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/media/base/h264_profile_level_id.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"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/codec_unittest.cc b/webrtc/media/base/codec_unittest.cc
index f59304ca9d..26966bbcba 100644
--- a/webrtc/media/base/codec_unittest.cc
+++ b/webrtc/media/base/codec_unittest.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/codec.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using cricket::AudioCodec;
 using cricket::Codec;
diff --git a/webrtc/media/base/device.h b/webrtc/media/base/device.h
index 621dd15dc9..7eb630f7da 100644
--- a/webrtc/media/base/device.h
+++ b/webrtc/media/base/device.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MEDIA_BASE_DEVICE_H_
 #define WEBRTC_MEDIA_BASE_DEVICE_H_
 
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/fakemediaengine.h b/webrtc/media/base/fakemediaengine.h
index 04dfae0a59..0082391d76 100644
--- a/webrtc/media/base/fakemediaengine.h
+++ b/webrtc/media/base/fakemediaengine.h
@@ -19,16 +19,16 @@
 #include <vector>
 
 #include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/media/base/audiosource.h"
 #include "webrtc/media/base/mediaengine.h"
 #include "webrtc/media/base/rtputils.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/p2p/base/sessiondescription.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/networkroute.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 using webrtc::RtpExtension;
 
diff --git a/webrtc/media/base/fakenetworkinterface.h b/webrtc/media/base/fakenetworkinterface.h
index ed8b2326d2..a6a40ed1e8 100644
--- a/webrtc/media/base/fakenetworkinterface.h
+++ b/webrtc/media/base/fakenetworkinterface.h
@@ -14,15 +14,15 @@
 #include <map>
 #include <vector>
 
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/rtputils.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/fakertp.cc b/webrtc/media/base/fakertp.cc
index f9c880f98b..1c67d87544 100644
--- a/webrtc/media/base/fakertp.cc
+++ b/webrtc/media/base/fakertp.cc
@@ -10,8 +10,8 @@
 
 #include <algorithm>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/fakertp.h"
+#include "webrtc/rtc_base/gunit.h"
 
 void CompareHeaderExtensions(const char* packet1, size_t packet1_size,
     const char* packet2, size_t packet2_size,
diff --git a/webrtc/media/base/fakevideocapturer.h b/webrtc/media/base/fakevideocapturer.h
index 34f9dbf48b..f5148df642 100644
--- a/webrtc/media/base/fakevideocapturer.h
+++ b/webrtc/media/base/fakevideocapturer.h
@@ -18,9 +18,9 @@
 
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/fakevideorenderer.h b/webrtc/media/base/fakevideorenderer.h
index a678c97510..a6753d2743 100644
--- a/webrtc/media/base/fakevideorenderer.h
+++ b/webrtc/media/base/fakevideorenderer.h
@@ -12,9 +12,9 @@
 #define WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/h264_profile_level_id.cc b/webrtc/media/base/h264_profile_level_id.cc
index a651d530a9..3f43a30008 100644
--- a/webrtc/media/base/h264_profile_level_id.cc
+++ b/webrtc/media/base/h264_profile_level_id.cc
@@ -14,7 +14,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
 
 namespace webrtc {
 namespace H264 {
diff --git a/webrtc/media/base/h264_profile_level_id.h b/webrtc/media/base/h264_profile_level_id.h
index de5eedb16f..7b1d8c5c80 100644
--- a/webrtc/media/base/h264_profile_level_id.h
+++ b/webrtc/media/base/h264_profile_level_id.h
@@ -14,8 +14,8 @@
 #include <map>
 #include <string>
 
-#include "webrtc/base/optional.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 namespace H264 {
diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
index 816dfd18fc..cc6dbfd3f9 100644
--- a/webrtc/media/base/mediachannel.h
+++ b/webrtc/media/base/mediachannel.h
@@ -17,22 +17,22 @@
 
 #include "webrtc/api/rtpparameters.h"
 #include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/base/window.h"
 #include "webrtc/config.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/buffer.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/optional.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socket.h"
+#include "webrtc/rtc_base/window.h"
 // TODO(juberti): re-evaluate this include
 #include "webrtc/pc/audiomonitor.h"
 
diff --git a/webrtc/media/base/mediaengine.h b/webrtc/media/base/mediaengine.h
index 911b971648..8ce60753d0 100644
--- a/webrtc/media/base/mediaengine.h
+++ b/webrtc/media/base/mediaengine.h
@@ -21,11 +21,11 @@
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"
 #include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/fileutils.h"
 #include "webrtc/call/audio_state.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/fileutils.h"
 
 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
 #define DISABLE_MEDIA_ENGINE_FACTORY
diff --git a/webrtc/media/base/rtpdataengine.cc b/webrtc/media/base/rtpdataengine.cc
index 96f5a3b95f..89099e712d 100644
--- a/webrtc/media/base/rtpdataengine.cc
+++ b/webrtc/media/base/rtpdataengine.cc
@@ -10,15 +10,15 @@
 
 #include "webrtc/media/base/rtpdataengine.h"
 
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ratelimiter.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtputils.h"
 #include "webrtc/media/base/streamparams.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ratelimiter.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/rtpdataengine_unittest.cc b/webrtc/media/base/rtpdataengine_unittest.cc
index dca509df8a..a06040ae0a 100644
--- a/webrtc/media/base/rtpdataengine_unittest.cc
+++ b/webrtc/media/base/rtpdataengine_unittest.cc
@@ -11,14 +11,14 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
 #include "webrtc/media/base/fakenetworkinterface.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtpdataengine.h"
 #include "webrtc/media/base/rtputils.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ssladapter.h"
 
 class FakeDataReceiver : public sigslot::has_slots<> {
  public:
diff --git a/webrtc/media/base/rtputils.cc b/webrtc/media/base/rtputils.cc
index 1f81d621c4..ea1c91971e 100644
--- a/webrtc/media/base/rtputils.cc
+++ b/webrtc/media/base/rtputils.cc
@@ -12,10 +12,10 @@
 
 // PacketTimeUpdateParams is defined in asyncpacketsocket.h.
 // TODO(sergeyu): Find more appropriate place for PacketTimeUpdateParams.
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/messagedigest.h"
 #include "webrtc/media/base/turnutils.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/messagedigest.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/rtputils.h b/webrtc/media/base/rtputils.h
index f7aa85c828..a823cf7eef 100644
--- a/webrtc/media/base/rtputils.h
+++ b/webrtc/media/base/rtputils.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MEDIA_BASE_RTPUTILS_H_
 #define WEBRTC_MEDIA_BASE_RTPUTILS_H_
 
-#include "webrtc/base/byteorder.h"
+#include "webrtc/rtc_base/byteorder.h"
 
 namespace rtc {
 struct PacketTimeUpdateParams;
diff --git a/webrtc/media/base/rtputils_unittest.cc b/webrtc/media/base/rtputils_unittest.cc
index e6597bdcae..2a998eab6e 100644
--- a/webrtc/media/base/rtputils_unittest.cc
+++ b/webrtc/media/base/rtputils_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/media/base/fakertp.h"
 #include "webrtc/media/base/rtputils.h"
+#include "webrtc/media/base/fakertp.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/streamparams.h b/webrtc/media/base/streamparams.h
index 5d7feafbe3..1fc8134017 100644
--- a/webrtc/media/base/streamparams.h
+++ b/webrtc/media/base/streamparams.h
@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/streamparams_unittest.cc b/webrtc/media/base/streamparams_unittest.cc
index dc48a721ac..9dc034c829 100644
--- a/webrtc/media/base/streamparams_unittest.cc
+++ b/webrtc/media/base/streamparams_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/base/testutils.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/gunit.h"
 
 static const uint32_t kSsrcs1[] = {1};
 static const uint32_t kSsrcs2[] = {1, 2};
diff --git a/webrtc/media/base/testutils.cc b/webrtc/media/base/testutils.cc
index aa92aea1a1..ac40df8743 100644
--- a/webrtc/media/base/testutils.cc
+++ b/webrtc/media/base/testutils.cc
@@ -15,14 +15,14 @@
 #include <memory>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/stream.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/testutils.h"
 #include "webrtc/media/base/videocapturer.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/testutils.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/testutils.h b/webrtc/media/base/testutils.h
index f7cb934bb0..a7cb216bc6 100644
--- a/webrtc/media/base/testutils.h
+++ b/webrtc/media/base/testutils.h
@@ -14,13 +14,13 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/window.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/window.h"
 
 namespace rtc {
 class ByteBufferReader;
diff --git a/webrtc/media/base/turnutils.cc b/webrtc/media/base/turnutils.cc
index 1fd396084d..f1daec48dd 100644
--- a/webrtc/media/base/turnutils.cc
+++ b/webrtc/media/base/turnutils.cc
@@ -10,9 +10,9 @@
 
 #include "webrtc/media/base/turnutils.h"
 
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/turnutils_unittest.cc b/webrtc/media/base/turnutils_unittest.cc
index 1a9951b7cd..72b1f7b0e0 100644
--- a/webrtc/media/base/turnutils_unittest.cc
+++ b/webrtc/media/base/turnutils_unittest.cc
@@ -12,7 +12,7 @@
 
 #include <stddef.h>
 
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/videoadapter.cc b/webrtc/media/base/videoadapter.cc
index bee2a57301..73a5638bb3 100644
--- a/webrtc/media/base/videoadapter.cc
+++ b/webrtc/media/base/videoadapter.cc
@@ -15,12 +15,12 @@
 #include <cstdlib>
 #include <limits>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace {
 struct Fraction {
diff --git a/webrtc/media/base/videoadapter.h b/webrtc/media/base/videoadapter.h
index eb2257b9e0..135f411b0a 100644
--- a/webrtc/media/base/videoadapter.h
+++ b/webrtc/media/base/videoadapter.h
@@ -11,10 +11,10 @@
 #ifndef WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_
 #define WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/videoadapter_unittest.cc b/webrtc/media/base/videoadapter_unittest.cc
index cd9df981bc..d3a66c189d 100644
--- a/webrtc/media/base/videoadapter_unittest.cc
+++ b/webrtc/media/base/videoadapter_unittest.cc
@@ -14,12 +14,12 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/media/base/fakevideocapturer.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/testutils.h"
 #include "webrtc/media/base/videoadapter.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 namespace {
diff --git a/webrtc/media/base/videobroadcaster.cc b/webrtc/media/base/videobroadcaster.cc
index c5b1484110..8bd65c4fa4 100644
--- a/webrtc/media/base/videobroadcaster.cc
+++ b/webrtc/media/base/videobroadcaster.cc
@@ -13,8 +13,8 @@
 #include <limits>
 
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace rtc {
 
diff --git a/webrtc/media/base/videobroadcaster.h b/webrtc/media/base/videobroadcaster.h
index ccf5b3dd91..312ec7be1f 100644
--- a/webrtc/media/base/videobroadcaster.h
+++ b/webrtc/media/base/videobroadcaster.h
@@ -16,10 +16,10 @@
 #include <vector>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/media/base/videosourcebase.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace rtc {
 
diff --git a/webrtc/media/base/videobroadcaster_unittest.cc b/webrtc/media/base/videobroadcaster_unittest.cc
index ad9ccb7dbc..5e934e7e70 100644
--- a/webrtc/media/base/videobroadcaster_unittest.cc
+++ b/webrtc/media/base/videobroadcaster_unittest.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "webrtc/media/base/videobroadcaster.h"
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/fakevideorenderer.h"
-#include "webrtc/media/base/videobroadcaster.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using rtc::VideoBroadcaster;
 using rtc::VideoSinkWants;
diff --git a/webrtc/media/base/videocapturer.cc b/webrtc/media/base/videocapturer.cc
index df1eafc0d8..b65eeec536 100644
--- a/webrtc/media/base/videocapturer.cc
+++ b/webrtc/media/base/videocapturer.cc
@@ -16,7 +16,7 @@
 
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/videocapturer.h b/webrtc/media/base/videocapturer.h
index 76ab95a2b8..a65d40e5ef 100644
--- a/webrtc/media/base/videocapturer.h
+++ b/webrtc/media/base/videocapturer.h
@@ -20,15 +20,15 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/media/base/videosourceinterface.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timestampaligner.h"
 #include "webrtc/media/base/videoadapter.h"
 #include "webrtc/media/base/videobroadcaster.h"
 #include "webrtc/media/base/videocommon.h"
+#include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timestampaligner.h"
 
 namespace webrtc {
 class VideoFrame;
diff --git a/webrtc/media/base/videocapturer_unittest.cc b/webrtc/media/base/videocapturer_unittest.cc
index 2dc5cec70c..402682e511 100644
--- a/webrtc/media/base/videocapturer_unittest.cc
+++ b/webrtc/media/base/videocapturer_unittest.cc
@@ -13,13 +13,13 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/media/base/fakevideocapturer.h"
 #include "webrtc/media/base/fakevideorenderer.h"
 #include "webrtc/media/base/testutils.h"
 #include "webrtc/media/base/videocapturer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
 
 using cricket::FakeVideoCapturer;
 
diff --git a/webrtc/media/base/videocommon.cc b/webrtc/media/base/videocommon.cc
index ec1255a1e4..4bc0267ed1 100644
--- a/webrtc/media/base/videocommon.cc
+++ b/webrtc/media/base/videocommon.cc
@@ -14,7 +14,7 @@
 #include <math.h>
 #include <sstream>
 
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/videocommon.h b/webrtc/media/base/videocommon.h
index 47cfb85629..10ad383cf1 100644
--- a/webrtc/media/base/videocommon.h
+++ b/webrtc/media/base/videocommon.h
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/videocommon_unittest.cc b/webrtc/media/base/videocommon_unittest.cc
index c28a5d25ba..8430b800e4 100644
--- a/webrtc/media/base/videocommon_unittest.cc
+++ b/webrtc/media/base/videocommon_unittest.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
index ac430b2ede..77062ecf49 100644
--- a/webrtc/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -15,9 +15,6 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/call/call.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/media/base/fakenetworkinterface.h"
@@ -26,6 +23,9 @@
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/engine/fakewebrtccall.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 #define EXPECT_FRAME_WAIT(c, w, h, t) \
   EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \
diff --git a/webrtc/media/base/videosourcebase.cc b/webrtc/media/base/videosourcebase.cc
index 514072efda..222adc457f 100644
--- a/webrtc/media/base/videosourcebase.cc
+++ b/webrtc/media/base/videosourcebase.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/media/base/videosourcebase.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace rtc {
 
diff --git a/webrtc/media/base/videosourcebase.h b/webrtc/media/base/videosourcebase.h
index 36c6e4e7ce..c83abb5772 100644
--- a/webrtc/media/base/videosourcebase.h
+++ b/webrtc/media/base/videosourcebase.h
@@ -14,8 +14,8 @@
 #include <vector>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace rtc {
 
diff --git a/webrtc/media/base/videosourceinterface.h b/webrtc/media/base/videosourceinterface.h
index e7c0d38807..6ebff334da 100644
--- a/webrtc/media/base/videosourceinterface.h
+++ b/webrtc/media/base/videosourceinterface.h
@@ -12,7 +12,7 @@
 #define WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_
 
 #include "webrtc/media/base/videosinkinterface.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace rtc {
 
diff --git a/webrtc/media/engine/adm_helpers.cc b/webrtc/media/engine/adm_helpers.cc
index d8409f0df8..7902889477 100644
--- a/webrtc/media/engine/adm_helpers.cc
+++ b/webrtc/media/engine/adm_helpers.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/media/engine/adm_helpers.h"
 
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 namespace adm_helpers {
diff --git a/webrtc/media/engine/apm_helpers.cc b/webrtc/media/engine/apm_helpers.cc
index e11cac73ef..784b47c457 100644
--- a/webrtc/media/engine/apm_helpers.cc
+++ b/webrtc/media/engine/apm_helpers.cc
@@ -10,9 +10,9 @@
 
 #include "webrtc/media/engine/apm_helpers.h"
 
-#include "webrtc/base/logging.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"
 
 namespace webrtc {
diff --git a/webrtc/media/engine/fakewebrtccall.cc b/webrtc/media/engine/fakewebrtccall.cc
index ec8f6b8f16..018fb3438a 100644
--- a/webrtc/media/engine/fakewebrtccall.cc
+++ b/webrtc/media/engine/fakewebrtccall.cc
@@ -14,10 +14,10 @@
 #include <utility>
 
 #include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/platform_file.h"
-#include "webrtc/base/gunit.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"
 
 namespace cricket {
 FakeAudioSendStream::FakeAudioSendStream(
diff --git a/webrtc/media/engine/fakewebrtccall.h b/webrtc/media/engine/fakewebrtccall.h
index 34db106c43..61edb3ca0f 100644
--- a/webrtc/media/engine/fakewebrtccall.h
+++ b/webrtc/media/engine/fakewebrtccall.h
@@ -25,11 +25,11 @@
 #include <vector>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/buffer.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/rtc_base/buffer.h"
 #include "webrtc/video_receive_stream.h"
 #include "webrtc/video_send_stream.h"
 
diff --git a/webrtc/media/engine/fakewebrtcdeviceinfo.h b/webrtc/media/engine/fakewebrtcdeviceinfo.h
index 0e34001135..38f9810e6b 100644
--- a/webrtc/media/engine/fakewebrtcdeviceinfo.h
+++ b/webrtc/media/engine/fakewebrtcdeviceinfo.h
@@ -13,8 +13,8 @@
 
 #include <vector>
 
-#include "webrtc/base/stringutils.h"
 #include "webrtc/media/engine/webrtcvideocapturer.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 // Fake class for mocking out webrtc::VideoCaptureModule::DeviceInfo.
 class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo {
diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h
index 081005d0f6..604728cd02 100644
--- a/webrtc/media/engine/fakewebrtcvideoengine.h
+++ b/webrtc/media/engine/fakewebrtcvideoengine.h
@@ -18,15 +18,15 @@
 
 #include "webrtc/api/video_codecs/video_decoder.h"
 #include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread_annotations.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"
 
 namespace cricket {
 static const int kEventTimeoutMs = 10000;
diff --git a/webrtc/media/engine/fakewebrtcvoiceengine.h b/webrtc/media/engine/fakewebrtcvoiceengine.h
index f8343f2e49..b6f5ed7deb 100644
--- a/webrtc/media/engine/fakewebrtcvoiceengine.h
+++ b/webrtc/media/engine/fakewebrtcvoiceengine.h
@@ -14,8 +14,8 @@
 #include <map>
 #include <vector>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/media/engine/webrtcvoe.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace voe {
diff --git a/webrtc/media/engine/internaldecoderfactory.cc b/webrtc/media/engine/internaldecoderfactory.cc
index 5bc8c4b01c..7a1c099f19 100644
--- a/webrtc/media/engine/internaldecoderfactory.cc
+++ b/webrtc/media/engine/internaldecoderfactory.cc
@@ -12,10 +12,10 @@
 
 #include <utility>
 
-#include "webrtc/base/logging.h"
 #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"
 
 namespace cricket {
 
diff --git a/webrtc/media/engine/payload_type_mapper.h b/webrtc/media/engine/payload_type_mapper.h
index e634c9aae0..1a74f21008 100644
--- a/webrtc/media/engine/payload_type_mapper.h
+++ b/webrtc/media/engine/payload_type_mapper.h
@@ -15,8 +15,8 @@
 #include <set>
 
 #include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/media/base/codec.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/engine/simulcast.cc b/webrtc/media/engine/simulcast.cc
index f1cd2ced45..d00f5d8a97 100644
--- a/webrtc/media/engine/simulcast.cc
+++ b/webrtc/media/engine/simulcast.cc
@@ -10,11 +10,11 @@
 
 #include <stdio.h>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/logging.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"
 
 namespace cricket {
diff --git a/webrtc/media/engine/simulcast.h b/webrtc/media/engine/simulcast.h
index 3aae70f59d..4531bccaf3 100644
--- a/webrtc/media/engine/simulcast.h
+++ b/webrtc/media/engine/simulcast.h
@@ -13,8 +13,8 @@
 
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/config.h"
+#include "webrtc/rtc_base/basictypes.h"
 
 namespace cricket {
 struct StreamParams;
diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
index 34d851e013..f5b54e11d3 100644
--- a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
+++ b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
@@ -12,11 +12,11 @@
 
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/trace_event.h"
 #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"
 
 namespace webrtc {
 
diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc b/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
index 4ac84856f2..b4fc7caf83 100644
--- a/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
+++ b/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/checks.h"
 #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"
 
 namespace webrtc {
diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
index 8bf3ed4165..d9d6f32935 100644
--- a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
+++ b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
@@ -10,9 +10,9 @@
 
 #include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
 
-#include "webrtc/base/logging.h"
 #include "webrtc/media/engine/internalencoderfactory.h"
 #include "webrtc/modules/video_coding/include/video_error_codes.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc b/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
index ae6e4d98e5..e196587f05 100644
--- a/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
+++ b/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
@@ -13,11 +13,11 @@
 #include <utility>
 
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/checks.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/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/media/engine/webrtcvideocapturer.cc b/webrtc/media/engine/webrtcvideocapturer.cc
index 9e5c9219ec..3560098086 100644
--- a/webrtc/media/engine/webrtcvideocapturer.cc
+++ b/webrtc/media/engine/webrtcvideocapturer.cc
@@ -10,17 +10,17 @@
 
 #include "webrtc/media/engine/webrtcvideocapturer.h"
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_conversions.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.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 "webrtc/base/win32.h"  // Need this to #include the impl files.
 #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"
 
 namespace cricket {
diff --git a/webrtc/media/engine/webrtcvideocapturer.h b/webrtc/media/engine/webrtcvideocapturer.h
index 1687ce85c3..1cbfa08fe0 100644
--- a/webrtc/media/engine/webrtcvideocapturer.h
+++ b/webrtc/media/engine/webrtcvideocapturer.h
@@ -15,13 +15,13 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #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"
 
 namespace cricket {
 
diff --git a/webrtc/media/engine/webrtcvideocapturer_unittest.cc b/webrtc/media/engine/webrtcvideocapturer_unittest.cc
index f660e43ab4..a4414f1e2a 100644
--- a/webrtc/media/engine/webrtcvideocapturer_unittest.cc
+++ b/webrtc/media/engine/webrtcvideocapturer_unittest.cc
@@ -15,14 +15,14 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
 #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"
 
 using cricket::VideoFormat;
 
diff --git a/webrtc/media/engine/webrtcvideodecoderfactory.h b/webrtc/media/engine/webrtcvideodecoderfactory.h
index 7f0921fd12..64a8faa1e4 100644
--- a/webrtc/media/engine/webrtcvideodecoderfactory.h
+++ b/webrtc/media/engine/webrtcvideodecoderfactory.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
 
-#include "webrtc/base/refcount.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/refcount.h"
 
 namespace webrtc {
 class VideoDecoder;
diff --git a/webrtc/media/engine/webrtcvideoengine.cc b/webrtc/media/engine/webrtcvideoengine.cc
index e592740bb9..c5d49f50a3 100644
--- a/webrtc/media/engine/webrtcvideoengine.cc
+++ b/webrtc/media/engine/webrtcvideoengine.cc
@@ -19,23 +19,23 @@
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/api/video_codecs/video_decoder.h"
 #include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/trace_event.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/internalencoderfactory.h"
 #include "webrtc/media/engine/internaldecoderfactory.h"
+#include "webrtc/media/engine/internalencoderfactory.h"
 #include "webrtc/media/engine/simulcast.h"
-#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.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/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.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"
 
 using DegradationPreference = webrtc::VideoSendStream::DegradationPreference;
diff --git a/webrtc/media/engine/webrtcvideoengine.h b/webrtc/media/engine/webrtcvideoengine.h
index c51aa69989..0d51aa758f 100644
--- a/webrtc/media/engine/webrtcvideoengine.h
+++ b/webrtc/media/engine/webrtcvideoengine.h
@@ -19,12 +19,6 @@
 
 #include "webrtc/api/call/transport.h"
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/call.h"
 #include "webrtc/call/flexfec_receive_stream.h"
 #include "webrtc/media/base/mediaengine.h"
@@ -32,6 +26,12 @@
 #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/optional.h"
+#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/video_receive_stream.h"
 #include "webrtc/video_send_stream.h"
 
diff --git a/webrtc/media/engine/webrtcvideoengine_unittest.cc b/webrtc/media/engine/webrtcvideoengine_unittest.cc
index e14f3267db..9d4c809f4d 100644
--- a/webrtc/media/engine/webrtcvideoengine_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine_unittest.cc
@@ -14,9 +14,6 @@
 #include <vector>
 
 #include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/stringutils.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"
@@ -30,6 +27,9 @@
 #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"
 
 using webrtc::RtpExtension;
diff --git a/webrtc/media/engine/webrtcvoiceengine.cc b/webrtc/media/engine/webrtcvoiceengine.cc
index 1f9794944e..8b269c4aea 100644
--- a/webrtc/media/engine/webrtcvoiceengine.cc
+++ b/webrtc/media/engine/webrtcvoiceengine.cc
@@ -19,16 +19,6 @@
 #include <vector>
 
 #include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/base64.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/race_checker.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/media/base/audiosource.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/streamparams.h"
@@ -40,6 +30,16 @@
 #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"
diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h
index d154d0a442..93101fcc00 100644
--- a/webrtc/media/engine/webrtcvoiceengine.h
+++ b/webrtc/media/engine/webrtcvoiceengine.h
@@ -18,12 +18,6 @@
 
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"
 #include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/audio_state.h"
 #include "webrtc/call/call.h"
 #include "webrtc/config.h"
@@ -33,6 +27,12 @@
 #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"
 
 namespace webrtc {
 namespace voe {
diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
index 85158d83bd..334e63fab1 100644
--- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc
+++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
@@ -12,10 +12,6 @@
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/safe_conversions.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/call/call.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/media/base/fakemediaengine.h"
@@ -28,6 +24,10 @@
 #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"
diff --git a/webrtc/media/sctp/sctptransport.cc b/webrtc/media/sctp/sctptransport.cc
index 45e8decb38..2dcc339032 100644
--- a/webrtc/media/sctp/sctptransport.cc
+++ b/webrtc/media/sctp/sctptransport.cc
@@ -27,18 +27,18 @@ enum PreservedErrno {
 #include <sstream>
 
 #include "usrsctplib/usrsctp.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_conversions.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/p2p/base/dtlstransportinternal.h"  // For PF_NORMAL
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_conversions.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/trace_event.h"
 
 namespace {
 
diff --git a/webrtc/media/sctp/sctptransport.h b/webrtc/media/sctp/sctptransport.h
index b34db80c3b..8733603003 100644
--- a/webrtc/media/sctp/sctptransport.h
+++ b/webrtc/media/sctp/sctptransport.h
@@ -18,11 +18,11 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 // For SendDataParams/ReceiveDataParams.
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/sctp/sctptransportinternal.h"
diff --git a/webrtc/media/sctp/sctptransport_unittest.cc b/webrtc/media/sctp/sctptransport_unittest.cc
index b8495d081a..b2d7848798 100644
--- a/webrtc/media/sctp/sctptransport_unittest.cc
+++ b/webrtc/media/sctp/sctptransport_unittest.cc
@@ -16,15 +16,15 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/media/sctp/sctptransport.h"
 #include "webrtc/p2p/base/fakedtlstransport.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace {
 static const int kDefaultTimeout = 10000;  // 10 seconds.
diff --git a/webrtc/media/sctp/sctptransportinternal.h b/webrtc/media/sctp/sctptransportinternal.h
index e0f44e51a1..620fdd6307 100644
--- a/webrtc/media/sctp/sctptransportinternal.h
+++ b/webrtc/media/sctp/sctptransportinternal.h
@@ -18,8 +18,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/thread.h"
 // For SendDataParams/ReceiveDataParams.
 // TODO(deadbeef): Use something else for SCTP. It's confusing that we use an
 // SSRC field for SID.
diff --git a/webrtc/ortc/ortcfactory.cc b/webrtc/ortc/ortcfactory.cc
index 612e55d904..1d968738cd 100644
--- a/webrtc/ortc/ortcfactory.cc
+++ b/webrtc/ortc/ortcfactory.cc
@@ -20,11 +20,6 @@
 #include "webrtc/api/proxy.h"
 #include "webrtc/api/rtcerror.h"
 #include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
@@ -40,6 +35,11 @@
 #include "webrtc/pc/localaudiosource.h"
 #include "webrtc/pc/videocapturertracksource.h"
 #include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/asyncpacketsocket.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"
 
 namespace {
 
diff --git a/webrtc/ortc/ortcfactory.h b/webrtc/ortc/ortcfactory.h
index d82d6d0fa9..2ce7be39cc 100644
--- a/webrtc/ortc/ortcfactory.h
+++ b/webrtc/ortc/ortcfactory.h
@@ -15,11 +15,11 @@
 #include <string>
 
 #include "webrtc/api/ortc/ortcfactoryinterface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/media/base/mediaengine.h"
 #include "webrtc/media/engine/webrtcmediaengine.h"
 #include "webrtc/pc/channelmanager.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/ortcfactory_integrationtest.cc b/webrtc/ortc/ortcfactory_integrationtest.cc
index a800025476..ddd0e1a4d8 100644
--- a/webrtc/ortc/ortcfactory_integrationtest.cc
+++ b/webrtc/ortc/ortcfactory_integrationtest.cc
@@ -12,15 +12,15 @@
 #include <utility>  // For std::pair, std::move.
 
 #include "webrtc/api/ortc/ortcfactoryinterface.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/ortc/testrtpparameters.h"
 #include "webrtc/p2p/base/udptransport.h"
 #include "webrtc/pc/test/fakeaudiocapturemodule.h"
 #include "webrtc/pc/test/fakeperiodicvideocapturer.h"
 #include "webrtc/pc/test/fakevideotrackrenderer.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 namespace {
 
diff --git a/webrtc/ortc/ortcfactory_unittest.cc b/webrtc/ortc/ortcfactory_unittest.cc
index da1758b70a..d964383321 100644
--- a/webrtc/ortc/ortcfactory_unittest.cc
+++ b/webrtc/ortc/ortcfactory_unittest.cc
@@ -10,13 +10,13 @@
 
 #include <memory>
 
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/ortc/ortcfactory.h"
 #include "webrtc/ortc/testrtpparameters.h"
 #include "webrtc/p2p/base/fakepackettransport.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/ortcrtpreceiver_unittest.cc b/webrtc/ortc/ortcrtpreceiver_unittest.cc
index aa7d81d420..8273be58c6 100644
--- a/webrtc/ortc/ortcrtpreceiver_unittest.cc
+++ b/webrtc/ortc/ortcrtpreceiver_unittest.cc
@@ -10,12 +10,12 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/ortc/ortcfactory.h"
 #include "webrtc/ortc/testrtpparameters.h"
 #include "webrtc/p2p/base/fakepackettransport.h"
 #include "webrtc/pc/test/fakevideotracksource.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/ortcrtpreceiveradapter.cc b/webrtc/ortc/ortcrtpreceiveradapter.cc
index aefa4d313f..4e8c89b3bf 100644
--- a/webrtc/ortc/ortcrtpreceiveradapter.cc
+++ b/webrtc/ortc/ortcrtpreceiveradapter.cc
@@ -12,10 +12,10 @@
 
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"  // For "CreateRandomX".
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/ortc/rtptransportadapter.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"  // For "CreateRandomX".
 
 namespace {
 
diff --git a/webrtc/ortc/ortcrtpreceiveradapter.h b/webrtc/ortc/ortcrtpreceiveradapter.h
index 8e081e7547..2fb793fb16 100644
--- a/webrtc/ortc/ortcrtpreceiveradapter.h
+++ b/webrtc/ortc/ortcrtpreceiveradapter.h
@@ -16,11 +16,11 @@
 #include "webrtc/api/ortc/ortcrtpreceiverinterface.h"
 #include "webrtc/api/rtcerror.h"
 #include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/ortc/rtptransportcontrolleradapter.h"
 #include "webrtc/pc/rtpreceiver.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/ortcrtpsender_unittest.cc b/webrtc/ortc/ortcrtpsender_unittest.cc
index 47cb337cb5..ab8d821468 100644
--- a/webrtc/ortc/ortcrtpsender_unittest.cc
+++ b/webrtc/ortc/ortcrtpsender_unittest.cc
@@ -10,12 +10,12 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/ortc/ortcfactory.h"
 #include "webrtc/ortc/testrtpparameters.h"
 #include "webrtc/p2p/base/fakepackettransport.h"
 #include "webrtc/pc/test/fakevideotracksource.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/ortcrtpsenderadapter.cc b/webrtc/ortc/ortcrtpsenderadapter.cc
index be2b65dac3..0bce591942 100644
--- a/webrtc/ortc/ortcrtpsenderadapter.cc
+++ b/webrtc/ortc/ortcrtpsenderadapter.cc
@@ -12,9 +12,9 @@
 
 #include <utility>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/ortc/rtptransportadapter.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace {
 
diff --git a/webrtc/ortc/ortcrtpsenderadapter.h b/webrtc/ortc/ortcrtpsenderadapter.h
index 9b60f15300..92051e7307 100644
--- a/webrtc/ortc/ortcrtpsenderadapter.h
+++ b/webrtc/ortc/ortcrtpsenderadapter.h
@@ -16,10 +16,10 @@
 #include "webrtc/api/ortc/ortcrtpsenderinterface.h"
 #include "webrtc/api/rtcerror.h"
 #include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
 #include "webrtc/ortc/rtptransportcontrolleradapter.h"
 #include "webrtc/pc/rtpsender.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/rtpparametersconversion.h b/webrtc/ortc/rtpparametersconversion.h
index d2c91299ef..fe183da127 100644
--- a/webrtc/ortc/rtpparametersconversion.h
+++ b/webrtc/ortc/rtpparametersconversion.h
@@ -16,9 +16,9 @@
 
 #include "webrtc/api/rtcerror.h"
 #include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/pc/mediasession.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/rtpparametersconversion_unittest.cc b/webrtc/ortc/rtpparametersconversion_unittest.cc
index 32684060c5..f6e48a9cbe 100644
--- a/webrtc/ortc/rtpparametersconversion_unittest.cc
+++ b/webrtc/ortc/rtpparametersconversion_unittest.cc
@@ -10,9 +10,9 @@
 
 #include <algorithm>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/ortc/rtpparametersconversion.h"
 #include "webrtc/ortc/testrtpparameters.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/rtptransport_unittest.cc b/webrtc/ortc/rtptransport_unittest.cc
index 6d162301be..2fc1b23586 100644
--- a/webrtc/ortc/rtptransport_unittest.cc
+++ b/webrtc/ortc/rtptransport_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/ortc/ortcfactory.h"
 #include "webrtc/ortc/testrtpparameters.h"
 #include "webrtc/p2p/base/fakepackettransport.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/rtptransportadapter.cc b/webrtc/ortc/rtptransportadapter.cc
index 3982f2d5f7..1154ff629b 100644
--- a/webrtc/ortc/rtptransportadapter.cc
+++ b/webrtc/ortc/rtptransportadapter.cc
@@ -16,7 +16,7 @@
 #include <utility>  // For std::move.
 
 #include "webrtc/api/proxy.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/rtptransportadapter.h b/webrtc/ortc/rtptransportadapter.h
index 59a123efae..6fbc162e99 100644
--- a/webrtc/ortc/rtptransportadapter.h
+++ b/webrtc/ortc/rtptransportadapter.h
@@ -16,11 +16,11 @@
 
 #include "webrtc/api/ortc/srtptransportinterface.h"
 #include "webrtc/api/rtcerror.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/ortc/rtptransportcontrolleradapter.h"
 #include "webrtc/pc/channel.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/rtptransportcontroller_unittest.cc b/webrtc/ortc/rtptransportcontroller_unittest.cc
index 40e9851d24..56bf8a6adc 100644
--- a/webrtc/ortc/rtptransportcontroller_unittest.cc
+++ b/webrtc/ortc/rtptransportcontroller_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/ortc/ortcfactory.h"
 #include "webrtc/ortc/testrtpparameters.h"
 #include "webrtc/p2p/base/fakepackettransport.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/rtptransportcontrolleradapter.cc b/webrtc/ortc/rtptransportcontrolleradapter.cc
index b482e475fd..5e0b621123 100644
--- a/webrtc/ortc/rtptransportcontrolleradapter.cc
+++ b/webrtc/ortc/rtptransportcontrolleradapter.cc
@@ -17,12 +17,12 @@
 #include <utility>  // For std::move.
 
 #include "webrtc/api/proxy.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/ortc/ortcrtpreceiveradapter.h"
 #include "webrtc/ortc/ortcrtpsenderadapter.h"
 #include "webrtc/ortc/rtpparametersconversion.h"
 #include "webrtc/ortc/rtptransportadapter.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/rtptransportcontrolleradapter.h b/webrtc/ortc/rtptransportcontrolleradapter.h
index 8601dfdb07..9728c3968a 100644
--- a/webrtc/ortc/rtptransportcontrolleradapter.h
+++ b/webrtc/ortc/rtptransportcontrolleradapter.h
@@ -20,13 +20,13 @@
 #include "webrtc/api/ortc/ortcrtpsenderinterface.h"
 #include "webrtc/api/ortc/rtptransportcontrollerinterface.h"
 #include "webrtc/api/ortc/srtptransportinterface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/call/call.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/media/base/mediachannel.h"  // For MediaConfig.
 #include "webrtc/pc/channelmanager.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 
diff --git a/webrtc/ortc/srtptransport_unittest.cc b/webrtc/ortc/srtptransport_unittest.cc
index 1287a0257c..69d8a297e9 100644
--- a/webrtc/ortc/srtptransport_unittest.cc
+++ b/webrtc/ortc/srtptransport_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/ortc/ortcfactory.h"
 #include "webrtc/ortc/testrtpparameters.h"
 #include "webrtc/p2p/base/fakepackettransport.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/p2p/base/asyncstuntcpsocket.cc b/webrtc/p2p/base/asyncstuntcpsocket.cc
index 3369bc8b48..38dd65bb4c 100644
--- a/webrtc/p2p/base/asyncstuntcpsocket.cc
+++ b/webrtc/p2p/base/asyncstuntcpsocket.cc
@@ -13,8 +13,8 @@
 #include <string.h>
 
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/asyncstuntcpsocket.h b/webrtc/p2p/base/asyncstuntcpsocket.h
index 065b4c259b..b578f3109b 100644
--- a/webrtc/p2p/base/asyncstuntcpsocket.h
+++ b/webrtc/p2p/base/asyncstuntcpsocket.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
 #define WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
 
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/socketfactory.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/socketfactory.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc b/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc
index 61e14117c9..5dd9661056 100644
--- a/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc
+++ b/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc
@@ -11,9 +11,9 @@
 #include <memory>
 
 #include "webrtc/p2p/base/asyncstuntcpsocket.h"
-#include "webrtc/base/asyncsocket.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/asyncsocket.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/basicpacketsocketfactory.cc b/webrtc/p2p/base/basicpacketsocketfactory.cc
index b78a0541ce..e911f2fe22 100644
--- a/webrtc/p2p/base/basicpacketsocketfactory.cc
+++ b/webrtc/p2p/base/basicpacketsocketfactory.cc
@@ -14,15 +14,15 @@
 
 #include "webrtc/p2p/base/asyncstuntcpsocket.h"
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/physicalsocketserver.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/physicalsocketserver.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace rtc {
 
diff --git a/webrtc/p2p/base/candidate.h b/webrtc/p2p/base/candidate.h
index 723dbc9f47..474d7fb4d3 100644
--- a/webrtc/p2p/base/candidate.h
+++ b/webrtc/p2p/base/candidate.h
@@ -21,10 +21,10 @@
 #include <string>
 
 #include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/common.h b/webrtc/p2p/base/common.h
index 8a3178c801..5dbe491f09 100644
--- a/webrtc/p2p/base/common.h
+++ b/webrtc/p2p/base/common.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_P2P_BASE_COMMON_H_
 #define WEBRTC_P2P_BASE_COMMON_H_
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 // Common log description format for jingle messages
 #define LOG_J(sev, obj) LOG(sev) << "Jingle:" << obj->ToString() << ": "
diff --git a/webrtc/p2p/base/dtlstransportchannel.cc b/webrtc/p2p/base/dtlstransportchannel.cc
index f5d658340b..4249ae7e93 100644
--- a/webrtc/p2p/base/dtlstransportchannel.cc
+++ b/webrtc/p2p/base/dtlstransportchannel.cc
@@ -15,13 +15,13 @@
 
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stream.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h
index 30a7186b7f..12b94ce032 100644
--- a/webrtc/p2p/base/dtlstransportchannel.h
+++ b/webrtc/p2p/base/dtlstransportchannel.h
@@ -15,13 +15,13 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/bufferqueue.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stream.h"
 #include "webrtc/p2p/base/dtlstransportinternal.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/bufferqueue.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stream.h"
 
 namespace rtc {
 class PacketTransportInternal;
diff --git a/webrtc/p2p/base/dtlstransportchannel_unittest.cc b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
index 4286d76be3..225d6f7d24 100644
--- a/webrtc/p2p/base/dtlstransportchannel_unittest.cc
+++ b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
@@ -14,14 +14,14 @@
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/fakeicetransport.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.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"
 
 #define MAYBE_SKIP_TEST(feature)                              \
   if (!(rtc::SSLStreamAdapter::feature())) {                  \
diff --git a/webrtc/p2p/base/dtlstransportinternal.h b/webrtc/p2p/base/dtlstransportinternal.h
index 448dd49251..b77ae077bb 100644
--- a/webrtc/p2p/base/dtlstransportinternal.h
+++ b/webrtc/p2p/base/dtlstransportinternal.h
@@ -15,11 +15,11 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/fakedtlstransport.h b/webrtc/p2p/base/fakedtlstransport.h
index 0384f00a40..e78c7fc76c 100644
--- a/webrtc/p2p/base/fakedtlstransport.h
+++ b/webrtc/p2p/base/fakedtlstransport.h
@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/fakesslidentity.h"
 #include "webrtc/p2p/base/dtlstransportinternal.h"
 #include "webrtc/p2p/base/fakeicetransport.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/fakeicetransport.h b/webrtc/p2p/base/fakeicetransport.h
index 2b0662f856..d9c8485063 100644
--- a/webrtc/p2p/base/fakeicetransport.h
+++ b/webrtc/p2p/base/fakeicetransport.h
@@ -13,9 +13,9 @@
 
 #include <string>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/copyonwritebuffer.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/fakepackettransport.h b/webrtc/p2p/base/fakepackettransport.h
index 64e0f7d5a8..16af9a42ae 100644
--- a/webrtc/p2p/base/fakepackettransport.h
+++ b/webrtc/p2p/base/fakepackettransport.h
@@ -14,9 +14,9 @@
 #include <string>
 
 #include "webrtc/api/ortc/packettransportinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/copyonwritebuffer.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
 
 namespace rtc {
 
diff --git a/webrtc/p2p/base/fakeportallocator.h b/webrtc/p2p/base/fakeportallocator.h
index a1dbbf872b..7bf7f969bb 100644
--- a/webrtc/p2p/base/fakeportallocator.h
+++ b/webrtc/p2p/base/fakeportallocator.h
@@ -15,10 +15,10 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/nethelpers.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/udpport.h"
+#include "webrtc/rtc_base/nethelpers.h"
 
 namespace rtc {
 class SocketFactory;
diff --git a/webrtc/p2p/base/faketransportcontroller.h b/webrtc/p2p/base/faketransportcontroller.h
index 9a696bca5a..0c784754a6 100644
--- a/webrtc/p2p/base/faketransportcontroller.h
+++ b/webrtc/p2p/base/faketransportcontroller.h
@@ -15,12 +15,12 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/sslfingerprint.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/fakedtlstransport.h"
 #include "webrtc/p2p/base/fakeicetransport.h"
 #include "webrtc/p2p/base/transportcontroller.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/icetransportinternal.h b/webrtc/p2p/base/icetransportinternal.h
index e9b40dc2bb..435a081161 100644
--- a/webrtc/p2p/base/icetransportinternal.h
+++ b/webrtc/p2p/base/icetransportinternal.h
@@ -13,12 +13,12 @@
 
 #include <string>
 
-#include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/candidatepairinterface.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
 #include "webrtc/p2p/base/transportdescription.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace webrtc {
 class MetricsObserverInterface;
diff --git a/webrtc/p2p/base/jseptransport.cc b/webrtc/p2p/base/jseptransport.cc
index 301ae24003..a8f4564423 100644
--- a/webrtc/p2p/base/jseptransport.cc
+++ b/webrtc/p2p/base/jseptransport.cc
@@ -13,14 +13,14 @@
 #include <memory>
 #include <utility>  // for std::pair
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
 #include "webrtc/p2p/base/port.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/jseptransport.h b/webrtc/p2p/base/jseptransport.h
index 7b81be06f6..9353cd7d07 100644
--- a/webrtc/p2p/base/jseptransport.h
+++ b/webrtc/p2p/base/jseptransport.h
@@ -16,16 +16,16 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/p2p/base/transportinfo.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/jseptransport_unittest.cc b/webrtc/p2p/base/jseptransport_unittest.cc
index 23ed4d857d..56b61eca3b 100644
--- a/webrtc/p2p/base/jseptransport_unittest.cc
+++ b/webrtc/p2p/base/jseptransport_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/network.h"
 #include "webrtc/p2p/base/fakedtlstransport.h"
 #include "webrtc/p2p/base/fakeicetransport.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/network.h"
 
 using cricket::JsepTransport;
 using cricket::TransportChannel;
diff --git a/webrtc/p2p/base/mockicetransport.h b/webrtc/p2p/base/mockicetransport.h
index 53549abe86..92d0373fc9 100644
--- a/webrtc/p2p/base/mockicetransport.h
+++ b/webrtc/p2p/base/mockicetransport.h
@@ -15,8 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
+#include "webrtc/rtc_base/gunit.h"
 #include "webrtc/test/gmock.h"
 
 using testing::_;
diff --git a/webrtc/p2p/base/p2ptransportchannel.cc b/webrtc/p2p/base/p2ptransportchannel.cc
index 8853ccaa2f..78b4c938d4 100644
--- a/webrtc/p2p/base/p2ptransportchannel.cc
+++ b/webrtc/p2p/base/p2ptransportchannel.cc
@@ -15,15 +15,15 @@
 #include <set>
 
 #include "webrtc/api/umametrics.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/candidatepairinterface.h"
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/relayport.h"  // For RELAY_PORT_TYPE.
 #include "webrtc/p2p/base/stunport.h"   // For STUN_PORT_TYPE.
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringencode.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace {
diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/webrtc/p2p/base/p2ptransportchannel.h
index a535edd532..beca558eae 100644
--- a/webrtc/p2p/base/p2ptransportchannel.h
+++ b/webrtc/p2p/base/p2ptransportchannel.h
@@ -26,14 +26,14 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/candidatepairinterface.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/portinterface.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/p2ptransportchannel_unittest.cc b/webrtc/p2p/base/p2ptransportchannel_unittest.cc
index b829a593b0..7b3fa6aafe 100644
--- a/webrtc/p2p/base/p2ptransportchannel_unittest.cc
+++ b/webrtc/p2p/base/p2ptransportchannel_unittest.cc
@@ -12,22 +12,6 @@
 #include <memory>
 
 #include "webrtc/api/fakemetricsobserver.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/natsocketfactory.h"
-#include "webrtc/base/proxyserver.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/fakeportallocator.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
@@ -36,6 +20,22 @@
 #include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/p2p/base/testturnserver.h"
 #include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/natserver.h"
+#include "webrtc/rtc_base/natsocketfactory.h"
+#include "webrtc/rtc_base/proxyserver.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 namespace {
 
diff --git a/webrtc/p2p/base/packetlossestimator.cc b/webrtc/p2p/base/packetlossestimator.cc
index 7dcd5b9f4e..7990119c1a 100644
--- a/webrtc/p2p/base/packetlossestimator.cc
+++ b/webrtc/p2p/base/packetlossestimator.cc
@@ -12,7 +12,7 @@
 
 #include "webrtc/p2p/base/packetlossestimator.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/packetlossestimator_unittest.cc b/webrtc/p2p/base/packetlossestimator_unittest.cc
index 44cfdbf169..642dcc2e0a 100644
--- a/webrtc/p2p/base/packetlossestimator_unittest.cc
+++ b/webrtc/p2p/base/packetlossestimator_unittest.cc
@@ -10,8 +10,8 @@
 
 #include <utility>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/p2p/base/packetlossestimator.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using cricket::PacketLossEstimator;
 
diff --git a/webrtc/p2p/base/packetsocketfactory.h b/webrtc/p2p/base/packetsocketfactory.h
index c3b2417526..60f0ae0580 100644
--- a/webrtc/p2p/base/packetsocketfactory.h
+++ b/webrtc/p2p/base/packetsocketfactory.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
 #define WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/proxyinfo.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/proxyinfo.h"
 
 namespace rtc {
 
diff --git a/webrtc/p2p/base/packettransportinternal.h b/webrtc/p2p/base/packettransportinternal.h
index 8e32f72480..3dc27d58fd 100644
--- a/webrtc/p2p/base/packettransportinternal.h
+++ b/webrtc/p2p/base/packettransportinternal.h
@@ -16,9 +16,9 @@
 
 // This is included for PacketOptions.
 #include "webrtc/api/ortc/packettransportinterface.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socket.h"
 
 namespace cricket {
 class TransportChannel;
diff --git a/webrtc/p2p/base/port.cc b/webrtc/p2p/base/port.cc
index 3a3d9ead8b..a1016332de 100644
--- a/webrtc/p2p/base/port.cc
+++ b/webrtc/p2p/base/port.cc
@@ -13,19 +13,19 @@
 #include <algorithm>
 #include <vector>
 
-#include "webrtc/base/base64.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/safe_minmax.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/safe_minmax.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 namespace {
 
diff --git a/webrtc/p2p/base/port.h b/webrtc/p2p/base/port.h
index fd6d18290b..5764738508 100644
--- a/webrtc/p2p/base/port.h
+++ b/webrtc/p2p/base/port.h
@@ -17,15 +17,6 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/proxyinfo.h"
-#include "webrtc/base/ratetracker.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/candidatepairinterface.h"
 #include "webrtc/p2p/base/jseptransport.h"
@@ -34,6 +25,15 @@
 #include "webrtc/p2p/base/portinterface.h"
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/p2p/base/stunrequest.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/proxyinfo.h"
+#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/port_unittest.cc b/webrtc/p2p/base/port_unittest.cc
index a95bc2b065..eb547605c9 100644
--- a/webrtc/p2p/base/port_unittest.cc
+++ b/webrtc/p2p/base/port_unittest.cc
@@ -10,20 +10,6 @@
 
 #include <memory>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/natsocketfactory.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/relayport.h"
@@ -33,6 +19,20 @@
 #include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/p2p/base/testturnserver.h"
 #include "webrtc/p2p/base/turnport.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/natserver.h"
+#include "webrtc/rtc_base/natsocketfactory.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::AsyncPacketSocket;
 using rtc::Buffer;
diff --git a/webrtc/p2p/base/portallocator.cc b/webrtc/p2p/base/portallocator.cc
index a587aa8970..dd776e7584 100644
--- a/webrtc/p2p/base/portallocator.cc
+++ b/webrtc/p2p/base/portallocator.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/checks.h"
 #include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/portallocator.h b/webrtc/p2p/base/portallocator.h
index dfbed3dd78..74b67afd9c 100644
--- a/webrtc/p2p/base/portallocator.h
+++ b/webrtc/p2p/base/portallocator.h
@@ -18,10 +18,10 @@
 
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/base/portinterface.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/proxyinfo.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/proxyinfo.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 class MetricsObserverInterface;
diff --git a/webrtc/p2p/base/portallocator_unittest.cc b/webrtc/p2p/base/portallocator_unittest.cc
index 3794214d95..4845f7cc93 100644
--- a/webrtc/p2p/base/portallocator_unittest.cc
+++ b/webrtc/p2p/base/portallocator_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/fakeportallocator.h"
 #include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 static const char kContentName[] = "test content";
 // Based on ICE_UFRAG_LENGTH
diff --git a/webrtc/p2p/base/portinterface.h b/webrtc/p2p/base/portinterface.h
index 4a6e9007ed..7cb8429509 100644
--- a/webrtc/p2p/base/portinterface.h
+++ b/webrtc/p2p/base/portinterface.h
@@ -13,9 +13,9 @@
 
 #include <string>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/socketaddress.h"
 #include "webrtc/p2p/base/jseptransport.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace rtc {
 class Network;
diff --git a/webrtc/p2p/base/pseudotcp.cc b/webrtc/p2p/base/pseudotcp.cc
index d93f49e394..55935e3809 100644
--- a/webrtc/p2p/base/pseudotcp.cc
+++ b/webrtc/p2p/base/pseudotcp.cc
@@ -17,16 +17,16 @@
 #include <memory>
 #include <set>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_minmax.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_minmax.h"
+#include "webrtc/rtc_base/socket.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 // The following logging is for detailed (packet-level) analysis only.
 #define _DBG_NONE     0
diff --git a/webrtc/p2p/base/pseudotcp.h b/webrtc/p2p/base/pseudotcp.h
index 6d402daa6f..134bc00578 100644
--- a/webrtc/p2p/base/pseudotcp.h
+++ b/webrtc/p2p/base/pseudotcp.h
@@ -13,8 +13,8 @@
 
 #include <list>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/stream.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/pseudotcp_unittest.cc b/webrtc/p2p/base/pseudotcp_unittest.cc
index 8fb5b38b4d..157f456573 100644
--- a/webrtc/p2p/base/pseudotcp_unittest.cc
+++ b/webrtc/p2p/base/pseudotcp_unittest.cc
@@ -12,12 +12,12 @@
 #include <vector>
 
 #include "webrtc/p2p/base/pseudotcp.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/stream.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 using cricket::PseudoTcp;
 
diff --git a/webrtc/p2p/base/relayport.cc b/webrtc/p2p/base/relayport.cc
index e353511f80..efb967098b 100644
--- a/webrtc/p2p/base/relayport.cc
+++ b/webrtc/p2p/base/relayport.cc
@@ -10,10 +10,10 @@
 #include <algorithm>
 
 #include "webrtc/p2p/base/relayport.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/relayport_unittest.cc b/webrtc/p2p/base/relayport_unittest.cc
index 6b91baf234..e1bed76f6f 100644
--- a/webrtc/p2p/base/relayport_unittest.cc
+++ b/webrtc/p2p/base/relayport_unittest.cc
@@ -13,14 +13,14 @@
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/relayport.h"
 #include "webrtc/p2p/base/relayserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 
diff --git a/webrtc/p2p/base/relayserver.cc b/webrtc/p2p/base/relayserver.cc
index d080d90a77..3a97d4e664 100644
--- a/webrtc/p2p/base/relayserver.cc
+++ b/webrtc/p2p/base/relayserver.cc
@@ -16,11 +16,11 @@
 
 #include <algorithm>
 
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketadapters.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketadapters.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/relayserver.h b/webrtc/p2p/base/relayserver.h
index c60e2710b5..579b01417f 100644
--- a/webrtc/p2p/base/relayserver.h
+++ b/webrtc/p2p/base/relayserver.h
@@ -17,10 +17,10 @@
 
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/socketaddresspair.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/socketaddresspair.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/relayserver_unittest.cc b/webrtc/p2p/base/relayserver_unittest.cc
index f27f438533..7c1b29e0ac 100644
--- a/webrtc/p2p/base/relayserver_unittest.cc
+++ b/webrtc/p2p/base/relayserver_unittest.cc
@@ -11,16 +11,16 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/testclient.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/relayserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/testclient.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 using namespace cricket;
diff --git a/webrtc/p2p/base/sessiondescription.h b/webrtc/p2p/base/sessiondescription.h
index 5a750efff6..df9348d581 100644
--- a/webrtc/p2p/base/sessiondescription.h
+++ b/webrtc/p2p/base/sessiondescription.h
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/p2p/base/transportinfo.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/stun.cc b/webrtc/p2p/base/stun.cc
index 8217c029c3..56b4ee1965 100644
--- a/webrtc/p2p/base/stun.cc
+++ b/webrtc/p2p/base/stun.cc
@@ -14,13 +14,13 @@
 
 #include <memory>
 
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 using rtc::ByteBufferReader;
 using rtc::ByteBufferWriter;
diff --git a/webrtc/p2p/base/stun.h b/webrtc/p2p/base/stun.h
index 4ea45050ca..4a44dcbc2f 100644
--- a/webrtc/p2p/base/stun.h
+++ b/webrtc/p2p/base/stun.h
@@ -17,9 +17,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/stun_unittest.cc b/webrtc/p2p/base/stun_unittest.cc
index 15d4648f27..ef387a1b33 100644
--- a/webrtc/p2p/base/stun_unittest.cc
+++ b/webrtc/p2p/base/stun_unittest.cc
@@ -10,14 +10,14 @@
 
 #include <string>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
 #include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/stunport.cc b/webrtc/p2p/base/stunport.cc
index 5801ba7dd6..fa7a63c46b 100644
--- a/webrtc/p2p/base/stunport.cc
+++ b/webrtc/p2p/base/stunport.cc
@@ -13,11 +13,11 @@
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/stunport.h b/webrtc/p2p/base/stunport.h
index 1bbe25f0e8..de5127c671 100644
--- a/webrtc/p2p/base/stunport.h
+++ b/webrtc/p2p/base/stunport.h
@@ -16,7 +16,7 @@
 
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/base/stunrequest.h"
-#include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
 
 // TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h.
 namespace rtc {
diff --git a/webrtc/p2p/base/stunport_unittest.cc b/webrtc/p2p/base/stunport_unittest.cc
index bf44ffc725..25f5a74fcf 100644
--- a/webrtc/p2p/base/stunport_unittest.cc
+++ b/webrtc/p2p/base/stunport_unittest.cc
@@ -13,11 +13,11 @@
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/stunport.h"
 #include "webrtc/p2p/base/teststunserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using cricket::ServerAddresses;
 using rtc::SocketAddress;
diff --git a/webrtc/p2p/base/stunrequest.cc b/webrtc/p2p/base/stunrequest.cc
index d3336fa8d7..cace17f299 100644
--- a/webrtc/p2p/base/stunrequest.cc
+++ b/webrtc/p2p/base/stunrequest.cc
@@ -13,11 +13,11 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/stunrequest.h b/webrtc/p2p/base/stunrequest.h
index 99dff14aee..a1c6930688 100644
--- a/webrtc/p2p/base/stunrequest.h
+++ b/webrtc/p2p/base/stunrequest.h
@@ -14,8 +14,8 @@
 #include <map>
 #include <string>
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/stunrequest_unittest.cc b/webrtc/p2p/base/stunrequest_unittest.cc
index 9b8ccac1ed..a4f603bced 100644
--- a/webrtc/p2p/base/stunrequest_unittest.cc
+++ b/webrtc/p2p/base/stunrequest_unittest.cc
@@ -9,12 +9,12 @@
  */
 
 #include "webrtc/p2p/base/stunrequest.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 using namespace cricket;
 
diff --git a/webrtc/p2p/base/stunserver.cc b/webrtc/p2p/base/stunserver.cc
index 532add792f..3a3a0abf46 100644
--- a/webrtc/p2p/base/stunserver.cc
+++ b/webrtc/p2p/base/stunserver.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/p2p/base/stunserver.h"
 
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/stunserver.h b/webrtc/p2p/base/stunserver.h
index c9ae86a860..92707b0954 100644
--- a/webrtc/p2p/base/stunserver.h
+++ b/webrtc/p2p/base/stunserver.h
@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/stunserver_unittest.cc b/webrtc/p2p/base/stunserver_unittest.cc
index 1e8f8b4a14..66cb59f1b4 100644
--- a/webrtc/p2p/base/stunserver_unittest.cc
+++ b/webrtc/p2p/base/stunserver_unittest.cc
@@ -11,13 +11,13 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/testclient.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/stunserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/testclient.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using namespace cricket;
 
diff --git a/webrtc/p2p/base/tcpport.cc b/webrtc/p2p/base/tcpport.cc
index 4fd527e513..86670cd366 100644
--- a/webrtc/p2p/base/tcpport.cc
+++ b/webrtc/p2p/base/tcpport.cc
@@ -67,8 +67,8 @@
 #include "webrtc/p2p/base/tcpport.h"
 
 #include "webrtc/p2p/base/common.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/tcpport.h b/webrtc/p2p/base/tcpport.h
index ce91e44905..0974fa78cd 100644
--- a/webrtc/p2p/base/tcpport.h
+++ b/webrtc/p2p/base/tcpport.h
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "webrtc/p2p/base/port.h"
-#include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/tcpport_unittest.cc b/webrtc/p2p/base/tcpport_unittest.cc
index cc3f9adbd8..0f7bd1f79d 100644
--- a/webrtc/p2p/base/tcpport_unittest.cc
+++ b/webrtc/p2p/base/tcpport_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/tcpport.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 using cricket::Connection;
diff --git a/webrtc/p2p/base/testrelayserver.h b/webrtc/p2p/base/testrelayserver.h
index 7bc0beead2..27bc4c15ae 100644
--- a/webrtc/p2p/base/testrelayserver.h
+++ b/webrtc/p2p/base/testrelayserver.h
@@ -14,10 +14,10 @@
 #include <memory>
 
 #include "webrtc/p2p/base/relayserver.h"
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/teststunserver.h b/webrtc/p2p/base/teststunserver.h
index 1911a0b739..1a9e670810 100644
--- a/webrtc/p2p/base/teststunserver.h
+++ b/webrtc/p2p/base/teststunserver.h
@@ -12,8 +12,8 @@
 #define WEBRTC_P2P_BASE_TESTSTUNSERVER_H_
 
 #include "webrtc/p2p/base/stunserver.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/testturnserver.h b/webrtc/p2p/base/testturnserver.h
index 9cd8203762..5091e8e415 100644
--- a/webrtc/p2p/base/testturnserver.h
+++ b/webrtc/p2p/base/testturnserver.h
@@ -17,8 +17,8 @@
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/p2p/base/turnserver.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/transportchannelimpl.h b/webrtc/p2p/base/transportchannelimpl.h
index f72cb2d1b0..cf6e3629f6 100644
--- a/webrtc/p2p/base/transportchannelimpl.h
+++ b/webrtc/p2p/base/transportchannelimpl.h
@@ -13,9 +13,9 @@
 
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/p2p/base/icetransportinternal.h"
 #include "webrtc/p2p/base/transportchannel.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 class MetricsObserverInterface;
diff --git a/webrtc/p2p/base/transportcontroller.cc b/webrtc/p2p/base/transportcontroller.cc
index db2d8d9e34..8f6674e712 100644
--- a/webrtc/p2p/base/transportcontroller.cc
+++ b/webrtc/p2p/base/transportcontroller.cc
@@ -13,10 +13,10 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/port.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace {
 
diff --git a/webrtc/p2p/base/transportcontroller.h b/webrtc/p2p/base/transportcontroller.h
index 7cc59e8dfa..f16e8938fd 100644
--- a/webrtc/p2p/base/transportcontroller.h
+++ b/webrtc/p2p/base/transportcontroller.h
@@ -16,15 +16,15 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/refcountedobject.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/jseptransport.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/refcountedobject.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
 
 namespace rtc {
 class Thread;
diff --git a/webrtc/p2p/base/transportcontroller_unittest.cc b/webrtc/p2p/base/transportcontroller_unittest.cc
index 239bb2a235..8a2d298673 100644
--- a/webrtc/p2p/base/transportcontroller_unittest.cc
+++ b/webrtc/p2p/base/transportcontroller_unittest.cc
@@ -11,17 +11,17 @@
 #include <map>
 #include <memory>
 
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/dtlstransportchannel.h"
 #include "webrtc/p2p/base/fakeportallocator.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/transportcontroller.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/rtc_base/thread.h"
 
 static const int kTimeout = 100;
 static const char kIceUfrag1[] = "TESTICEUFRAG0001";
diff --git a/webrtc/p2p/base/transportdescription.cc b/webrtc/p2p/base/transportdescription.cc
index 4d61edd5c6..7c0f1f51dc 100644
--- a/webrtc/p2p/base/transportdescription.cc
+++ b/webrtc/p2p/base/transportdescription.cc
@@ -10,9 +10,9 @@
 
 #include "webrtc/p2p/base/transportdescription.h"
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/p2p/base/p2pconstants.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/transportdescription.h b/webrtc/p2p/base/transportdescription.h
index 22d054d3b1..670213197a 100644
--- a/webrtc/p2p/base/transportdescription.h
+++ b/webrtc/p2p/base/transportdescription.h
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/base/sslfingerprint.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/transportdescriptionfactory.cc b/webrtc/p2p/base/transportdescriptionfactory.cc
index 856ad46126..1c75b32292 100644
--- a/webrtc/p2p/base/transportdescriptionfactory.cc
+++ b/webrtc/p2p/base/transportdescriptionfactory.cc
@@ -13,10 +13,10 @@
 #include <memory>
 
 #include "webrtc/p2p/base/transportdescription.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/sslfingerprint.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/transportdescriptionfactory.h b/webrtc/p2p/base/transportdescriptionfactory.h
index ac04f048c6..b9b3c5b2d7 100644
--- a/webrtc/p2p/base/transportdescriptionfactory.h
+++ b/webrtc/p2p/base/transportdescriptionfactory.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
 #define WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
 
-#include "webrtc/base/rtccertificate.h"
 #include "webrtc/p2p/base/transportdescription.h"
+#include "webrtc/rtc_base/rtccertificate.h"
 
 namespace rtc {
 class SSLIdentity;
diff --git a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
index 83bc072ae4..f8f48bc1dc 100644
--- a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
+++ b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
@@ -15,9 +15,9 @@
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/p2p/base/transportdescriptionfactory.h"
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/ssladapter.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ssladapter.h"
 
 using cricket::TransportDescriptionFactory;
 using cricket::TransportDescription;
diff --git a/webrtc/p2p/base/transportinfo.h b/webrtc/p2p/base/transportinfo.h
index 504eb23b2a..c38bf2a300 100644
--- a/webrtc/p2p/base/transportinfo.h
+++ b/webrtc/p2p/base/transportinfo.h
@@ -17,7 +17,7 @@
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
-#include "webrtc/base/helpers.h"
+#include "webrtc/rtc_base/helpers.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/turnport.cc b/webrtc/p2p/base/turnport.cc
index e3caeb59d3..94f54dc0a2 100644
--- a/webrtc/p2p/base/turnport.cc
+++ b/webrtc/p2p/base/turnport.cc
@@ -12,16 +12,16 @@
 
 #include <functional>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/turnport.h b/webrtc/p2p/base/turnport.h
index e5f384fa57..4e4d4b1774 100644
--- a/webrtc/p2p/base/turnport.h
+++ b/webrtc/p2p/base/turnport.h
@@ -16,10 +16,10 @@
 #include <set>
 #include <string>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
 
 namespace rtc {
 class AsyncResolver;
diff --git a/webrtc/p2p/base/turnport_unittest.cc b/webrtc/p2p/base/turnport_unittest.cc
index 35f0afb557..73426cc505 100644
--- a/webrtc/p2p/base/turnport_unittest.cc
+++ b/webrtc/p2p/base/turnport_unittest.cc
@@ -20,20 +20,20 @@
 #include "webrtc/p2p/base/testturnserver.h"
 #include "webrtc/p2p/base/turnport.h"
 #include "webrtc/p2p/base/udpport.h"
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 
diff --git a/webrtc/p2p/base/turnserver.cc b/webrtc/p2p/base/turnserver.cc
index 368bea19fd..afc5f1d7c2 100644
--- a/webrtc/p2p/base/turnserver.cc
+++ b/webrtc/p2p/base/turnserver.cc
@@ -12,20 +12,20 @@
 
 #include <tuple>  // for std::tie
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/asyncstuntcpsocket.h"
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/p2p/base/packetsocketfactory.h"
 #include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/turnserver.h b/webrtc/p2p/base/turnserver.h
index 608e0434e4..0a59f270a5 100644
--- a/webrtc/p2p/base/turnserver.h
+++ b/webrtc/p2p/base/turnserver.h
@@ -19,11 +19,11 @@
 #include <vector>
 
 #include "webrtc/p2p/base/portinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketaddress.h"
 
 namespace rtc {
 class ByteBufferWriter;
diff --git a/webrtc/p2p/base/turnserver_unittest.cc b/webrtc/p2p/base/turnserver_unittest.cc
index 970da4759a..cac0a5c541 100644
--- a/webrtc/p2p/base/turnserver_unittest.cc
+++ b/webrtc/p2p/base/turnserver_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
-#include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/turnserver.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 // NOTE: This is a work in progress. Currently this file only has tests for
 // TurnServerConnection, a primitive class used by TurnServer.
diff --git a/webrtc/p2p/base/udptransport.cc b/webrtc/p2p/base/udptransport.cc
index 976d5bb6ae..3df47add4e 100644
--- a/webrtc/p2p/base/udptransport.cc
+++ b/webrtc/p2p/base/udptransport.cc
@@ -13,12 +13,12 @@
 #include <string>
 #include <utility>  // For std::move.
 
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/udptransport.h b/webrtc/p2p/base/udptransport.h
index 1cf8e424db..c3c9513bb9 100644
--- a/webrtc/p2p/base/udptransport.h
+++ b/webrtc/p2p/base/udptransport.h
@@ -15,10 +15,10 @@
 #include <string>
 
 #include "webrtc/api/ortc/udptransportinterface.h"
-#include "webrtc/base/asyncpacketsocket.h"  // For PacketOptions.
-#include "webrtc/base/optional.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"  // For PacketOptions.
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace rtc {
 class AsyncPacketSocket;
diff --git a/webrtc/p2p/base/udptransport_unittest.cc b/webrtc/p2p/base/udptransport_unittest.cc
index f9db024afe..27455e4f8c 100644
--- a/webrtc/p2p/base/udptransport_unittest.cc
+++ b/webrtc/p2p/base/udptransport_unittest.cc
@@ -14,16 +14,16 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/socketserver.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
 #include "webrtc/p2p/base/udptransport.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/socketserver.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/client/basicportallocator.cc b/webrtc/p2p/client/basicportallocator.cc
index 2e5bc0d06c..5ddc475493 100644
--- a/webrtc/p2p/client/basicportallocator.cc
+++ b/webrtc/p2p/client/basicportallocator.cc
@@ -23,9 +23,9 @@
 #include "webrtc/p2p/base/tcpport.h"
 #include "webrtc/p2p/base/turnport.h"
 #include "webrtc/p2p/base/udpport.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
 
 using rtc::CreateRandomId;
 
diff --git a/webrtc/p2p/client/basicportallocator.h b/webrtc/p2p/client/basicportallocator.h
index cd178f965e..7cdf0baa7d 100644
--- a/webrtc/p2p/client/basicportallocator.h
+++ b/webrtc/p2p/client/basicportallocator.h
@@ -16,10 +16,10 @@
 #include <vector>
 
 #include "webrtc/p2p/base/portallocator.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/client/basicportallocator_unittest.cc b/webrtc/p2p/client/basicportallocator_unittest.cc
index bf288c9e68..99e53cf619 100644
--- a/webrtc/p2p/client/basicportallocator_unittest.cc
+++ b/webrtc/p2p/client/basicportallocator_unittest.cc
@@ -11,21 +11,6 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/natsocketfactory.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
@@ -33,6 +18,21 @@
 #include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/p2p/base/testturnserver.h"
 #include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/natserver.h"
+#include "webrtc/rtc_base/natsocketfactory.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using rtc::IPAddress;
 using rtc::SocketAddress;
diff --git a/webrtc/p2p/client/socketmonitor.cc b/webrtc/p2p/client/socketmonitor.cc
index 098a05df28..4e26e427e1 100644
--- a/webrtc/p2p/client/socketmonitor.cc
+++ b/webrtc/p2p/client/socketmonitor.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/p2p/client/socketmonitor.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/client/socketmonitor.h b/webrtc/p2p/client/socketmonitor.h
index b13be74735..4cb1899570 100644
--- a/webrtc/p2p/client/socketmonitor.h
+++ b/webrtc/p2p/client/socketmonitor.h
@@ -13,10 +13,10 @@
 
 #include <vector>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/jseptransport.h"  // for ConnectionInfos
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 // TODO(pthatcher): Move these to connectionmonitor.h and
 // connectionmonitor.cc, or just move them into channel.cc
diff --git a/webrtc/p2p/quic/quicconnectionhelper.h b/webrtc/p2p/quic/quicconnectionhelper.h
index 3588ad4226..07894f0d25 100644
--- a/webrtc/p2p/quic/quicconnectionhelper.h
+++ b/webrtc/p2p/quic/quicconnectionhelper.h
@@ -16,7 +16,7 @@
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_simple_buffer_allocator.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/quic/quicconnectionhelper_unittest.cc b/webrtc/p2p/quic/quicconnectionhelper_unittest.cc
index 5f16b52c62..910caca8b9 100644
--- a/webrtc/p2p/quic/quicconnectionhelper_unittest.cc
+++ b/webrtc/p2p/quic/quicconnectionhelper_unittest.cc
@@ -13,7 +13,7 @@
 #include "webrtc/p2p/quic/quicconnectionhelper.h"
 
 #include "net/quic/quic_time.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using cricket::QuicAlarm;
 using cricket::QuicConnectionHelper;
diff --git a/webrtc/p2p/quic/quicsession.cc b/webrtc/p2p/quic/quicsession.cc
index 65ed135754..c7860ef060 100644
--- a/webrtc/p2p/quic/quicsession.cc
+++ b/webrtc/p2p/quic/quicsession.cc
@@ -13,10 +13,10 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/messagequeue.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/messagequeue.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/quic/quicsession.h b/webrtc/p2p/quic/quicsession.h
index f8b27e055e..99195a8d8f 100644
--- a/webrtc/p2p/quic/quicsession.h
+++ b/webrtc/p2p/quic/quicsession.h
@@ -18,10 +18,10 @@
 #include "net/quic/quic_crypto_server_stream.h"
 #include "net/quic/quic_crypto_stream.h"
 #include "net/quic/quic_session.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslidentity.h"
 #include "webrtc/p2p/quic/reliablequicstream.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslidentity.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/quic/quicsession_unittest.cc b/webrtc/p2p/quic/quicsession_unittest.cc
index 549e018452..1e906fe24d 100644
--- a/webrtc/p2p/quic/quicsession_unittest.cc
+++ b/webrtc/p2p/quic/quicsession_unittest.cc
@@ -16,17 +16,17 @@
 
 #include "net/base/ip_endpoint.h"
 #include "net/quic/crypto/crypto_server_config_protobuf.h"
-#include "net/quic/crypto/quic_random.h"
 #include "net/quic/crypto/proof_source.h"
 #include "net/quic/crypto/proof_verifier.h"
 #include "net/quic/crypto/quic_crypto_client_config.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
+#include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_crypto_client_stream.h"
 #include "net/quic/quic_crypto_server_stream.h"
-#include "webrtc/base/gunit.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
 #include "webrtc/p2p/quic/quicconnectionhelper.h"
 #include "webrtc/p2p/quic/reliablequicstream.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using net::IPAddress;
 using net::IPEndPoint;
diff --git a/webrtc/p2p/quic/quictransport.cc b/webrtc/p2p/quic/quictransport.cc
index aaa11ebfcb..8240f589fc 100644
--- a/webrtc/p2p/quic/quictransport.cc
+++ b/webrtc/p2p/quic/quictransport.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/p2p/quic/quictransport.h"
 
-#include "webrtc/base/checks.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/quic/quictransport_unittest.cc b/webrtc/p2p/quic/quictransport_unittest.cc
index 1fd48f7ec4..3328556fc7 100644
--- a/webrtc/p2p/quic/quictransport_unittest.cc
+++ b/webrtc/p2p/quic/quictransport_unittest.cc
@@ -14,9 +14,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/sslidentity.h"
 
 using cricket::TransportChannelImpl;
 using cricket::QuicTransport;
diff --git a/webrtc/p2p/quic/quictransportchannel.cc b/webrtc/p2p/quic/quictransportchannel.cc
index 7241f1a0dc..f875ab607e 100644
--- a/webrtc/p2p/quic/quictransportchannel.cc
+++ b/webrtc/p2p/quic/quictransportchannel.cc
@@ -21,12 +21,12 @@
 #include "net/quic/quic_crypto_server_stream.h"
 #include "net/quic/quic_packet_writer.h"
 #include "net/quic/quic_protocol.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/common.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socket.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace {
 
diff --git a/webrtc/p2p/quic/quictransportchannel.h b/webrtc/p2p/quic/quictransportchannel.h
index 0e5af88e13..4c34675f20 100644
--- a/webrtc/p2p/quic/quictransportchannel.h
+++ b/webrtc/p2p/quic/quictransportchannel.h
@@ -17,11 +17,11 @@
 
 #include "net/quic/quic_crypto_client_stream.h"
 #include "net/quic/quic_packet_writer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/p2p/quic/quicconnectionhelper.h"
 #include "webrtc/p2p/quic/quicsession.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/quic/quictransportchannel_unittest.cc b/webrtc/p2p/quic/quictransportchannel_unittest.cc
index 7337da9421..9ed21f177f 100644
--- a/webrtc/p2p/quic/quictransportchannel_unittest.cc
+++ b/webrtc/p2p/quic/quictransportchannel_unittest.cc
@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/sslidentity.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/sslidentity.h"
 
 using cricket::ConnectionRole;
 using cricket::IceRole;
diff --git a/webrtc/p2p/quic/reliablequicstream.cc b/webrtc/p2p/quic/reliablequicstream.cc
index 5b65f1e7c7..23c2df2455 100644
--- a/webrtc/p2p/quic/reliablequicstream.cc
+++ b/webrtc/p2p/quic/reliablequicstream.cc
@@ -13,7 +13,7 @@
 #include <string>
 
 #include "net/quic/quic_session.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/quic/reliablequicstream.h b/webrtc/p2p/quic/reliablequicstream.h
index 9493a3fcc1..a2d0b57444 100644
--- a/webrtc/p2p/quic/reliablequicstream.h
+++ b/webrtc/p2p/quic/reliablequicstream.h
@@ -12,9 +12,9 @@
 #define WEBRTC_P2P_QUIC_RELIABLEQUICSTREAM_H_
 
 #include "net/quic/reliable_quic_stream.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/stream.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/quic/reliablequicstream_unittest.cc b/webrtc/p2p/quic/reliablequicstream_unittest.cc
index ff517afb58..4357bcd74a 100644
--- a/webrtc/p2p/quic/reliablequicstream_unittest.cc
+++ b/webrtc/p2p/quic/reliablequicstream_unittest.cc
@@ -17,11 +17,11 @@
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/stream.h"
 #include "webrtc/p2p/quic/quicconnectionhelper.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/stream.h"
 
 using cricket::QuicConnectionHelper;
 using cricket::ReliableQuicStream;
diff --git a/webrtc/p2p/stunprober/stunprober.cc b/webrtc/p2p/stunprober/stunprober.cc
index 2ec77323da..54c8b1ccda 100644
--- a/webrtc/p2p/stunprober/stunprober.cc
+++ b/webrtc/p2p/stunprober/stunprober.cc
@@ -13,18 +13,18 @@
 #include <set>
 #include <string>
 
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/asyncresolverinterface.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/packetsocketfactory.h"
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/p2p/stunprober/stunprober.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncresolverinterface.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace stunprober {
 
diff --git a/webrtc/p2p/stunprober/stunprober.h b/webrtc/p2p/stunprober/stunprober.h
index c7cc33c02f..b32c8b2dcd 100644
--- a/webrtc/p2p/stunprober/stunprober.h
+++ b/webrtc/p2p/stunprober/stunprober.h
@@ -15,16 +15,16 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/callback.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/callback.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/typedefs.h"
 
 namespace rtc {
diff --git a/webrtc/p2p/stunprober/stunprober_unittest.cc b/webrtc/p2p/stunprober/stunprober_unittest.cc
index 519831b7a9..2252e617aa 100644
--- a/webrtc/p2p/stunprober/stunprober_unittest.cc
+++ b/webrtc/p2p/stunprober/stunprober_unittest.cc
@@ -12,15 +12,15 @@
 
 #include <memory>
 
-#include "webrtc/base/asyncresolverinterface.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/p2p/stunprober/stunprober.h"
+#include "webrtc/rtc_base/asyncresolverinterface.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
 
 using stunprober::StunProber;
 using stunprober::AsyncCallback;
diff --git a/webrtc/pc/audiomonitor.h b/webrtc/pc/audiomonitor.h
index 885c60f08b..86e8ba2796 100644
--- a/webrtc/pc/audiomonitor.h
+++ b/webrtc/pc/audiomonitor.h
@@ -14,9 +14,9 @@
 #include <vector>
 #include <utility>
 
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/port.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/audiotrack.cc b/webrtc/pc/audiotrack.cc
index 951acbf93e..02607da676 100644
--- a/webrtc/pc/audiotrack.cc
+++ b/webrtc/pc/audiotrack.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/pc/audiotrack.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 using rtc::scoped_refptr;
 
diff --git a/webrtc/pc/audiotrack.h b/webrtc/pc/audiotrack.h
index 33f4b1fcd7..8dde2efc2f 100644
--- a/webrtc/pc/audiotrack.h
+++ b/webrtc/pc/audiotrack.h
@@ -15,10 +15,10 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/notifier.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread_checker.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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/bundlefilter.cc b/webrtc/pc/bundlefilter.cc
index 1f19a0a9ca..3b7dcd69e9 100644
--- a/webrtc/pc/bundlefilter.cc
+++ b/webrtc/pc/bundlefilter.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/pc/bundlefilter.h"
 
-#include "webrtc/base/logging.h"
 #include "webrtc/media/base/rtputils.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/bundlefilter.h b/webrtc/pc/bundlefilter.h
index 44a45da528..b4ad824b9c 100644
--- a/webrtc/pc/bundlefilter.h
+++ b/webrtc/pc/bundlefilter.h
@@ -16,8 +16,8 @@
 #include <set>
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/media/base/streamparams.h"
+#include "webrtc/rtc_base/basictypes.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/bundlefilter_unittest.cc b/webrtc/pc/bundlefilter_unittest.cc
index 179f0cf900..f0f56a550b 100644
--- a/webrtc/pc/bundlefilter_unittest.cc
+++ b/webrtc/pc/bundlefilter_unittest.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/pc/bundlefilter.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using cricket::StreamParams;
 
diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc
index e612aaece6..d07126b9b1 100644
--- a/webrtc/pc/channel.cc
+++ b/webrtc/pc/channel.cc
@@ -15,16 +15,16 @@
 #include "webrtc/pc/channel.h"
 
 #include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/trace_event.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/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
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index f8cc286279..8b3be2c14e 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -20,12 +20,6 @@
 
 #include "webrtc/api/call/audio_sink.h"
 #include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/window.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/mediaengine.h"
 #include "webrtc/media/base/streamparams.h"
@@ -41,6 +35,12 @@
 #include "webrtc/pc/rtcpmuxfilter.h"
 #include "webrtc/pc/rtptransport.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"
 
 namespace webrtc {
 class AudioSinkInterface;
diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc
index 7fe1472e25..fa9d3da520 100644
--- a/webrtc/pc/channel_unittest.cc
+++ b/webrtc/pc/channel_unittest.cc
@@ -10,13 +10,6 @@
 
 #include <memory>
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakertp.h"
 #include "webrtc/media/base/mediachannel.h"
@@ -25,6 +18,13 @@
 #include "webrtc/p2p/base/fakedtlstransport.h"
 #include "webrtc/p2p/base/fakepackettransport.h"
 #include "webrtc/pc/channel.h"
+#include "webrtc/rtc_base/array_view.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"
 
 using cricket::CA_OFFER;
 using cricket::CA_PRANSWER;
diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc
index 68ac281747..368cf450b3 100644
--- a/webrtc/pc/channelmanager.cc
+++ b/webrtc/pc/channelmanager.cc
@@ -12,15 +12,15 @@
 
 #include <algorithm>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/trace_event.h"
 #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"
 
 namespace cricket {
 
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
index 94e98d9e51..e8c0165056 100644
--- a/webrtc/pc/channelmanager.h
+++ b/webrtc/pc/channelmanager.h
@@ -15,10 +15,10 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/media/base/mediaengine.h"
 #include "webrtc/pc/voicechannel.h"
+#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/channelmanager_unittest.cc b/webrtc/pc/channelmanager_unittest.cc
index 1919aae23c..c03056c637 100644
--- a/webrtc/pc/channelmanager_unittest.cc
+++ b/webrtc/pc/channelmanager_unittest.cc
@@ -10,9 +10,6 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakevideocapturer.h"
@@ -20,6 +17,9 @@
 #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"
 
 namespace {
 const bool kDefaultSrtpRequired = true;
diff --git a/webrtc/pc/createpeerconnectionfactory.cc b/webrtc/pc/createpeerconnectionfactory.cc
index 6861d822ae..11aa1213a2 100644
--- a/webrtc/pc/createpeerconnectionfactory.cc
+++ b/webrtc/pc/createpeerconnectionfactory.cc
@@ -11,13 +11,13 @@
 #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/base/bind.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/currentspeakermonitor.cc b/webrtc/pc/currentspeakermonitor.cc
index ce0d579486..d52e79d7af 100644
--- a/webrtc/pc/currentspeakermonitor.cc
+++ b/webrtc/pc/currentspeakermonitor.cc
@@ -12,9 +12,9 @@
 
 #include <vector>
 
-#include "webrtc/base/logging.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/pc/audiomonitor.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/currentspeakermonitor.h b/webrtc/pc/currentspeakermonitor.h
index 14ed8762a8..001035f57e 100644
--- a/webrtc/pc/currentspeakermonitor.h
+++ b/webrtc/pc/currentspeakermonitor.h
@@ -18,7 +18,7 @@
 
 #include <map>
 
-#include "webrtc/base/sigslot.h"
+#include "webrtc/rtc_base/sigslot.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/currentspeakermonitor_unittest.cc b/webrtc/pc/currentspeakermonitor_unittest.cc
index a71f72ed8b..547b5a298f 100644
--- a/webrtc/pc/currentspeakermonitor_unittest.cc
+++ b/webrtc/pc/currentspeakermonitor_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/pc/audiomonitor.h"
 #include "webrtc/pc/currentspeakermonitor.h"
+#include "webrtc/pc/audiomonitor.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/datachannel.cc b/webrtc/pc/datachannel.cc
index 5606a64c6e..ce0aa14d4e 100644
--- a/webrtc/pc/datachannel.cc
+++ b/webrtc/pc/datachannel.cc
@@ -13,11 +13,11 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/refcount.h"
 #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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/datachannel.h b/webrtc/pc/datachannel.h
index 2619a852fb..13f5b881fa 100644
--- a/webrtc/pc/datachannel.h
+++ b/webrtc/pc/datachannel.h
@@ -17,11 +17,11 @@
 
 #include "webrtc/api/datachannelinterface.h"
 #include "webrtc/api/proxy.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sigslot.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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/datachannel_unittest.cc b/webrtc/pc/datachannel_unittest.cc
index 13ab63cdfa..8776dce87e 100644
--- a/webrtc/pc/datachannel_unittest.cc
+++ b/webrtc/pc/datachannel_unittest.cc
@@ -10,10 +10,10 @@
 
 #include <memory>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/pc/datachannel.h"
 #include "webrtc/pc/sctputils.h"
 #include "webrtc/pc/test/fakedatachannelprovider.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using webrtc::DataChannel;
 using webrtc::SctpSidAllocator;
diff --git a/webrtc/pc/dtmfsender.cc b/webrtc/pc/dtmfsender.cc
index a08a53ce0e..3a95c2ad34 100644
--- a/webrtc/pc/dtmfsender.cc
+++ b/webrtc/pc/dtmfsender.cc
@@ -14,9 +14,9 @@
 
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/dtmfsender.h b/webrtc/pc/dtmfsender.h
index 5eab055185..28156f3055 100644
--- a/webrtc/pc/dtmfsender.h
+++ b/webrtc/pc/dtmfsender.h
@@ -16,9 +16,9 @@
 #include "webrtc/api/dtmfsenderinterface.h"
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/proxy.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/refcount.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/refcount.h"
 
 // DtmfSender is the native implementation of the RTCDTMFSender defined by
 // the WebRTC W3C Editor's Draft.
diff --git a/webrtc/pc/dtmfsender_unittest.cc b/webrtc/pc/dtmfsender_unittest.cc
index 8401976a04..400444ee2c 100644
--- a/webrtc/pc/dtmfsender_unittest.cc
+++ b/webrtc/pc/dtmfsender_unittest.cc
@@ -15,11 +15,11 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
 #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"
 
 using webrtc::AudioTrackInterface;
 using webrtc::AudioTrack;
diff --git a/webrtc/pc/externalhmac.cc b/webrtc/pc/externalhmac.cc
index 94e39d30b7..34cab08bef 100644
--- a/webrtc/pc/externalhmac.cc
+++ b/webrtc/pc/externalhmac.cc
@@ -12,7 +12,7 @@
 
 #include <stdlib.h>  // For malloc/free.
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 #include "third_party/libsrtp/crypto/include/crypto_kernel.h"
 #include "third_party/libsrtp/include/srtp.h"
diff --git a/webrtc/pc/iceserverparsing.cc b/webrtc/pc/iceserverparsing.cc
index 7db39634a4..d9f4885c2b 100644
--- a/webrtc/pc/iceserverparsing.cc
+++ b/webrtc/pc/iceserverparsing.cc
@@ -13,7 +13,7 @@
 #include <cctype>  // For std::isdigit.
 #include <string>
 
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/iceserverparsing_unittest.cc b/webrtc/pc/iceserverparsing_unittest.cc
index 46e010a0f3..d4339638fb 100644
--- a/webrtc/pc/iceserverparsing_unittest.cc
+++ b/webrtc/pc/iceserverparsing_unittest.cc
@@ -11,8 +11,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/pc/iceserverparsing.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/jsepicecandidate.cc b/webrtc/pc/jsepicecandidate.cc
index 51faa0739f..dbe05e40d7 100644
--- a/webrtc/pc/jsepicecandidate.cc
+++ b/webrtc/pc/jsepicecandidate.cc
@@ -12,8 +12,8 @@
 
 #include <vector>
 
-#include "webrtc/base/stringencode.h"
 #include "webrtc/pc/webrtcsdp.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/jsepsessiondescription.cc b/webrtc/pc/jsepsessiondescription.cc
index ab34528441..2e972ea3b4 100644
--- a/webrtc/pc/jsepsessiondescription.cc
+++ b/webrtc/pc/jsepsessiondescription.cc
@@ -12,10 +12,10 @@
 
 #include <memory>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/stringencode.h"
 #include "webrtc/pc/mediasession.h"
 #include "webrtc/pc/webrtcsdp.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 using cricket::SessionDescription;
 
diff --git a/webrtc/pc/jsepsessiondescription_unittest.cc b/webrtc/pc/jsepsessiondescription_unittest.cc
index c406ad8249..4d8218a9c6 100644
--- a/webrtc/pc/jsepsessiondescription_unittest.cc
+++ b/webrtc/pc/jsepsessiondescription_unittest.cc
@@ -13,14 +13,14 @@
 
 #include "webrtc/api/jsepicecandidate.h"
 #include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringencode.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"
 
 using webrtc::IceCandidateCollection;
 using webrtc::IceCandidateInterface;
diff --git a/webrtc/pc/localaudiosource_unittest.cc b/webrtc/pc/localaudiosource_unittest.cc
index eb42213a9f..9b26095f49 100644
--- a/webrtc/pc/localaudiosource_unittest.cc
+++ b/webrtc/pc/localaudiosource_unittest.cc
@@ -14,9 +14,9 @@
 #include <vector>
 
 #include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/gunit.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakevideorenderer.h"
+#include "webrtc/rtc_base/gunit.h"
 
 using webrtc::LocalAudioSource;
 using webrtc::MediaConstraintsInterface;
diff --git a/webrtc/pc/mediaconstraintsinterface_unittest.cc b/webrtc/pc/mediaconstraintsinterface_unittest.cc
index dcf4bb7fde..81b5fb47a0 100644
--- a/webrtc/pc/mediaconstraintsinterface_unittest.cc
+++ b/webrtc/pc/mediaconstraintsinterface_unittest.cc
@@ -11,7 +11,7 @@
 #include "webrtc/api/mediaconstraintsinterface.h"
 
 #include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/mediamonitor.cc b/webrtc/pc/mediamonitor.cc
index 010f00ef16..22e16dc840 100644
--- a/webrtc/pc/mediamonitor.cc
+++ b/webrtc/pc/mediamonitor.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/checks.h"
-#include "webrtc/pc/channelmanager.h"
 #include "webrtc/pc/mediamonitor.h"
+#include "webrtc/pc/channelmanager.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/mediamonitor.h b/webrtc/pc/mediamonitor.h
index d294cf13e7..5f2a1e23b9 100644
--- a/webrtc/pc/mediamonitor.h
+++ b/webrtc/pc/mediamonitor.h
@@ -13,11 +13,11 @@
 #ifndef WEBRTC_PC_MEDIAMONITOR_H_
 #define WEBRTC_PC_MEDIAMONITOR_H_
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/thread_annotations.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"
 
 namespace cricket {
 
diff --git a/webrtc/pc/mediasession.cc b/webrtc/pc/mediasession.cc
index f6190c2e8f..de8f72c926 100644
--- a/webrtc/pc/mediasession.cc
+++ b/webrtc/pc/mediasession.cc
@@ -18,12 +18,6 @@
 #include <unordered_map>
 #include <utility>
 
-#include "webrtc/base/base64.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/common_types.h"
 #include "webrtc/media/base/cryptoparams.h"
 #include "webrtc/media/base/h264_profile_level_id.h"
@@ -31,6 +25,12 @@
 #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/optional.h"
+#include "webrtc/rtc_base/stringutils.h"
 
 namespace {
 const char kInline[] = "inline:";
diff --git a/webrtc/pc/mediasession_unittest.cc b/webrtc/pc/mediasession_unittest.cc
index 670ace2057..ae8d13940b 100644
--- a/webrtc/pc/mediasession_unittest.cc
+++ b/webrtc/pc/mediasession_unittest.cc
@@ -12,11 +12,6 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ssladapter.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/testutils.h"
 #include "webrtc/p2p/base/p2pconstants.h"
@@ -24,6 +19,11 @@
 #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"
 
 #define ASSERT_CRYPTO(cd, s, cs) \
     ASSERT_EQ(s, cd->cryptos().size()); \
diff --git a/webrtc/pc/mediastream.cc b/webrtc/pc/mediastream.cc
index 18307923ac..c13d80d9b6 100644
--- a/webrtc/pc/mediastream.cc
+++ b/webrtc/pc/mediastream.cc
@@ -9,8 +9,8 @@
  */
 
 #include "webrtc/pc/mediastream.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/mediastream_unittest.cc b/webrtc/pc/mediastream_unittest.cc
index e2e3985507..01a547bbc5 100644
--- a/webrtc/pc/mediastream_unittest.cc
+++ b/webrtc/pc/mediastream_unittest.cc
@@ -10,14 +10,14 @@
 
 #include <string>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
 #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"
 
 static const char kStreamLabel1[] = "local_stream_1";
 static const char kVideoTrackId[] = "dummy_video_cam_1";
diff --git a/webrtc/pc/mediastreamobserver.h b/webrtc/pc/mediastreamobserver.h
index 5d9012be60..d80c732f3b 100644
--- a/webrtc/pc/mediastreamobserver.h
+++ b/webrtc/pc/mediastreamobserver.h
@@ -12,8 +12,8 @@
 #define WEBRTC_PC_MEDIASTREAMOBSERVER_H_
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sigslot.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/sigslot.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/peerconnection.cc b/webrtc/pc/peerconnection.cc
index 12891df16b..a947c301a1 100644
--- a/webrtc/pc/peerconnection.cc
+++ b/webrtc/pc/peerconnection.cc
@@ -19,12 +19,6 @@
 #include "webrtc/api/mediaconstraintsinterface.h"
 #include "webrtc/api/mediastreamproxy.h"
 #include "webrtc/api/mediastreamtrackproxy.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/call/call.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/media/sctp/sctptransport.h"
@@ -39,6 +33,12 @@
 #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"
 
diff --git a/webrtc/pc/peerconnection_integrationtest.cc b/webrtc/pc/peerconnection_integrationtest.cc
index 12b99b4902..d20e2f965b 100644
--- a/webrtc/pc/peerconnection_integrationtest.cc
+++ b/webrtc/pc/peerconnection_integrationtest.cc
@@ -26,14 +26,6 @@
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/media/engine/fakewebrtcvideoengine.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/portinterface.h"
@@ -50,6 +42,14 @@
 #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"
 
 using cricket::ContentInfo;
 using cricket::FakeWebRtcVideoDecoder;
diff --git a/webrtc/pc/peerconnectionendtoend_unittest.cc b/webrtc/pc/peerconnectionendtoend_unittest.cc
index a735ea7c15..c83235229d 100644
--- a/webrtc/pc/peerconnectionendtoend_unittest.cc
+++ b/webrtc/pc/peerconnectionendtoend_unittest.cc
@@ -12,14 +12,14 @@
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.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"
 #ifdef WEBRTC_ANDROID
 #include "webrtc/pc/test/androidtestinitializer.h"
 #endif
diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
index 4bf118f9af..15e36f094a 100644
--- a/webrtc/pc/peerconnectionfactory.cc
+++ b/webrtc/pc/peerconnectionfactory.cc
@@ -18,9 +18,9 @@
 #include "webrtc/api/peerconnectionfactoryproxy.h"
 #include "webrtc/api/peerconnectionproxy.h"
 #include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.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
diff --git a/webrtc/pc/peerconnectionfactory.h b/webrtc/pc/peerconnectionfactory.h
index c93594db62..ebd3016934 100644
--- a/webrtc/pc/peerconnectionfactory.h
+++ b/webrtc/pc/peerconnectionfactory.h
@@ -16,10 +16,10 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/rtccertificategenerator.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"
 
 namespace rtc {
 class BasicNetworkManager;
diff --git a/webrtc/pc/peerconnectionfactory_unittest.cc b/webrtc/pc/peerconnectionfactory_unittest.cc
index 10aacc0194..cbabc259bd 100644
--- a/webrtc/pc/peerconnectionfactory_unittest.cc
+++ b/webrtc/pc/peerconnectionfactory_unittest.cc
@@ -13,13 +13,13 @@
 #include <utility>
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.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"
 #ifdef WEBRTC_ANDROID
 #include "webrtc/pc/test/androidtestinitializer.h"
 #endif
diff --git a/webrtc/pc/peerconnectioninterface_unittest.cc b/webrtc/pc/peerconnectioninterface_unittest.cc
index c36460f73b..c10324a94b 100644
--- a/webrtc/pc/peerconnectioninterface_unittest.cc
+++ b/webrtc/pc/peerconnectioninterface_unittest.cc
@@ -21,12 +21,6 @@
 #include "webrtc/api/rtpreceiverinterface.h"
 #include "webrtc/api/rtpsenderinterface.h"
 #include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/media/base/fakevideocapturer.h"
 #include "webrtc/media/engine/webrtcmediaengine.h"
 #include "webrtc/media/sctp/sctptransportinternal.h"
@@ -43,6 +37,12 @@
 #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"
 
 #ifdef WEBRTC_ANDROID
diff --git a/webrtc/pc/proxy_unittest.cc b/webrtc/pc/proxy_unittest.cc
index d7acdc193d..0d97c4174f 100644
--- a/webrtc/pc/proxy_unittest.cc
+++ b/webrtc/pc/proxy_unittest.cc
@@ -13,9 +13,9 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/thread.h"
 #include "webrtc/test/gmock.h"
 
 using ::testing::_;
diff --git a/webrtc/pc/quicdatachannel.cc b/webrtc/pc/quicdatachannel.cc
index 8907ce767f..ab8675dd57 100644
--- a/webrtc/pc/quicdatachannel.cc
+++ b/webrtc/pc/quicdatachannel.cc
@@ -10,12 +10,12 @@
 
 #include "webrtc/pc/quicdatachannel.h"
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/logging.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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/quicdatachannel.h b/webrtc/pc/quicdatachannel.h
index 2f6288b7de..f580c4b7b4 100644
--- a/webrtc/pc/quicdatachannel.h
+++ b/webrtc/pc/quicdatachannel.h
@@ -16,9 +16,9 @@
 #include <unordered_set>
 
 #include "webrtc/api/datachannelinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace cricket {
 class QuicTransportChannel;
diff --git a/webrtc/pc/quicdatachannel_unittest.cc b/webrtc/pc/quicdatachannel_unittest.cc
index 649c36feb9..173d6dff4c 100644
--- a/webrtc/pc/quicdatachannel_unittest.cc
+++ b/webrtc/pc/quicdatachannel_unittest.cc
@@ -16,12 +16,12 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #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"
 
 using cricket::FakeTransportChannel;
 using cricket::QuicTransportChannel;
diff --git a/webrtc/pc/quicdatatransport.cc b/webrtc/pc/quicdatatransport.cc
index 8b0a93f085..142085e72b 100644
--- a/webrtc/pc/quicdatatransport.cc
+++ b/webrtc/pc/quicdatatransport.cc
@@ -10,10 +10,10 @@
 
 #include "webrtc/pc/quicdatatransport.h"
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/logging.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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/quicdatatransport.h b/webrtc/pc/quicdatatransport.h
index 6b35a104f1..946e6b03b8 100644
--- a/webrtc/pc/quicdatatransport.h
+++ b/webrtc/pc/quicdatatransport.h
@@ -15,11 +15,11 @@
 #include <unordered_map>
 
 #include "webrtc/api/datachannelinterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.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"
 
 namespace cricket {
 class QuicTransportChannel;
diff --git a/webrtc/pc/quicdatatransport_unittest.cc b/webrtc/pc/quicdatatransport_unittest.cc
index af28159aea..8d6c189488 100644
--- a/webrtc/pc/quicdatatransport_unittest.cc
+++ b/webrtc/pc/quicdatatransport_unittest.cc
@@ -16,12 +16,12 @@
 #include <unordered_map>
 #include <vector>
 
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/gunit.h"
 #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"
 
 using webrtc::DataBuffer;
 using webrtc::DataChannelInit;
diff --git a/webrtc/pc/remoteaudiosource.cc b/webrtc/pc/remoteaudiosource.cc
index b2568191bd..8d1a5d0fd4 100644
--- a/webrtc/pc/remoteaudiosource.cc
+++ b/webrtc/pc/remoteaudiosource.cc
@@ -15,10 +15,10 @@
 #include <memory>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/remoteaudiosource.h b/webrtc/pc/remoteaudiosource.h
index b84a016aad..14c16a79cc 100644
--- a/webrtc/pc/remoteaudiosource.h
+++ b/webrtc/pc/remoteaudiosource.h
@@ -16,8 +16,8 @@
 
 #include "webrtc/api/call/audio_sink.h"
 #include "webrtc/api/notifier.h"
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/pc/channel.h"
+#include "webrtc/rtc_base/criticalsection.h"
 
 namespace rtc {
 struct Message;
diff --git a/webrtc/pc/rtcpmuxfilter.cc b/webrtc/pc/rtcpmuxfilter.cc
index f3ae4680b9..67293b3309 100644
--- a/webrtc/pc/rtcpmuxfilter.cc
+++ b/webrtc/pc/rtcpmuxfilter.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/pc/rtcpmuxfilter.h"
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/rtcpmuxfilter_unittest.cc b/webrtc/pc/rtcpmuxfilter_unittest.cc
index 807103a145..bd2fea1766 100644
--- a/webrtc/pc/rtcpmuxfilter_unittest.cc
+++ b/webrtc/pc/rtcpmuxfilter_unittest.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/media/base/testutils.h"
 #include "webrtc/pc/rtcpmuxfilter.h"
+#include "webrtc/media/base/testutils.h"
+#include "webrtc/rtc_base/gunit.h"
 
 TEST(RtcpMuxFilterTest, IsActiveSender) {
   cricket::RtcpMuxFilter filter;
diff --git a/webrtc/pc/rtcstats_integrationtest.cc b/webrtc/pc/rtcstats_integrationtest.cc
index 3337c4ee8b..3d1e7d66ea 100644
--- a/webrtc/pc/rtcstats_integrationtest.cc
+++ b/webrtc/pc/rtcstats_integrationtest.cc
@@ -17,13 +17,13 @@
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/stats/rtcstats_objects.h"
 #include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/refcountedobject.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/pc/test/peerconnectiontestwrapper.h"
 #include "webrtc/pc/test/rtcstatsobtainer.h"
+#include "webrtc/rtc_base/checks.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/virtualsocketserver.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/rtcstatscollector.cc b/webrtc/pc/rtcstatscollector.cc
index ca995327d5..f5b8c8a936 100644
--- a/webrtc/pc/rtcstatscollector.cc
+++ b/webrtc/pc/rtcstatscollector.cc
@@ -17,14 +17,14 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/timeutils.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/timeutils.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/rtcstatscollector.h b/webrtc/pc/rtcstatscollector.h
index 9dce0fe79e..980edd6078 100644
--- a/webrtc/pc/rtcstatscollector.h
+++ b/webrtc/pc/rtcstatscollector.h
@@ -19,17 +19,17 @@
 #include "webrtc/api/stats/rtcstats_objects.h"
 #include "webrtc/api/stats/rtcstatscollectorcallback.h"
 #include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/timeutils.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/optional.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"
 
 namespace cricket {
 class Candidate;
diff --git a/webrtc/pc/rtcstatscollector_unittest.cc b/webrtc/pc/rtcstatscollector_unittest.cc
index 7b78632126..43c94efe62 100644
--- a/webrtc/pc/rtcstatscollector_unittest.cc
+++ b/webrtc/pc/rtcstatscollector_unittest.cc
@@ -22,15 +22,6 @@
 #include "webrtc/api/stats/rtcstatsreport.h"
 #include "webrtc/api/test/mock_rtpreceiver.h"
 #include "webrtc/api/test/mock_rtpsender.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timedelta.h"
-#include "webrtc/base/timeutils.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"
@@ -42,6 +33,15 @@
 #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"
 
 using testing::_;
 using testing::Invoke;
diff --git a/webrtc/pc/rtpreceiver.cc b/webrtc/pc/rtpreceiver.cc
index 96974ee9f7..f3eef5a9a9 100644
--- a/webrtc/pc/rtpreceiver.cc
+++ b/webrtc/pc/rtpreceiver.cc
@@ -12,9 +12,9 @@
 
 #include "webrtc/api/mediastreamtrackproxy.h"
 #include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/pc/audiotrack.h"
 #include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/trace_event.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/rtpreceiver.h b/webrtc/pc/rtpreceiver.h
index b0ea247de2..9809b734ab 100644
--- a/webrtc/pc/rtpreceiver.h
+++ b/webrtc/pc/rtpreceiver.h
@@ -21,12 +21,12 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/sigslot.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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/rtpsender.cc b/webrtc/pc/rtpsender.cc
index 5cf13d060d..a16a28c193 100644
--- a/webrtc/pc/rtpsender.cc
+++ b/webrtc/pc/rtpsender.cc
@@ -11,10 +11,10 @@
 #include "webrtc/pc/rtpsender.h"
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/trace_event.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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/rtpsender.h b/webrtc/pc/rtpsender.h
index 57ec71edf3..24edb4b6f6 100644
--- a/webrtc/pc/rtpsender.h
+++ b/webrtc/pc/rtpsender.h
@@ -20,8 +20,8 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/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
diff --git a/webrtc/pc/rtpsenderreceiver_unittest.cc b/webrtc/pc/rtpsenderreceiver_unittest.cc
index 994cf3d59e..bf413e411d 100644
--- a/webrtc/pc/rtpsenderreceiver_unittest.cc
+++ b/webrtc/pc/rtpsenderreceiver_unittest.cc
@@ -12,8 +12,6 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/sigslot.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/mediachannel.h"
@@ -30,6 +28,8 @@
 #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"
 
diff --git a/webrtc/pc/rtptransport.cc b/webrtc/pc/rtptransport.cc
index 2981675bac..6b0141fc8e 100644
--- a/webrtc/pc/rtptransport.cc
+++ b/webrtc/pc/rtptransport.cc
@@ -10,11 +10,11 @@
 
 #include "webrtc/pc/rtptransport.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/trace_event.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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/rtptransport.h b/webrtc/pc/rtptransport.h
index 1224b4432b..87f29bac2a 100644
--- a/webrtc/pc/rtptransport.h
+++ b/webrtc/pc/rtptransport.h
@@ -12,8 +12,8 @@
 #define WEBRTC_PC_RTPTRANSPORT_H_
 
 #include "webrtc/api/ortc/rtptransportinterface.h"
-#include "webrtc/base/sigslot.h"
 #include "webrtc/pc/bundlefilter.h"
+#include "webrtc/rtc_base/sigslot.h"
 
 namespace rtc {
 
diff --git a/webrtc/pc/rtptransport_unittest.cc b/webrtc/pc/rtptransport_unittest.cc
index df84d471a7..4b75a05c80 100644
--- a/webrtc/pc/rtptransport_unittest.cc
+++ b/webrtc/pc/rtptransport_unittest.cc
@@ -10,9 +10,9 @@
 
 #include <string>
 
-#include "webrtc/base/gunit.h"
 #include "webrtc/p2p/base/fakepackettransport.h"
 #include "webrtc/pc/rtptransport.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/sctputils.cc b/webrtc/pc/sctputils.cc
index 1c2f76f496..48f380b5b6 100644
--- a/webrtc/pc/sctputils.cc
+++ b/webrtc/pc/sctputils.cc
@@ -10,9 +10,9 @@
 
 #include "webrtc/pc/sctputils.h"
 
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/sctputils_unittest.cc b/webrtc/pc/sctputils_unittest.cc
index dc56e94d31..5ef3fcb04f 100644
--- a/webrtc/pc/sctputils_unittest.cc
+++ b/webrtc/pc/sctputils_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/gunit.h"
 #include "webrtc/pc/sctputils.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
 
 class SctpUtilsTest : public testing::Test {
  public:
diff --git a/webrtc/pc/srtpfilter.cc b/webrtc/pc/srtpfilter.cc
index 62606e0025..a7634757d6 100644
--- a/webrtc/pc/srtpfilter.cc
+++ b/webrtc/pc/srtpfilter.cc
@@ -16,16 +16,16 @@
 
 #include "third_party/libsrtp/include/srtp.h"
 #include "third_party/libsrtp/include/srtp_priv.h"
-#include "webrtc/base/base64.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/media/base/rtputils.h"
 #include "webrtc/pc/externalhmac.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace cricket {
 
diff --git a/webrtc/pc/srtpfilter.h b/webrtc/pc/srtpfilter.h
index 6051e52660..97ae26b00d 100644
--- a/webrtc/pc/srtpfilter.h
+++ b/webrtc/pc/srtpfilter.h
@@ -17,13 +17,13 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/media/base/cryptoparams.h"
 #include "webrtc/p2p/base/sessiondescription.h"
+#include "webrtc/rtc_base/basictypes.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"
 
 // Forward declaration to avoid pulling in libsrtp headers here
 struct srtp_event_data_t;
diff --git a/webrtc/pc/srtpfilter_unittest.cc b/webrtc/pc/srtpfilter_unittest.cc
index 4d1540e2fd..a200de2e0c 100644
--- a/webrtc/pc/srtpfilter_unittest.cc
+++ b/webrtc/pc/srtpfilter_unittest.cc
@@ -13,14 +13,14 @@
 #include "webrtc/pc/srtpfilter.h"
 
 #include "third_party/libsrtp/include/srtp.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
 #include "webrtc/media/base/cryptoparams.h"
 #include "webrtc/media/base/fakertp.h"
 #include "webrtc/p2p/base/sessiondescription.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
 
 using rtc::CS_AES_CM_128_HMAC_SHA1_80;
 using rtc::CS_AES_CM_128_HMAC_SHA1_32;
diff --git a/webrtc/pc/statscollector.cc b/webrtc/pc/statscollector.cc
index c932583159..17547eff6e 100644
--- a/webrtc/pc/statscollector.cc
+++ b/webrtc/pc/statscollector.cc
@@ -14,10 +14,10 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/base64.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/pc/channel.h"
 #include "webrtc/pc/peerconnection.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/pc/statscollector_unittest.cc b/webrtc/pc/statscollector_unittest.cc
index 165457c9c8..9b62b81d33 100644
--- a/webrtc/pc/statscollector_unittest.cc
+++ b/webrtc/pc/statscollector_unittest.cc
@@ -16,11 +16,6 @@
 #include "webrtc/pc/statscollector.h"
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/base64.h"
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/stringencode.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"
@@ -34,6 +29,11 @@
 #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"
 
diff --git a/webrtc/pc/test/androidtestinitializer.cc b/webrtc/pc/test/androidtestinitializer.cc
index f070104177..d1b0dab4b0 100644
--- a/webrtc/pc/test/androidtestinitializer.cc
+++ b/webrtc/pc/test/androidtestinitializer.cc
@@ -12,7 +12,7 @@
 
 #include <pthread.h>
 
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/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 @@ RTC_PUSH_IGNORING_WUNDEF()
 #include "base/android/jni_android.h"
 RTC_POP_IGNORING_WUNDEF()
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ssladapter.h"
 #include "webrtc/modules/utility/include/jvm_android.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ssladapter.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/test/fakeaudiocapturemodule.cc b/webrtc/pc/test/fakeaudiocapturemodule.cc
index 5c91ddf025..4bc6e4faec 100644
--- a/webrtc/pc/test/fakeaudiocapturemodule.cc
+++ b/webrtc/pc/test/fakeaudiocapturemodule.cc
@@ -10,10 +10,10 @@
 
 #include "webrtc/pc/test/fakeaudiocapturemodule.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.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"
 
 // 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
diff --git a/webrtc/pc/test/fakeaudiocapturemodule.h b/webrtc/pc/test/fakeaudiocapturemodule.h
index 72735b6fa7..f01b3e8e5b 100644
--- a/webrtc/pc/test/fakeaudiocapturemodule.h
+++ b/webrtc/pc/test/fakeaudiocapturemodule.h
@@ -22,12 +22,12 @@
 
 #include <memory>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #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"
 
 namespace rtc {
 class Thread;
diff --git a/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc b/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc
index aa40af79d0..62885c2cdb 100644
--- a/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc
+++ b/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc
@@ -12,10 +12,10 @@
 
 #include <algorithm>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
+#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"
 
 using std::min;
 
diff --git a/webrtc/pc/test/fakedatachannelprovider.h b/webrtc/pc/test/fakedatachannelprovider.h
index 114f3de7e6..89bb987fe0 100644
--- a/webrtc/pc/test/fakedatachannelprovider.h
+++ b/webrtc/pc/test/fakedatachannelprovider.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_
 #define WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_
 
-#include "webrtc/base/checks.h"
 #include "webrtc/pc/datachannel.h"
+#include "webrtc/rtc_base/checks.h"
 
 class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface {
  public:
diff --git a/webrtc/pc/test/fakeperiodicvideocapturer.h b/webrtc/pc/test/fakeperiodicvideocapturer.h
index 551df8b0e5..02b4e4b3e5 100644
--- a/webrtc/pc/test/fakeperiodicvideocapturer.h
+++ b/webrtc/pc/test/fakeperiodicvideocapturer.h
@@ -16,8 +16,8 @@
 
 #include <vector>
 
-#include "webrtc/base/thread.h"
 #include "webrtc/media/base/fakevideocapturer.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/test/fakertccertificategenerator.h b/webrtc/pc/test/fakertccertificategenerator.h
index ce36834817..39b9107448 100644
--- a/webrtc/pc/test/fakertccertificategenerator.h
+++ b/webrtc/pc/test/fakertccertificategenerator.h
@@ -16,8 +16,8 @@
 #include <utility>
 
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
 
 // RSA with mod size 1024, pub exp 0x10001.
 static const rtc::RTCCertificatePEM kRsaPems[] = {
diff --git a/webrtc/pc/test/mock_peerconnection.h b/webrtc/pc/test/mock_peerconnection.h
index 1256067237..e743cd85c8 100644
--- a/webrtc/pc/test/mock_peerconnection.h
+++ b/webrtc/pc/test/mock_peerconnection.h
@@ -13,10 +13,10 @@
 
 #include <vector>
 
-#include "webrtc/base/thread.h"
 #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"
 
 namespace webrtc {
diff --git a/webrtc/pc/test/mockpeerconnectionobservers.h b/webrtc/pc/test/mockpeerconnectionobservers.h
index fb4c00419a..5367eeb62a 100644
--- a/webrtc/pc/test/mockpeerconnectionobservers.h
+++ b/webrtc/pc/test/mockpeerconnectionobservers.h
@@ -17,7 +17,7 @@
 #include <string>
 
 #include "webrtc/api/datachannelinterface.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/test/peerconnectiontestwrapper.cc b/webrtc/pc/test/peerconnectiontestwrapper.cc
index f1bf21d53f..0cd28040ed 100644
--- a/webrtc/pc/test/peerconnectiontestwrapper.cc
+++ b/webrtc/pc/test/peerconnectiontestwrapper.cc
@@ -10,12 +10,12 @@
 
 #include <utility>
 
-#include "webrtc/base/gunit.h"
 #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"
 
 static const char kStreamLabelBase[] = "stream_label";
 static const char kVideoTrackLabelBase[] = "video_track";
diff --git a/webrtc/pc/test/peerconnectiontestwrapper.h b/webrtc/pc/test/peerconnectiontestwrapper.h
index 124e63d847..c0d1ea3402 100644
--- a/webrtc/pc/test/peerconnectiontestwrapper.h
+++ b/webrtc/pc/test/peerconnectiontestwrapper.h
@@ -15,9 +15,9 @@
 
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/sigslot.h"
 #include "webrtc/pc/test/fakeaudiocapturemodule.h"
 #include "webrtc/pc/test/fakevideotrackrenderer.h"
+#include "webrtc/rtc_base/sigslot.h"
 
 class PeerConnectionTestWrapper
     : public webrtc::PeerConnectionObserver,
diff --git a/webrtc/pc/test/rtcstatsobtainer.h b/webrtc/pc/test/rtcstatsobtainer.h
index d0d4b61359..62e995e3b0 100644
--- a/webrtc/pc/test/rtcstatsobtainer.h
+++ b/webrtc/pc/test/rtcstatsobtainer.h
@@ -12,7 +12,7 @@
 #define WEBRTC_PC_TEST_RTCSTATSOBTAINER_H_
 
 #include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/trackmediainfomap.h b/webrtc/pc/trackmediainfomap.h
index ceab741bad..174d331415 100644
--- a/webrtc/pc/trackmediainfomap.h
+++ b/webrtc/pc/trackmediainfomap.h
@@ -18,8 +18,8 @@
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/rtpreceiverinterface.h"
 #include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/base/refcount.h"
 #include "webrtc/media/base/mediachannel.h"
+#include "webrtc/rtc_base/refcount.h"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/trackmediainfomap_unittest.cc b/webrtc/pc/trackmediainfomap_unittest.cc
index 07436800f8..b380cc4184 100644
--- a/webrtc/pc/trackmediainfomap_unittest.cc
+++ b/webrtc/pc/trackmediainfomap_unittest.cc
@@ -19,11 +19,11 @@
 #include "webrtc/api/rtpsenderinterface.h"
 #include "webrtc/api/test/mock_rtpreceiver.h"
 #include "webrtc/api/test/mock_rtpsender.h"
-#include "webrtc/base/refcount.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"
 
 namespace webrtc {
diff --git a/webrtc/pc/videocapturertracksource.cc b/webrtc/pc/videocapturertracksource.cc
index 216362b188..4cddf7f535 100644
--- a/webrtc/pc/videocapturertracksource.cc
+++ b/webrtc/pc/videocapturertracksource.cc
@@ -15,8 +15,8 @@
 #include <vector>
 
 #include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
 
 using cricket::CaptureState;
 using webrtc::MediaConstraintsInterface;
diff --git a/webrtc/pc/videocapturertracksource.h b/webrtc/pc/videocapturertracksource.h
index 2477340cdf..0e6eb27a25 100644
--- a/webrtc/pc/videocapturertracksource.h
+++ b/webrtc/pc/videocapturertracksource.h
@@ -14,11 +14,11 @@
 #include <memory>
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/sigslot.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"
 
 // VideoCapturerTrackSource implements VideoTrackSourceInterface. It owns a
 // cricket::VideoCapturer and make sure the camera is started at a resolution
diff --git a/webrtc/pc/videocapturertracksource_unittest.cc b/webrtc/pc/videocapturertracksource_unittest.cc
index 3fe726a49a..b6e50ae4ff 100644
--- a/webrtc/pc/videocapturertracksource_unittest.cc
+++ b/webrtc/pc/videocapturertracksource_unittest.cc
@@ -13,11 +13,11 @@
 #include <vector>
 
 #include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/gunit.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"
 
 using webrtc::FakeConstraints;
 using webrtc::VideoCapturerTrackSource;
diff --git a/webrtc/pc/videotrack.h b/webrtc/pc/videotrack.h
index 7e75e14d07..f251797155 100644
--- a/webrtc/pc/videotrack.h
+++ b/webrtc/pc/videotrack.h
@@ -14,10 +14,10 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread_checker.h"
 #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"
 
 namespace webrtc {
 
diff --git a/webrtc/pc/videotrack_unittest.cc b/webrtc/pc/videotrack_unittest.cc
index 6f4330fb33..d033efe632 100644
--- a/webrtc/pc/videotrack_unittest.cc
+++ b/webrtc/pc/videotrack_unittest.cc
@@ -11,12 +11,12 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/gunit.h"
-#include "webrtc/media/base/fakevideocapturer.h"
 #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"
 
 using webrtc::FakeVideoTrackRenderer;
 using webrtc::MediaSourceInterface;
diff --git a/webrtc/pc/videotracksource.h b/webrtc/pc/videotracksource.h
index 259b1c305a..41252d8a07 100644
--- a/webrtc/pc/videotracksource.h
+++ b/webrtc/pc/videotracksource.h
@@ -13,9 +13,9 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/notifier.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 // VideoTrackSource implements VideoTrackSourceInterface.
 namespace webrtc {
diff --git a/webrtc/pc/webrtcsdp.cc b/webrtc/pc/webrtcsdp.cc
index 8b08c27080..d9ed4255aa 100644
--- a/webrtc/pc/webrtcsdp.cc
+++ b/webrtc/pc/webrtcsdp.cc
@@ -22,11 +22,11 @@
 
 #include "webrtc/api/jsepicecandidate.h"
 #include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/stringutils.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"
 // for RtpExtension
 #include "webrtc/config.h"
 #include "webrtc/media/base/codec.h"
diff --git a/webrtc/pc/webrtcsdp_unittest.cc b/webrtc/pc/webrtcsdp_unittest.cc
index af6f2c91e6..20b2b4e15d 100644
--- a/webrtc/pc/webrtcsdp_unittest.cc
+++ b/webrtc/pc/webrtcsdp_unittest.cc
@@ -14,18 +14,18 @@
 #include <vector>
 
 #include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/sslfingerprint.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.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"
 #ifdef WEBRTC_ANDROID
 #include "webrtc/pc/test/androidtestinitializer.h"
 #endif
diff --git a/webrtc/pc/webrtcsession.cc b/webrtc/pc/webrtcsession.cc
index e0eb72dce0..4f177337a0 100644
--- a/webrtc/pc/webrtcsession.cc
+++ b/webrtc/pc/webrtcsession.cc
@@ -21,13 +21,6 @@
 #include "webrtc/api/jsepicecandidate.h"
 #include "webrtc/api/jsepsessiondescription.h"
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/call/call.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/videocapturer.h"
@@ -38,6 +31,13 @@
 #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"
 
 #ifdef HAVE_QUIC
 #include "webrtc/p2p/quic/quictransportchannel.h"
diff --git a/webrtc/pc/webrtcsession.h b/webrtc/pc/webrtcsession.h
index cb5b69a152..9b62c97db6 100644
--- a/webrtc/pc/webrtcsession.h
+++ b/webrtc/pc/webrtcsession.h
@@ -18,16 +18,16 @@
 
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/statstypes.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/thread.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/optional.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/rtc_base/thread.h"
 
 #ifdef HAVE_QUIC
 #include "webrtc/pc/quicdatatransport.h"
diff --git a/webrtc/pc/webrtcsession_unittest.cc b/webrtc/pc/webrtcsession_unittest.cc
index 40b979dc9d..f6d334e3e4 100644
--- a/webrtc/pc/webrtcsession_unittest.cc
+++ b/webrtc/pc/webrtcsession_unittest.cc
@@ -15,18 +15,6 @@
 #include "webrtc/api/fakemetricsobserver.h"
 #include "webrtc/api/jsepicecandidate.h"
 #include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakevideorenderer.h"
@@ -47,6 +35,18 @@
 #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"
 
 using cricket::FakeVoiceMediaChannel;
 using cricket::TransportInfo;
diff --git a/webrtc/pc/webrtcsessiondescriptionfactory.cc b/webrtc/pc/webrtcsessiondescriptionfactory.cc
index dc460ac14c..8eccd65767 100644
--- a/webrtc/pc/webrtcsessiondescriptionfactory.cc
+++ b/webrtc/pc/webrtcsessiondescriptionfactory.cc
@@ -15,9 +15,9 @@
 #include "webrtc/api/jsep.h"
 #include "webrtc/api/jsepsessiondescription.h"
 #include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/sslidentity.h"
 #include "webrtc/pc/webrtcsession.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/sslidentity.h"
 
 using cricket::MediaSessionOptions;
 
diff --git a/webrtc/pc/webrtcsessiondescriptionfactory.h b/webrtc/pc/webrtcsessiondescriptionfactory.h
index d742164999..04a4fd8b03 100644
--- a/webrtc/pc/webrtcsessiondescriptionfactory.h
+++ b/webrtc/pc/webrtcsessiondescriptionfactory.h
@@ -14,12 +14,12 @@
 #include <memory>
 
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/rtccertificategenerator.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"
 
 namespace cricket {
 class ChannelManager;
diff --git a/webrtc/rtc_tools/agc/activity_metric.cc b/webrtc/rtc_tools/agc/activity_metric.cc
index 8ea193913c..2cca66b006 100644
--- a/webrtc/rtc_tools/agc/activity_metric.cc
+++ b/webrtc/rtc_tools/agc/activity_metric.cc
@@ -16,8 +16,6 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/base/flags.h"
-#include "webrtc/base/safe_minmax.h"
 #include "webrtc/modules/audio_processing/agc/agc.h"
 #include "webrtc/modules/audio_processing/agc/loudness_histogram.h"
 #include "webrtc/modules/audio_processing/agc/utility.h"
@@ -26,6 +24,8 @@
 #include "webrtc/modules/audio_processing/vad/standalone_vad.h"
 #include "webrtc/modules/audio_processing/vad/vad_audio_proc.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/flags.h"
+#include "webrtc/rtc_base/safe_minmax.h"
 #include "webrtc/test/gtest.h"
 
 static const int kAgcAnalWindowSamples = 100;
diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
index a9fdce6059..78993f4f7c 100644
--- a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
@@ -17,11 +17,6 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/rate_statistics.h"
 #include "webrtc/call/audio_receive_stream.h"
 #include "webrtc/call/audio_send_stream.h"
 #include "webrtc/call/call.h"
@@ -43,6 +38,11 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/rate_statistics.h"
 #include "webrtc/video_receive_stream.h"
 #include "webrtc/video_send_stream.h"
 
diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.h b/webrtc/rtc_tools/event_log_visualizer/analyzer.h
index cdc81f1f4c..0c3fa46ea5 100644
--- a/webrtc/rtc_tools/event_log_visualizer/analyzer.h
+++ b/webrtc/rtc_tools/event_log_visualizer/analyzer.h
@@ -18,11 +18,11 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/function_view.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
+#include "webrtc/rtc_base/function_view.h"
 #include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
 
 namespace webrtc {
diff --git a/webrtc/rtc_tools/event_log_visualizer/main.cc b/webrtc/rtc_tools/event_log_visualizer/main.cc
index 6ceeeec4e9..6e78c890b2 100644
--- a/webrtc/rtc_tools/event_log_visualizer/main.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/main.cc
@@ -10,8 +10,8 @@
 
 #include <iostream>
 
-#include "webrtc/base/flags.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
+#include "webrtc/rtc_base/flags.h"
 #include "webrtc/rtc_tools/event_log_visualizer/analyzer.h"
 #include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
 #include "webrtc/rtc_tools/event_log_visualizer/plot_python.h"
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_base.cc b/webrtc/rtc_tools/event_log_visualizer/plot_base.cc
index f1924b6f44..8bf3533a8f 100644
--- a/webrtc/rtc_tools/event_log_visualizer/plot_base.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/plot_base.cc
@@ -12,7 +12,7 @@
 
 #include <algorithm>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace plotting {
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h b/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
index cd9fd91b65..e4670db131 100644
--- a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
+++ b/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
@@ -10,7 +10,7 @@
 #ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
 #define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
 
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
 RTC_PUSH_IGNORING_WUNDEF()
 #include "webrtc/rtc_tools/event_log_visualizer/chart.pb.h"
 RTC_POP_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/config_reader.h b/webrtc/rtc_tools/network_tester/config_reader.h
index 7d399f3106..8cc1f8d53f 100644
--- a/webrtc/rtc_tools/network_tester/config_reader.h
+++ b/webrtc/rtc_tools/network_tester/config_reader.h
@@ -14,10 +14,10 @@
 #include <fstream>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
 
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
 
 #ifdef WEBRTC_NETWORK_TESTER_PROTO
 RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/network_tester_unittest.cc b/webrtc/rtc_tools/network_tester/network_tester_unittest.cc
index 6c86a01318..d3958be32b 100644
--- a/webrtc/rtc_tools/network_tester/network_tester_unittest.cc
+++ b/webrtc/rtc_tools/network_tester/network_tester_unittest.cc
@@ -13,7 +13,7 @@
 
 #include "webrtc/rtc_tools/network_tester/test_controller.h"
 
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
diff --git a/webrtc/rtc_tools/network_tester/packet_logger.cc b/webrtc/rtc_tools/network_tester/packet_logger.cc
index 5a32bea54f..ad93e71008 100644
--- a/webrtc/rtc_tools/network_tester/packet_logger.cc
+++ b/webrtc/rtc_tools/network_tester/packet_logger.cc
@@ -9,8 +9,8 @@
  */
 #include "webrtc/rtc_tools/network_tester/packet_logger.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/protobuf_utils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/protobuf_utils.h"
 
 namespace webrtc {
 
diff --git a/webrtc/rtc_tools/network_tester/packet_logger.h b/webrtc/rtc_tools/network_tester/packet_logger.h
index 8f8f767724..33ee96042b 100644
--- a/webrtc/rtc_tools/network_tester/packet_logger.h
+++ b/webrtc/rtc_tools/network_tester/packet_logger.h
@@ -14,8 +14,8 @@
 #include <fstream>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
 
 #ifdef WEBRTC_NETWORK_TESTER_PROTO
 RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/packet_sender.cc b/webrtc/rtc_tools/network_tester/packet_sender.cc
index ca5b8e9df2..6568ba0297 100644
--- a/webrtc/rtc_tools/network_tester/packet_sender.cc
+++ b/webrtc/rtc_tools/network_tester/packet_sender.cc
@@ -14,7 +14,7 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/rtc_tools/network_tester/config_reader.h"
 #include "webrtc/rtc_tools/network_tester/test_controller.h"
 
diff --git a/webrtc/rtc_tools/network_tester/packet_sender.h b/webrtc/rtc_tools/network_tester/packet_sender.h
index 8c4e988ac8..67fb0d7ae9 100644
--- a/webrtc/rtc_tools/network_tester/packet_sender.h
+++ b/webrtc/rtc_tools/network_tester/packet_sender.h
@@ -14,10 +14,10 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ignore_wundef.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
 
 #ifdef WEBRTC_NETWORK_TESTER_PROTO
 RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/test_controller.h b/webrtc/rtc_tools/network_tester/test_controller.h
index 16087404b1..f38758d9df 100644
--- a/webrtc/rtc_tools/network_tester/test_controller.h
+++ b/webrtc/rtc_tools/network_tester/test_controller.h
@@ -17,10 +17,10 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ignore_wundef.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/udptransport.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
 #include "webrtc/rtc_tools/network_tester/packet_logger.h"
 #include "webrtc/rtc_tools/network_tester/packet_sender.h"
 
diff --git a/webrtc/rtc_tools/simple_command_line_parser.h b/webrtc/rtc_tools/simple_command_line_parser.h
index 960038bd9c..b8c9037d3f 100644
--- a/webrtc/rtc_tools/simple_command_line_parser.h
+++ b/webrtc/rtc_tools/simple_command_line_parser.h
@@ -15,8 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/gtest_prod_util.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/gtest_prod_util.h"
 
 // This is a very basic command line parsing class. We pass the command line
 // arguments and their number and the class forms a vector out of these. Than we
diff --git a/webrtc/sdk/android/src/jni/androidmediacodeccommon.h b/webrtc/sdk/android/src/jni/androidmediacodeccommon.h
index 9f8e960336..fc85f7e9c5 100644
--- a/webrtc/sdk/android/src/jni/androidmediacodeccommon.h
+++ b/webrtc/sdk/android/src/jni/androidmediacodeccommon.h
@@ -14,11 +14,10 @@
 #include <android/log.h>
 #include <string>
 
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
index e1e5b08349..cae9b8f4a4 100644
--- a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
@@ -20,16 +20,16 @@
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/convert_from.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
diff --git a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc
index fe69de4589..e5826e154f 100644
--- a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc
@@ -22,15 +22,6 @@
 #include "third_party/libyuv/include/libyuv/convert_from.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"
 #include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/random.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/weak_ptr.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
 #include "webrtc/common_video/h264/h264_common.h"
@@ -40,6 +31,15 @@
 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
 #include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/random.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/weak_ptr.h"
 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc
index 4047f79dba..19f9b303ff 100644
--- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc
@@ -14,11 +14,11 @@
 // This was added in Lollipop to dlfcn.h
 #define RTLD_NOLOAD 4
 
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ipaddress.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ipaddress.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
index 0676e0ace3..f6f22a7a82 100644
--- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
+++ b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
@@ -11,14 +11,14 @@
 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
 #define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
 
-#include "webrtc/base/networkmonitor.h"
+#include "webrtc/rtc_base/networkmonitor.h"
 
 #include <stdint.h>
 
 #include <map>
 
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/thread_checker.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource.cc b/webrtc/sdk/android/src/jni/androidvideotracksource.cc
index c1431bd9ac..770962de6b 100644
--- a/webrtc/sdk/android/src/jni/androidvideotracksource.cc
+++ b/webrtc/sdk/android/src/jni/androidvideotracksource.cc
@@ -12,7 +12,7 @@
 
 #include <utility>
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace {
 // MediaCodec wants resolution to be divisible by 2.
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource.h b/webrtc/sdk/android/src/jni/androidvideotracksource.h
index dd4fe97f8e..54741e0cc0 100644
--- a/webrtc/sdk/android/src/jni/androidvideotracksource.h
+++ b/webrtc/sdk/android/src/jni/androidvideotracksource.h
@@ -11,15 +11,15 @@
 #ifndef WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
 #define WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
 
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
-#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timestampaligner.h"
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/media/base/adaptedvideotracksource.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timestampaligner.h"
+#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
+#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
 
 namespace webrtc {
 
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc b/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc
index 519a16d5f5..62f5f82574 100644
--- a/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/api/video/video_rotation.h"
 #include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 
diff --git a/webrtc/sdk/android/src/jni/audio_jni.h b/webrtc/sdk/android/src/jni/audio_jni.h
index 3a0b0bd700..762d9b8f9b 100644
--- a/webrtc/sdk/android/src/jni/audio_jni.h
+++ b/webrtc/sdk/android/src/jni/audio_jni.h
@@ -15,7 +15,7 @@
 // We don't want this target depend on audio related targets
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"  // nogncheck
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"  // nogncheck
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc b/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc
index 9271a7991b..69d62bcbbc 100644
--- a/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc
+++ b/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc
@@ -11,8 +11,8 @@
 #include <jni.h>
 
 #include "third_party/libyuv/include/libyuv/convert_from.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/android/src/jni/jni_helpers.h b/webrtc/sdk/android/src/jni/jni_helpers.h
index bed56838d5..19b7741fb5 100644
--- a/webrtc/sdk/android/src/jni/jni_helpers.h
+++ b/webrtc/sdk/android/src/jni/jni_helpers.h
@@ -17,9 +17,9 @@
 #include <jni.h>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 // Abort the process if |jni| has a Java exception pending.
 // This macros uses the comma operator to execute ExceptionDescribe
diff --git a/webrtc/sdk/android/src/jni/jni_onload.cc b/webrtc/sdk/android/src/jni/jni_onload.cc
index a57d0783c8..ce71920331 100644
--- a/webrtc/sdk/android/src/jni/jni_onload.cc
+++ b/webrtc/sdk/android/src/jni/jni_onload.cc
@@ -12,9 +12,9 @@
 #undef JNIEXPORT
 #define JNIEXPORT __attribute__((visibility("default")))
 
+#include "webrtc/rtc_base/ssladapter.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/ssladapter.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/android/src/jni/media_jni.h b/webrtc/sdk/android/src/jni/media_jni.h
index d0e6410e08..3b26661544 100644
--- a/webrtc/sdk/android/src/jni/media_jni.h
+++ b/webrtc/sdk/android/src/jni/media_jni.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_MEDIA_JNI_H_
 #define WEBRTC_SDK_ANDROID_SRC_JNI_MEDIA_JNI_H_
 
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 class AudioDeviceModule;
diff --git a/webrtc/sdk/android/src/jni/native_handle_impl.cc b/webrtc/sdk/android/src/jni/native_handle_impl.cc
index ae4de0b3bc..e2f3c9cd63 100644
--- a/webrtc/sdk/android/src/jni/native_handle_impl.cc
+++ b/webrtc/sdk/android/src/jni/native_handle_impl.cc
@@ -12,13 +12,13 @@
 
 #include <memory>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/keep_ref_until_done.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/keep_ref_until_done.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/system_wrappers/include/aligned_malloc.h"
diff --git a/webrtc/sdk/android/src/jni/native_handle_impl.h b/webrtc/sdk/android/src/jni/native_handle_impl.h
index ea83f62627..f70ae3b97c 100644
--- a/webrtc/sdk/android/src/jni/native_handle_impl.h
+++ b/webrtc/sdk/android/src/jni/native_handle_impl.h
@@ -16,7 +16,7 @@
 #include "webrtc/api/video/video_frame.h"
 #include "webrtc/api/video/video_frame_buffer.h"
 #include "webrtc/api/video/video_rotation.h"
-#include "webrtc/base/callback.h"
+#include "webrtc/rtc_base/callback.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
index 7171852dec..a3aa45c4be 100644
--- a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
+++ b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h"
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 
diff --git a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h
index 920cb939a0..eb57316469 100644
--- a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h
+++ b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h
@@ -16,7 +16,7 @@
 #include <utility>
 
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
 
 using cricket::WebRtcVideoDecoderFactory;
 using cricket::WebRtcVideoEncoderFactory;
diff --git a/webrtc/sdk/android/src/jni/peerconnection_jni.cc b/webrtc/sdk/android/src/jni/peerconnection_jni.cc
index 4fcfb6ebdf..43efd111e8 100644
--- a/webrtc/sdk/android/src/jni/peerconnection_jni.cc
+++ b/webrtc/sdk/android/src/jni/peerconnection_jni.cc
@@ -48,20 +48,20 @@
 #include "webrtc/api/rtpreceiverinterface.h"
 #include "webrtc/api/rtpsenderinterface.h"
 #include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event_tracer.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/logsinks.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/networkmonitor.h"
-#include "webrtc/base/rtccertificategenerator.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringutils.h"
 #include "webrtc/media/base/mediaengine.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/modules/utility/include/jvm_android.h"
 #include "webrtc/pc/webrtcsdp.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event_tracer.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/logsinks.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/networkmonitor.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/stringutils.h"
 #include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h"
 // Adding 'nogncheck' to disable the gn include headers check.
 // We don't want to always depend on audio and video related targets.
@@ -1130,8 +1130,8 @@ JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnectionFactory)
   // talk/ assumes pretty widely that the current Thread is ThreadManager'd, but
   // ThreadManager only WrapCurrentThread()s the thread where it is first
   // created.  Since the semantics around when auto-wrapping happens in
-  // webrtc/base/ are convoluted, we simply wrap here to avoid having to think
-  // about ramifications of auto-wrapping there.
+  // webrtc/rtc_base/ are convoluted, we simply wrap here to avoid having to
+  // think about ramifications of auto-wrapping there.
   rtc::ThreadManager::Instance()->WrapCurrentThread();
   webrtc::Trace::CreateTrace();
 
diff --git a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc
index 81e7ac4b9e..2576f1d33e 100644
--- a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc
+++ b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc
@@ -11,10 +11,10 @@
 
 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
 
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h
index 07d65c0143..084aa33884 100644
--- a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h
+++ b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h
@@ -13,11 +13,11 @@
 
 #include <jni.h>
 
+#include "webrtc/api/video/video_frame_buffer.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
-#include "webrtc/api/video/video_frame_buffer.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/android/src/jni/video_jni.cc b/webrtc/sdk/android/src/jni/video_jni.cc
index 616b2e0e55..fc6f30cbcf 100644
--- a/webrtc/sdk/android/src/jni/video_jni.cc
+++ b/webrtc/sdk/android/src/jni/video_jni.cc
@@ -11,9 +11,9 @@
 #include <jni.h>
 
 #include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
diff --git a/webrtc/sdk/android/src/jni/video_jni.h b/webrtc/sdk/android/src/jni/video_jni.h
index c13f33fc71..09a193f62c 100644
--- a/webrtc/sdk/android/src/jni/video_jni.h
+++ b/webrtc/sdk/android/src/jni/video_jni.h
@@ -13,7 +13,7 @@
 
 #include <jni.h>
 
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace cricket {
 class WebRtcVideoEncoderFactory;
diff --git a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
index 1584fd71d0..678dc3d485 100644
--- a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
+++ b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
@@ -11,8 +11,8 @@
 #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
 
 #include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
 
 namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/videodecoderwrapper.cc b/webrtc/sdk/android/src/jni/videodecoderwrapper.cc
index e78f39534d..b822170f1f 100644
--- a/webrtc/sdk/android/src/jni/videodecoderwrapper.cc
+++ b/webrtc/sdk/android/src/jni/videodecoderwrapper.cc
@@ -11,8 +11,8 @@
 #include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 
 namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc b/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc
index 83a089c216..42c59916d1 100644
--- a/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc
+++ b/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc
@@ -11,8 +11,8 @@
 #include <jni.h>
 
 #include "third_party/libyuv/include/libyuv/scale.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/android/src/jni/videotrack_jni.cc b/webrtc/sdk/android/src/jni/videotrack_jni.cc
index e35fda14da..96ab928500 100644
--- a/webrtc/sdk/android/src/jni/videotrack_jni.cc
+++ b/webrtc/sdk/android/src/jni/videotrack_jni.cc
@@ -11,7 +11,7 @@
 #include <jni.h>
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc_jni {
 
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
index 82e132fa2e..5017c2f1d6 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
@@ -11,7 +11,7 @@
 #import "WebRTC/RTCDataChannel.h"
 
 #include "webrtc/api/datachannelinterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
index ed1807783b..1c53e643fa 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
@@ -11,7 +11,7 @@
 #import "WebRTC/RTCPeerConnectionFactory.h"
 
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc b/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
index b0a17ffe32..daebb2c530 100644
--- a/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
+++ b/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
@@ -12,9 +12,9 @@
 
 #include "libyuv/convert.h"
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h b/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
index 133c8c6021..b28c00194f 100644
--- a/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
+++ b/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
@@ -12,8 +12,8 @@
 #define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_
 
 #include "WebRTC/RTCMacros.h"
-#include "webrtc/base/timestampaligner.h"
 #include "webrtc/media/base/adaptedvideotracksource.h"
+#include "webrtc/rtc_base/timestampaligner.h"
 
 RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame);
 
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h
index 92cd6b7d01..c9a45551a9 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h
@@ -13,12 +13,12 @@
 #define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_ENCODER_H_
 
 #include "webrtc/api/video/video_rotation.h"
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
 #include "webrtc/common_video/include/bitrate_adjuster.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
+#include "webrtc/rtc_base/criticalsection.h"
 
 #include <VideoToolbox/VideoToolbox.h>
 #include <vector>
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
index 81f51d8fcb..47afe9561e 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
@@ -15,8 +15,8 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
index 530fbe2400..4685f08757 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
@@ -17,9 +17,9 @@
 #include <CoreMedia/CoreMedia.h>
 #include <vector>
 
-#include "webrtc/base/buffer.h"
 #include "webrtc/common_video/h264/h264_common.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/buffer.h"
 
 using webrtc::H264::NaluIndex;
 
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
index ba3a3d1d42..0a680fc2b1 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
@@ -11,7 +11,7 @@
 
 #include <memory>
 
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
 #include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h"
 #include "webrtc/test/gtest.h"
 
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h
index 1341a5c003..c862d29792 100644
--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h
+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h
@@ -14,7 +14,7 @@
 
 /**
  * Initialize and clean up the SSL library. Failure is fatal. These call the
- * corresponding functions in webrtc/base/ssladapter.h.
+ * corresponding functions in webrtc/rtc_base/ssladapter.h.
  */
 RTC_EXTERN BOOL RTCInitializeSSL();
 RTC_EXTERN BOOL RTCCleanupSSL();
diff --git a/webrtc/stats/rtcstats.cc b/webrtc/stats/rtcstats.cc
index 1968dd030e..5d0a937e6f 100644
--- a/webrtc/stats/rtcstats.cc
+++ b/webrtc/stats/rtcstats.cc
@@ -12,7 +12,7 @@
 
 #include <sstream>
 
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/stringencode.h"
 
 namespace webrtc {
 
diff --git a/webrtc/stats/rtcstats_unittest.cc b/webrtc/stats/rtcstats_unittest.cc
index 6fe8dd9046..925a6239b7 100644
--- a/webrtc/stats/rtcstats_unittest.cc
+++ b/webrtc/stats/rtcstats_unittest.cc
@@ -12,8 +12,8 @@
 
 #include <cstring>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
 #include "webrtc/stats/test/rtcteststats.h"
 
 namespace webrtc {
diff --git a/webrtc/stats/rtcstatsreport_unittest.cc b/webrtc/stats/rtcstatsreport_unittest.cc
index 442adbe163..25ac3a2d17 100644
--- a/webrtc/stats/rtcstatsreport_unittest.cc
+++ b/webrtc/stats/rtcstatsreport_unittest.cc
@@ -11,8 +11,8 @@
 #include "webrtc/api/stats/rtcstatsreport.h"
 
 #include "webrtc/api/stats/rtcstats.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
 
 namespace webrtc {
 
diff --git a/webrtc/system_wrappers/include/aligned_array.h b/webrtc/system_wrappers/include/aligned_array.h
index 71fefea72f..7cc1c021e9 100644
--- a/webrtc/system_wrappers/include/aligned_array.h
+++ b/webrtc/system_wrappers/include/aligned_array.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_
 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/aligned_malloc.h"
 
 namespace webrtc {
diff --git a/webrtc/system_wrappers/include/atomic32.h b/webrtc/system_wrappers/include/atomic32.h
index 78e649d8b6..ef3d57649c 100644
--- a/webrtc/system_wrappers/include/atomic32.h
+++ b/webrtc/system_wrappers/include/atomic32.h
@@ -17,8 +17,8 @@
 
 #include <stddef.h>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 
diff --git a/webrtc/system_wrappers/include/file_wrapper.h b/webrtc/system_wrappers/include/file_wrapper.h
index a1d899c783..4fe5899c87 100644
--- a/webrtc/system_wrappers/include/file_wrapper.h
+++ b/webrtc/system_wrappers/include/file_wrapper.h
@@ -14,8 +14,8 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/typedefs.h"
 
 // Implementation of an InStream and OutStream that can read (exclusive) or
diff --git a/webrtc/system_wrappers/include/metrics.h b/webrtc/system_wrappers/include/metrics.h
index ca220210a2..f22cf8f166 100644
--- a/webrtc/system_wrappers/include/metrics.h
+++ b/webrtc/system_wrappers/include/metrics.h
@@ -13,9 +13,9 @@
 
 #include <string>
 
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/checks.h"
 
 // Macros for allowing WebRTC clients (e.g. Chrome) to gather and aggregate
 // statistics.
diff --git a/webrtc/system_wrappers/include/rw_lock_wrapper.h b/webrtc/system_wrappers/include/rw_lock_wrapper.h
index 751b6a1df5..855ecffc71 100644
--- a/webrtc/system_wrappers/include/rw_lock_wrapper.h
+++ b/webrtc/system_wrappers/include/rw_lock_wrapper.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_
 #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_
 
-#include "webrtc/base/thread_annotations.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 
 // Note, Windows pre-Vista version of RW locks are not supported natively. For
 // these OSs regular critical sections have been used to approximate RW lock
diff --git a/webrtc/system_wrappers/include/static_instance.h b/webrtc/system_wrappers/include/static_instance.h
index ad87fe6829..f85a9121c4 100644
--- a/webrtc/system_wrappers/include/static_instance.h
+++ b/webrtc/system_wrappers/include/static_instance.h
@@ -13,7 +13,7 @@
 
 #include <assert.h>
 
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #ifdef _WIN32
 #include "webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h"
 #endif
diff --git a/webrtc/system_wrappers/source/clock.cc b/webrtc/system_wrappers/source/clock.cc
index f65adfcbb1..f4533fb168 100644
--- a/webrtc/system_wrappers/source/clock.cc
+++ b/webrtc/system_wrappers/source/clock.cc
@@ -12,15 +12,15 @@
 
 #if defined(_WIN32)
 // Windows needs to be included before mmsystem.h
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
 #include <MMSystem.h>
 #elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
 #include <sys/time.h>
 #include <time.h>
 #endif
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
 
 namespace webrtc {
diff --git a/webrtc/system_wrappers/source/cpu_info.cc b/webrtc/system_wrappers/source/cpu_info.cc
index 4a61c7a6f3..f151ceaae7 100644
--- a/webrtc/system_wrappers/source/cpu_info.cc
+++ b/webrtc/system_wrappers/source/cpu_info.cc
@@ -23,7 +23,7 @@
 #include <sys/sysctl.h>
 #endif
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace internal {
 static int DetectNumberOfCores() {
diff --git a/webrtc/system_wrappers/source/event.cc b/webrtc/system_wrappers/source/event.cc
index 05f918ffc2..2f08a1ad99 100644
--- a/webrtc/system_wrappers/source/event.cc
+++ b/webrtc/system_wrappers/source/event.cc
@@ -22,7 +22,7 @@
 #include "webrtc/system_wrappers/source/event_timer_posix.h"
 #endif
 
-#include "webrtc/base/event.h"
+#include "webrtc/rtc_base/event.h"
 
 namespace webrtc {
 
diff --git a/webrtc/system_wrappers/source/event_timer_posix.cc b/webrtc/system_wrappers/source/event_timer_posix.cc
index b46b83857f..dead7c9b80 100644
--- a/webrtc/system_wrappers/source/event_timer_posix.cc
+++ b/webrtc/system_wrappers/source/event_timer_posix.cc
@@ -18,7 +18,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/system_wrappers/source/event_timer_posix.h b/webrtc/system_wrappers/source/event_timer_posix.h
index 599eb55ee1..1b01e4b142 100644
--- a/webrtc/system_wrappers/source/event_timer_posix.h
+++ b/webrtc/system_wrappers/source/event_timer_posix.h
@@ -18,7 +18,7 @@
 #include <pthread.h>
 #include <time.h>
 
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/platform_thread.h"
 
 namespace webrtc {
 
diff --git a/webrtc/system_wrappers/source/event_timer_posix_unittest.cc b/webrtc/system_wrappers/source/event_timer_posix_unittest.cc
index f5b3de40b8..5feac80a35 100644
--- a/webrtc/system_wrappers/source/event_timer_posix_unittest.cc
+++ b/webrtc/system_wrappers/source/event_timer_posix_unittest.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/system_wrappers/source/event_timer_posix.h"
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/system_wrappers/source/file_impl.cc b/webrtc/system_wrappers/source/file_impl.cc
index 8e1ba24f8d..f62e7124f7 100644
--- a/webrtc/system_wrappers/source/file_impl.cc
+++ b/webrtc/system_wrappers/source/file_impl.cc
@@ -17,7 +17,7 @@
 #include <string.h>
 #endif
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/system_wrappers/source/logcat_trace_context.cc b/webrtc/system_wrappers/source/logcat_trace_context.cc
index 3771be59d9..7ad1b1dedd 100644
--- a/webrtc/system_wrappers/source/logcat_trace_context.cc
+++ b/webrtc/system_wrappers/source/logcat_trace_context.cc
@@ -13,7 +13,7 @@
 #include <android/log.h>
 #include <assert.h>
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/system_wrappers/source/metrics_default.cc b/webrtc/system_wrappers/source/metrics_default.cc
index 6ca90dafdc..f9a6f6aaf9 100644
--- a/webrtc/system_wrappers/source/metrics_default.cc
+++ b/webrtc/system_wrappers/source/metrics_default.cc
@@ -11,8 +11,8 @@
 
 #include <algorithm>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_annotations.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
 // Default implementation of histogram methods for WebRTC clients that do not
diff --git a/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc b/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc
index baa218d4ae..d65bf98207 100644
--- a/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc
+++ b/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h"
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/webrtc/system_wrappers/source/trace_impl.cc
index 30a8816b75..513327e0aa 100644
--- a/webrtc/system_wrappers/source/trace_impl.cc
+++ b/webrtc/system_wrappers/source/trace_impl.cc
@@ -15,8 +15,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/platform_thread.h"
 #ifdef _WIN32
 #include "webrtc/system_wrappers/source/trace_win.h"
 #else
diff --git a/webrtc/system_wrappers/source/trace_impl.h b/webrtc/system_wrappers/source/trace_impl.h
index 045b3cd5f5..90e4a3af3b 100644
--- a/webrtc/system_wrappers/source/trace_impl.h
+++ b/webrtc/system_wrappers/source/trace_impl.h
@@ -13,11 +13,11 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/platform_thread.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/system_wrappers/include/static_instance.h"
-#include "webrtc/base/platform_thread.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
diff --git a/webrtc/system_wrappers/source/trace_posix.h b/webrtc/system_wrappers/source/trace_posix.h
index 9da71039c9..4387895bc2 100644
--- a/webrtc/system_wrappers/source/trace_posix.h
+++ b/webrtc/system_wrappers/source/trace_posix.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
 #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
 
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/system_wrappers/source/trace_impl.h"
 
 namespace webrtc {
diff --git a/webrtc/test/call_test.cc b/webrtc/test/call_test.cc
index 638e70483a..fc3fc689f2 100644
--- a/webrtc/test/call_test.cc
+++ b/webrtc/test/call_test.cc
@@ -14,9 +14,9 @@
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/config.h"
 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 
diff --git a/webrtc/test/configurable_frame_size_encoder.cc b/webrtc/test/configurable_frame_size_encoder.cc
index 0cb90a67ee..c81833f683 100644
--- a/webrtc/test/configurable_frame_size_encoder.cc
+++ b/webrtc/test/configurable_frame_size_encoder.cc
@@ -12,9 +12,9 @@
 
 #include <string.h>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_video/include/video_frame.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/test/direct_transport.h b/webrtc/test/direct_transport.h
index a865c83150..8a10b5c05a 100644
--- a/webrtc/test/direct_transport.h
+++ b/webrtc/test/direct_transport.h
@@ -15,10 +15,10 @@
 #include <deque>
 
 #include "webrtc/api/call/transport.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/platform_thread.h"
 #include "webrtc/call/call.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/platform_thread.h"
 #include "webrtc/test/fake_network_pipe.h"
 
 namespace webrtc {
diff --git a/webrtc/test/drifting_clock.cc b/webrtc/test/drifting_clock.cc
index b11077641d..c1539fd46f 100644
--- a/webrtc/test/drifting_clock.cc
+++ b/webrtc/test/drifting_clock.cc
@@ -9,7 +9,7 @@
  */
 
 #include "webrtc/test/drifting_clock.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/fake_audio_device.cc b/webrtc/test/fake_audio_device.cc
index 91d5978b3f..97299e1bdb 100644
--- a/webrtc/test/fake_audio_device.cc
+++ b/webrtc/test/fake_audio_device.cc
@@ -13,9 +13,9 @@
 #include <algorithm>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/random.h"
 #include "webrtc/common_audio/wav_file.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/random.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 
 namespace webrtc {
diff --git a/webrtc/test/fake_audio_device.h b/webrtc/test/fake_audio_device.h
index f6017443d7..8b15cd7e3d 100644
--- a/webrtc/test/fake_audio_device.h
+++ b/webrtc/test/fake_audio_device.h
@@ -14,12 +14,12 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/platform_thread.h"
 #include "webrtc/modules/audio_device/include/fake_audio_device.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/platform_thread.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/test/fake_decoder.cc b/webrtc/test/fake_decoder.cc
index 25f80779e2..f2823b5e3a 100644
--- a/webrtc/test/fake_decoder.cc
+++ b/webrtc/test/fake_decoder.cc
@@ -11,7 +11,7 @@
 #include "webrtc/test/fake_decoder.h"
 
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
diff --git a/webrtc/test/fake_encoder.cc b/webrtc/test/fake_encoder.cc
index 922ff56120..7c0870ec47 100644
--- a/webrtc/test/fake_encoder.cc
+++ b/webrtc/test/fake_encoder.cc
@@ -15,9 +15,9 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/gtest.h"
 
diff --git a/webrtc/test/fake_encoder.h b/webrtc/test/fake_encoder.h
index 4487c52e1e..220af90b14 100644
--- a/webrtc/test/fake_encoder.h
+++ b/webrtc/test/fake_encoder.h
@@ -15,10 +15,10 @@
 #include <memory>
 
 #include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/test/fake_network_pipe.cc b/webrtc/test/fake_network_pipe.cc
index a614cc316f..bb9d6b1322 100644
--- a/webrtc/test/fake_network_pipe.cc
+++ b/webrtc/test/fake_network_pipe.cc
@@ -17,9 +17,9 @@
 #include <algorithm>
 #include <cmath>
 
-#include "webrtc/base/logging.h"
 #include "webrtc/call/call.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/test/fake_network_pipe.h b/webrtc/test/fake_network_pipe.h
index f3cd11dcc0..039cc84de8 100644
--- a/webrtc/test/fake_network_pipe.h
+++ b/webrtc/test/fake_network_pipe.h
@@ -17,10 +17,10 @@
 #include <queue>
 #include <set>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/random.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/random.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/test/fake_texture_frame.h b/webrtc/test/fake_texture_frame.h
index bcda06dfc0..ce5963ea53 100644
--- a/webrtc/test/fake_texture_frame.h
+++ b/webrtc/test/fake_texture_frame.h
@@ -12,8 +12,8 @@
 
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/frame_generator.cc b/webrtc/test/frame_generator.cc
index 148488ae42..52ae14fe64 100644
--- a/webrtc/test/frame_generator.cc
+++ b/webrtc/test/frame_generator.cc
@@ -16,11 +16,11 @@
 #include <memory>
 
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/keep_ref_until_done.h"
-#include "webrtc/base/random.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/keep_ref_until_done.h"
+#include "webrtc/rtc_base/random.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/frame_utils.h"
 
diff --git a/webrtc/test/frame_generator.h b/webrtc/test/frame_generator.h
index 95b0798bf6..6b0137df24 100644
--- a/webrtc/test/frame_generator.h
+++ b/webrtc/test/frame_generator.h
@@ -15,8 +15,8 @@
 #include <vector>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/test/frame_generator_capturer.cc b/webrtc/test/frame_generator_capturer.cc
index af54f3171d..73cc5aed72 100644
--- a/webrtc/test/frame_generator_capturer.cc
+++ b/webrtc/test/frame_generator_capturer.cc
@@ -13,11 +13,11 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/frame_generator.h"
 #include "webrtc/video_send_stream.h"
diff --git a/webrtc/test/frame_generator_capturer.h b/webrtc/test/frame_generator_capturer.h
index 36a79f9755..f62afbac2d 100644
--- a/webrtc/test/frame_generator_capturer.h
+++ b/webrtc/test/frame_generator_capturer.h
@@ -14,8 +14,8 @@
 #include <string>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/task_queue.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/task_queue.h"
 #include "webrtc/test/video_capturer.h"
 #include "webrtc/typedefs.h"
 
diff --git a/webrtc/test/frame_utils.h b/webrtc/test/frame_utils.h
index 8600f431e5..4953db4478 100644
--- a/webrtc/test/frame_utils.h
+++ b/webrtc/test/frame_utils.h
@@ -12,7 +12,7 @@
 
 #include <stdint.h>
 
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 class I420Buffer;
diff --git a/webrtc/test/fuzzers/audio_decoder_fuzzer.cc b/webrtc/test/fuzzers/audio_decoder_fuzzer.cc
index adc0fc7427..ff4478dca9 100644
--- a/webrtc/test/fuzzers/audio_decoder_fuzzer.cc
+++ b/webrtc/test/fuzzers/audio_decoder_fuzzer.cc
@@ -13,9 +13,9 @@
 #include <limits>
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/test/fuzzers/audio_processing_fuzzer.cc b/webrtc/test/fuzzers/audio_processing_fuzzer.cc
index 389ab1c1b5..e31c05739a 100644
--- a/webrtc/test/fuzzers/audio_processing_fuzzer.cc
+++ b/webrtc/test/fuzzers/audio_processing_fuzzer.cc
@@ -14,9 +14,9 @@
 #include <array>
 #include <cmath>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc b/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc
index 9878da98b3..f9814ec306 100644
--- a/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc
+++ b/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc
@@ -11,7 +11,7 @@
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/test/fuzzers/audio_processing_fuzzer.h"
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 
diff --git a/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc b/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc
index a498fd0b4c..f253ca976a 100644
--- a/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc
+++ b/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc
@@ -10,10 +10,10 @@
 
 #include <algorithm>
 
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 
diff --git a/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc b/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc
index d38b8a2007..b0da8033f1 100644
--- a/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc
+++ b/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc
@@ -10,11 +10,11 @@
 
 #include <algorithm>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
+#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "webrtc/rtc_base/basictypes.h"
 
 namespace webrtc {
 
diff --git a/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc b/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc
index a5a1cdecc4..1a2bfc4678 100644
--- a/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc
+++ b/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc
@@ -12,12 +12,12 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/array_view.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
 #include "webrtc/modules/audio_coding/neteq/tools/audio_checksum.h"
 #include "webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.h"
 #include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/rtc_base/array_view.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc b/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc
index 5e4165e5d2..ac5331b13e 100644
--- a/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc
+++ b/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc
@@ -11,8 +11,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "webrtc/base/thread.h"
 #include "webrtc/p2p/base/pseudotcp.h"
+#include "webrtc/rtc_base/thread.h"
 
 namespace webrtc {
 class FakeIPseudoTcpNotify : public cricket::IPseudoTcpNotify {
diff --git a/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc b/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc
index ad870afc41..8250c15d86 100644
--- a/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc
+++ b/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc
@@ -15,8 +15,8 @@
 #include <bitset>
 #include <vector>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_processing/residual_echo_detector.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc b/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc
index b8ab9b9e54..9d93f838b6 100644
--- a/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc
+++ b/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc b/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
index cf19573d9a..2e532d1191 100644
--- a/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
+++ b/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
@@ -10,10 +10,10 @@
 
 #include <algorithm>
 
-#include "webrtc/base/array_view.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "webrtc/rtc_base/array_view.h"
 #include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
 
 namespace webrtc {
diff --git a/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc b/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc
index ce9e30acca..01729efddc 100644
--- a/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc
+++ b/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc
@@ -10,10 +10,10 @@
 
 #include <memory>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h"
 #include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc b/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc
index bcfd9c4e81..e69f463203 100644
--- a/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc
+++ b/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc
@@ -10,10 +10,10 @@
 
 #include <algorithm>
 
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
 #include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 
diff --git a/webrtc/test/fuzzers/webrtc_fuzzer_main.cc b/webrtc/test/fuzzers/webrtc_fuzzer_main.cc
index 50a513c094..a5d5ed1db7 100644
--- a/webrtc/test/fuzzers/webrtc_fuzzer_main.cc
+++ b/webrtc/test/fuzzers/webrtc_fuzzer_main.cc
@@ -12,7 +12,7 @@
 // It's intended to set sane defaults, such as removing logging for further
 // fuzzing efficiency.
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace {
 bool g_initialized = false;
diff --git a/webrtc/test/gl/gl_renderer.cc b/webrtc/test/gl/gl_renderer.cc
index 5f52923752..c55f347af2 100644
--- a/webrtc/test/gl/gl_renderer.cc
+++ b/webrtc/test/gl/gl_renderer.cc
@@ -12,8 +12,8 @@
 
 #include <string.h>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/gmock.h b/webrtc/test/gmock.h
index bc12fb91d1..8e321a036b 100644
--- a/webrtc/test/gmock.h
+++ b/webrtc/test/gmock.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_TEST_GMOCK_H_
 #define WEBRTC_TEST_GMOCK_H_
 
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
 
 RTC_PUSH_IGNORING_WUNDEF()
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/webrtc/test/gtest.h b/webrtc/test/gtest.h
index 2d222cc22c..886e7b8b63 100644
--- a/webrtc/test/gtest.h
+++ b/webrtc/test/gtest.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_TEST_GTEST_H_
 #define WEBRTC_TEST_GTEST_H_
 
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
 
 RTC_PUSH_IGNORING_WUNDEF()
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/test/layer_filtering_transport.cc b/webrtc/test/layer_filtering_transport.cc
index 06fc71f3f4..00fe5f9e07 100644
--- a/webrtc/test/layer_filtering_transport.cc
+++ b/webrtc/test/layer_filtering_transport.cc
@@ -10,11 +10,11 @@
 
 #include <memory>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/layer_filtering_transport.h"
 
 namespace webrtc {
diff --git a/webrtc/test/mac/video_renderer_mac.h b/webrtc/test/mac/video_renderer_mac.h
index 702f5ae267..2d5516398d 100644
--- a/webrtc/test/mac/video_renderer_mac.h
+++ b/webrtc/test/mac/video_renderer_mac.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_
 #define WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_
 
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/test/gl/gl_renderer.h"
 
 @class CocoaWindow;
diff --git a/webrtc/test/mock_audio_decoder_factory.h b/webrtc/test/mock_audio_decoder_factory.h
index 24eb44eb67..ae7cc42bce 100644
--- a/webrtc/test/mock_audio_decoder_factory.h
+++ b/webrtc/test/mock_audio_decoder_factory.h
@@ -16,7 +16,7 @@
 
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/test/gmock.h"
 
 namespace webrtc {
diff --git a/webrtc/test/mock_audio_encoder.h b/webrtc/test/mock_audio_encoder.h
index 1c6a5f0e56..90e2b9ded8 100644
--- a/webrtc/test/mock_audio_encoder.h
+++ b/webrtc/test/mock_audio_encoder.h
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "webrtc/api/audio_codecs/audio_encoder.h"
-#include "webrtc/base/array_view.h"
+#include "webrtc/rtc_base/array_view.h"
 #include "webrtc/test/gmock.h"
 
 namespace webrtc {
diff --git a/webrtc/test/mock_audio_encoder_factory.h b/webrtc/test/mock_audio_encoder_factory.h
index 41494a2696..c095197498 100644
--- a/webrtc/test/mock_audio_encoder_factory.h
+++ b/webrtc/test/mock_audio_encoder_factory.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/test/gmock.h"
 
 namespace webrtc {
diff --git a/webrtc/test/rtcp_packet_parser.cc b/webrtc/test/rtcp_packet_parser.cc
index 728cb63f50..ad90ce6072 100644
--- a/webrtc/test/rtcp_packet_parser.cc
+++ b/webrtc/test/rtcp_packet_parser.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/test/rtcp_packet_parser.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/rtcp_packet_parser.h b/webrtc/test/rtcp_packet_parser.h
index 5dc4e841f8..4bc5477c4b 100644
--- a/webrtc/test/rtcp_packet_parser.h
+++ b/webrtc/test/rtcp_packet_parser.h
@@ -12,8 +12,6 @@
 #ifndef WEBRTC_TEST_RTCP_PACKET_PARSER_H_
 #define WEBRTC_TEST_RTCP_PACKET_PARSER_H_
 
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h"
@@ -30,6 +28,8 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/rtp_file_reader.cc b/webrtc/test/rtp_file_reader.cc
index c4fd42dd05..36ad33a608 100644
--- a/webrtc/test/rtp_file_reader.cc
+++ b/webrtc/test/rtp_file_reader.cc
@@ -16,11 +16,11 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/rtp_file_writer.cc b/webrtc/test/rtp_file_writer.cc
index d9e0586468..596c234429 100644
--- a/webrtc/test/rtp_file_writer.cc
+++ b/webrtc/test/rtp_file_writer.cc
@@ -14,8 +14,8 @@
 
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/rtp_rtcp_observer.h b/webrtc/test/rtp_rtcp_observer.h
index bb00782510..54db770729 100644
--- a/webrtc/test/rtp_rtcp_observer.h
+++ b/webrtc/test/rtp_rtcp_observer.h
@@ -14,9 +14,9 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/test/constants.h"
 #include "webrtc/test/direct_transport.h"
diff --git a/webrtc/test/test_main.cc b/webrtc/test/test_main.cc
index ac8261e92a..2d7dbe2225 100644
--- a/webrtc/test/test_main.cc
+++ b/webrtc/test/test_main.cc
@@ -9,7 +9,7 @@
  */
 
 #include "gflags/gflags.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/metrics_default.h"
 #include "webrtc/test/field_trial.h"
 #include "webrtc/test/gmock.h"
diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
index a96b1eaf02..deb9cf0494 100644
--- a/webrtc/test/testsupport/fileutils.cc
+++ b/webrtc/test/testsupport/fileutils.cc
@@ -21,7 +21,7 @@
 #include "Shlwapi.h"
 #include "WinDef.h"
 
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
 #define GET_CURRENT_DIR _getcwd
 #else
 #include <dirent.h>
@@ -42,7 +42,7 @@
 #include <memory>
 #include <utility>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/typedefs.h"  // For architecture defines
 
 namespace webrtc {
diff --git a/webrtc/test/testsupport/fileutils.h b/webrtc/test/testsupport/fileutils.h
index 434287d6d9..570d7b4d20 100644
--- a/webrtc/test/testsupport/fileutils.h
+++ b/webrtc/test/testsupport/fileutils.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/testsupport/fileutils_unittest.cc b/webrtc/test/testsupport/fileutils_unittest.cc
index 560300f640..bdabb8470a 100644
--- a/webrtc/test/testsupport/fileutils_unittest.cc
+++ b/webrtc/test/testsupport/fileutils_unittest.cc
@@ -17,9 +17,9 @@
 #include <list>
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/pathutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/pathutils.h"
 #include "webrtc/test/gtest.h"
 
 #ifdef WIN32
diff --git a/webrtc/test/testsupport/frame_reader.h b/webrtc/test/testsupport/frame_reader.h
index 94dd78bbda..a8fe73f75d 100644
--- a/webrtc/test/testsupport/frame_reader.h
+++ b/webrtc/test/testsupport/frame_reader.h
@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/test/testsupport/isolated_output.cc b/webrtc/test/testsupport/isolated_output.cc
index 26e9f5577d..5324900efc 100644
--- a/webrtc/test/testsupport/isolated_output.cc
+++ b/webrtc/test/testsupport/isolated_output.cc
@@ -13,9 +13,9 @@
 #include <string.h>
 
 #include "gflags/gflags.h"
-#include "webrtc/base/file.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/pathutils.h"
+#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/pathutils.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 DEFINE_string(isolated_out_dir, webrtc::test::OutputPath(),
diff --git a/webrtc/test/testsupport/isolated_output_unittest.cc b/webrtc/test/testsupport/isolated_output_unittest.cc
index 0918554b8b..bb75ebfe14 100644
--- a/webrtc/test/testsupport/isolated_output_unittest.cc
+++ b/webrtc/test/testsupport/isolated_output_unittest.cc
@@ -15,9 +15,9 @@
 #include <string>
 
 #include "gflags/gflags.h"
-#include "webrtc/base/file.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/platform_file.h"
+#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/rtc_base/platform_file.h"
 #include "webrtc/test/gtest.h"
 
 DECLARE_string(isolated_out_dir);
diff --git a/webrtc/test/testsupport/y4m_frame_writer.cc b/webrtc/test/testsupport/y4m_frame_writer.cc
index 28fb4b06db..e33898243f 100644
--- a/webrtc/test/testsupport/y4m_frame_writer.cc
+++ b/webrtc/test/testsupport/y4m_frame_writer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/testsupport/frame_writer.h"
 
 namespace webrtc {
diff --git a/webrtc/test/testsupport/yuv_frame_writer.cc b/webrtc/test/testsupport/yuv_frame_writer.cc
index 3c0076152e..84fba7ef00 100644
--- a/webrtc/test/testsupport/yuv_frame_writer.cc
+++ b/webrtc/test/testsupport/yuv_frame_writer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/testsupport/frame_writer.h"
 
 namespace webrtc {
diff --git a/webrtc/test/vcm_capturer.cc b/webrtc/test/vcm_capturer.cc
index 6418641ad9..85cf0cdf01 100644
--- a/webrtc/test/vcm_capturer.cc
+++ b/webrtc/test/vcm_capturer.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/test/vcm_capturer.h"
 
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/video_capture/video_capture_factory.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/video_send_stream.h"
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/vcm_capturer.h b/webrtc/test/vcm_capturer.h
index 08e8444008..fdb594b10e 100644
--- a/webrtc/test/vcm_capturer.h
+++ b/webrtc/test/vcm_capturer.h
@@ -12,11 +12,11 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_capture/video_capture.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/test/video_capturer.h"
 
 namespace webrtc {
diff --git a/webrtc/test/video_capturer.cc b/webrtc/test/video_capturer.cc
index d0b5c37bec..cb75fa28ce 100644
--- a/webrtc/test/video_capturer.cc
+++ b/webrtc/test/video_capturer.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/test/video_capturer.h"
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/video_capturer.h b/webrtc/test/video_capturer.h
index 667d89c89c..2535370f8e 100644
--- a/webrtc/test/video_capturer.h
+++ b/webrtc/test/video_capturer.h
@@ -16,10 +16,10 @@
 
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/optional.h"
 #include "webrtc/media/base/videoadapter.h"
 #include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace cricket {
 class VideoAdapter;
diff --git a/webrtc/test/win/d3d_renderer.cc b/webrtc/test/win/d3d_renderer.cc
index 01b032583c..e73bad6d5f 100644
--- a/webrtc/test/win/d3d_renderer.cc
+++ b/webrtc/test/win/d3d_renderer.cc
@@ -9,8 +9,8 @@
  */
 #include "webrtc/test/win/d3d_renderer.h"
 
-#include "webrtc/base/checks.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/win/d3d_renderer.h b/webrtc/test/win/d3d_renderer.h
index 575d9c7f5d..c3e9f7d074 100644
--- a/webrtc/test/win/d3d_renderer.h
+++ b/webrtc/test/win/d3d_renderer.h
@@ -14,7 +14,7 @@
 #include <d3d9.h>
 #pragma comment(lib, "d3d9.lib")       // located in DirectX SDK
 
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/test/video_renderer.h"
 #include "webrtc/typedefs.h"
 
diff --git a/webrtc/video/call_stats.cc b/webrtc/video/call_stats.cc
index f772037b0d..9864d4e51b 100644
--- a/webrtc/video/call_stats.cc
+++ b/webrtc/video/call_stats.cc
@@ -12,9 +12,9 @@
 
 #include <algorithm>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
 namespace webrtc {
diff --git a/webrtc/video/call_stats.h b/webrtc/video/call_stats.h
index 9a5967e648..a9b42804aa 100644
--- a/webrtc/video/call_stats.h
+++ b/webrtc/video/call_stats.h
@@ -14,9 +14,9 @@
 #include <list>
 #include <memory>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/include/module.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/video/encoder_rtcp_feedback.cc b/webrtc/video/encoder_rtcp_feedback.cc
index b6f3fc9203..11d46ff5e9 100644
--- a/webrtc/video/encoder_rtcp_feedback.cc
+++ b/webrtc/video/encoder_rtcp_feedback.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/video/encoder_rtcp_feedback.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/video/vie_encoder.h"
 
 static const int kMinKeyFrameRequestIntervalMs = 300;
diff --git a/webrtc/video/encoder_rtcp_feedback.h b/webrtc/video/encoder_rtcp_feedback.h
index 06548d64a9..e7a825c6a4 100644
--- a/webrtc/video/encoder_rtcp_feedback.h
+++ b/webrtc/video/encoder_rtcp_feedback.h
@@ -12,8 +12,8 @@
 
 #include <vector>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/typedefs.h"
 
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 0d7662d50a..2b67c85750 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -16,12 +16,6 @@
 #include <vector>
 
 #include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/file.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/random.h"
-#include "webrtc/base/rate_limiter.h"
 #include "webrtc/call/call.h"
 #include "webrtc/common_video/include/frame_callback.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
@@ -41,6 +35,12 @@
 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"
 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/random.h"
+#include "webrtc/rtc_base/rate_limiter.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/system_wrappers/include/metrics_default.h"
 #include "webrtc/system_wrappers/include/sleep.h"
diff --git a/webrtc/video/overuse_frame_detector.cc b/webrtc/video/overuse_frame_detector.cc
index 9711ddb039..1d8bc0b450 100644
--- a/webrtc/video/overuse_frame_detector.cc
+++ b/webrtc/video/overuse_frame_detector.cc
@@ -20,11 +20,11 @@
 #include <utility>
 
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/numerics/exp_filter.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/common_video/include/frame_callback.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/numerics/exp_filter.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
diff --git a/webrtc/video/overuse_frame_detector.h b/webrtc/video/overuse_frame_detector.h
index 29efa1609d..8bf1a78aed 100644
--- a/webrtc/video/overuse_frame_detector.h
+++ b/webrtc/video/overuse_frame_detector.h
@@ -14,13 +14,13 @@
 #include <list>
 #include <memory>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/numerics/exp_filter.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/numerics/exp_filter.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 
 namespace webrtc {
 
diff --git a/webrtc/video/overuse_frame_detector_unittest.cc b/webrtc/video/overuse_frame_detector_unittest.cc
index ae3b687acc..e52efcbacf 100644
--- a/webrtc/video/overuse_frame_detector_unittest.cc
+++ b/webrtc/video/overuse_frame_detector_unittest.cc
@@ -11,13 +11,13 @@
 #include <memory>
 
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/fakeclock.h"
 #include "webrtc/common_video/include/video_frame.h"
+#include "webrtc/modules/video_coding/utility/quality_scaler.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/fakeclock.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/video/overuse_frame_detector.h"
-#include "webrtc/modules/video_coding/utility/quality_scaler.h"
 
 namespace webrtc {
 
diff --git a/webrtc/video/payload_router.cc b/webrtc/video/payload_router.cc
index e0e95ae056..973cf5cfa8 100644
--- a/webrtc/video/payload_router.cc
+++ b/webrtc/video/payload_router.cc
@@ -10,10 +10,10 @@
 
 #include "webrtc/video/payload_router.h"
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/webrtc/video/payload_router.h b/webrtc/video/payload_router.h
index bcf1d9b977..177bc07f3f 100644
--- a/webrtc/video/payload_router.h
+++ b/webrtc/video/payload_router.h
@@ -14,11 +14,11 @@
 #include <vector>
 
 #include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/config.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 
 namespace webrtc {
diff --git a/webrtc/video/quality_threshold.cc b/webrtc/video/quality_threshold.cc
index c1d3b101eb..370fe6b133 100644
--- a/webrtc/video/quality_threshold.cc
+++ b/webrtc/video/quality_threshold.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/video/quality_threshold.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/video/quality_threshold.h b/webrtc/video/quality_threshold.h
index 95e11d2016..ee13f8b810 100644
--- a/webrtc/video/quality_threshold.h
+++ b/webrtc/video/quality_threshold.h
@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 
diff --git a/webrtc/video/receive_statistics_proxy.cc b/webrtc/video/receive_statistics_proxy.cc
index 61b2ad1398..4c8be1378a 100644
--- a/webrtc/video/receive_statistics_proxy.cc
+++ b/webrtc/video/receive_statistics_proxy.cc
@@ -14,10 +14,10 @@
 #include <cmath>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/trace_event.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/system_wrappers/include/metrics.h"
diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h
index e1d097152e..5e269fedd8 100644
--- a/webrtc/video/receive_statistics_proxy.h
+++ b/webrtc/video/receive_statistics_proxy.h
@@ -14,13 +14,13 @@
 #include <map>
 #include <string>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/rate_statistics.h"
-#include "webrtc/base/ratetracker.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/frame_callback.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/rate_statistics.h"
+#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/video/quality_threshold.h"
 #include "webrtc/video/report_block_stats.h"
 #include "webrtc/video/stats_counter.h"
diff --git a/webrtc/video/replay.cc b/webrtc/video/replay.cc
index 6f4ce678f0..208d70a821 100644
--- a/webrtc/video/replay.cc
+++ b/webrtc/video/replay.cc
@@ -16,11 +16,11 @@
 
 #include "gflags/gflags.h"
 #include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/checks.h"
 #include "webrtc/call/call.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/encoder_settings.h"
diff --git a/webrtc/video/rtp_streams_synchronizer.cc b/webrtc/video/rtp_streams_synchronizer.cc
index 1edb9b8e4f..ad7cf42b68 100644
--- a/webrtc/video/rtp_streams_synchronizer.cc
+++ b/webrtc/video/rtp_streams_synchronizer.cc
@@ -10,12 +10,12 @@
 
 #include "webrtc/video/rtp_streams_synchronizer.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/call/syncable.h"
 #include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/trace_event.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/video/rtp_streams_synchronizer.h b/webrtc/video/rtp_streams_synchronizer.h
index afa15015d4..dfc0ddb115 100644
--- a/webrtc/video/rtp_streams_synchronizer.h
+++ b/webrtc/video/rtp_streams_synchronizer.h
@@ -16,9 +16,9 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/include/module.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/video/stream_synchronization.h"
 
 namespace webrtc {
diff --git a/webrtc/video/rtp_video_stream_receiver.cc b/webrtc/video/rtp_video_stream_receiver.cc
index 6b8ea0f45d..4204670c7e 100644
--- a/webrtc/video/rtp_video_stream_receiver.cc
+++ b/webrtc/video/rtp_video_stream_receiver.cc
@@ -13,9 +13,6 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/common_types.h"
 #include "webrtc/config.h"
 #include "webrtc/media/base/mediaconstants.h"
@@ -34,6 +31,9 @@
 #include "webrtc/modules/video_coding/h264_sps_pps_tracker.h"
 #include "webrtc/modules/video_coding/packet_buffer.h"
 #include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/system_wrappers/include/timestamp_extrapolator.h"
diff --git a/webrtc/video/rtp_video_stream_receiver.h b/webrtc/video/rtp_video_stream_receiver.h
index 924f1be86c..afcc696da1 100644
--- a/webrtc/video/rtp_video_stream_receiver.h
+++ b/webrtc/video/rtp_video_stream_receiver.h
@@ -17,8 +17,6 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
@@ -31,6 +29,8 @@
 #include "webrtc/modules/video_coding/packet_buffer.h"
 #include "webrtc/modules/video_coding/rtp_frame_reference_finder.h"
 #include "webrtc/modules/video_coding/sequence_number_util.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_receive_stream.h"
 
diff --git a/webrtc/video/rtp_video_stream_receiver_unittest.cc b/webrtc/video/rtp_video_stream_receiver_unittest.cc
index 8f42fbdfbd..3e94e53294 100644
--- a/webrtc/video/rtp_video_stream_receiver_unittest.cc
+++ b/webrtc/video/rtp_video_stream_receiver_unittest.cc
@@ -11,17 +11,17 @@
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/gmock.h"
 
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/common_video/h264/h264_common.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/modules/pacing/packet_router.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_coding/frame_object.h"
+#include "webrtc/modules/video_coding/include/video_coding_defines.h"
 #include "webrtc/modules/video_coding/packet.h"
 #include "webrtc/modules/video_coding/rtp_frame_reference_finder.h"
 #include "webrtc/modules/video_coding/timing.h"
-#include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/field_trial_default.h"
 #include "webrtc/test/field_trial.h"
diff --git a/webrtc/video/screenshare_loopback.cc b/webrtc/video/screenshare_loopback.cc
index 4212f35a67..01dee91de5 100644
--- a/webrtc/video/screenshare_loopback.cc
+++ b/webrtc/video/screenshare_loopback.cc
@@ -10,8 +10,8 @@
 
 #include <stdio.h>
 
-#include "webrtc/base/flags.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/flags.h"
+#include "webrtc/rtc_base/stringencode.h"
 #include "webrtc/test/field_trial.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/run_test.h"
diff --git a/webrtc/video/send_delay_stats.cc b/webrtc/video/send_delay_stats.cc
index 1c3fd2a600..b7c6658ad3 100644
--- a/webrtc/video/send_delay_stats.cc
+++ b/webrtc/video/send_delay_stats.cc
@@ -12,7 +12,7 @@
 
 #include <utility>
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
 namespace webrtc {
diff --git a/webrtc/video/send_delay_stats.h b/webrtc/video/send_delay_stats.h
index 8cac12343d..658cf2b176 100644
--- a/webrtc/video/send_delay_stats.h
+++ b/webrtc/video/send_delay_stats.h
@@ -15,10 +15,10 @@
 #include <memory>
 #include <set>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/video/stats_counter.h"
 #include "webrtc/video_send_stream.h"
diff --git a/webrtc/video/send_statistics_proxy.cc b/webrtc/video/send_statistics_proxy.cc
index cea9ce73d4..898bedcfa5 100644
--- a/webrtc/video/send_statistics_proxy.cc
+++ b/webrtc/video/send_statistics_proxy.cc
@@ -15,11 +15,11 @@
 #include <map>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/trace_event.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
 namespace webrtc {
diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h
index 763a7a8f87..5017598f0a 100644
--- a/webrtc/video/send_statistics_proxy.h
+++ b/webrtc/video/send_statistics_proxy.h
@@ -16,13 +16,13 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/numerics/exp_filter.h"
-#include "webrtc/base/ratetracker.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/numerics/exp_filter.h"
+#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/video/overuse_frame_detector.h"
 #include "webrtc/video/report_block_stats.h"
diff --git a/webrtc/video/stats_counter.cc b/webrtc/video/stats_counter.cc
index da7a70690b..adc0129c7c 100644
--- a/webrtc/video/stats_counter.cc
+++ b/webrtc/video/stats_counter.cc
@@ -14,7 +14,7 @@
 #include <limits>
 #include <map>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/webrtc/video/stats_counter.h b/webrtc/video/stats_counter.h
index 4fa676cfdf..4beb5bf56a 100644
--- a/webrtc/video/stats_counter.h
+++ b/webrtc/video/stats_counter.h
@@ -14,7 +14,7 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/video/stream_synchronization.cc b/webrtc/video/stream_synchronization.cc
index 32a2d722f5..fc9ab32aa2 100644
--- a/webrtc/video/stream_synchronization.cc
+++ b/webrtc/video/stream_synchronization.cc
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/webrtc/video/transport_adapter.cc b/webrtc/video/transport_adapter.cc
index 6f4e028a7a..4f4dd98f3d 100644
--- a/webrtc/video/transport_adapter.cc
+++ b/webrtc/video/transport_adapter.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/video/transport_adapter.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace internal {
diff --git a/webrtc/video/video_loopback.cc b/webrtc/video/video_loopback.cc
index dc8de56ade..aa11005d47 100644
--- a/webrtc/video/video_loopback.cc
+++ b/webrtc/video/video_loopback.cc
@@ -10,7 +10,7 @@
 
 #include <stdio.h>
 
-#include "webrtc/base/flags.h"
+#include "webrtc/rtc_base/flags.h"
 #include "webrtc/test/field_trial.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/run_test.h"
diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc
index 5e99b50ff0..d5446039e6 100644
--- a/webrtc/video/video_quality_test.cc
+++ b/webrtc/video/video_quality_test.cc
@@ -18,14 +18,6 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/cpu_time.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/memory_usage.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/platform_file.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/call/call.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
@@ -38,6 +30,14 @@
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h"
 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/cpu_time.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/memory_usage.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/platform_file.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/cpu_info.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/test/gtest.h"
diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc
index acc497b616..a8deb54c1c 100644
--- a/webrtc/video/video_receive_stream.cc
+++ b/webrtc/video/video_receive_stream.cc
@@ -16,11 +16,6 @@
 #include <string>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/call/rtp_stream_receiver_controller_interface.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/h264/profile_level_id.h"
@@ -33,6 +28,11 @@
 #include "webrtc/modules/video_coding/jitter_estimator.h"
 #include "webrtc/modules/video_coding/timing.h"
 #include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/trace_event.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/video/call_stats.h"
diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h
index a32573de97..e6ae9476b5 100644
--- a/webrtc/video/video_receive_stream.h
+++ b/webrtc/video/video_receive_stream.h
@@ -14,7 +14,6 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
 #include "webrtc/call/syncable.h"
 #include "webrtc/common_video/include/incoming_video_stream.h"
@@ -22,6 +21,7 @@
 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
 #include "webrtc/modules/video_coding/frame_buffer2.h"
 #include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/video/receive_statistics_proxy.h"
 #include "webrtc/video/rtp_streams_synchronizer.h"
diff --git a/webrtc/video/video_receive_stream_unittest.cc b/webrtc/video/video_receive_stream_unittest.cc
index a1b644e666..bce4fd3d7b 100644
--- a/webrtc/video/video_receive_stream_unittest.cc
+++ b/webrtc/video/video_receive_stream_unittest.cc
@@ -14,17 +14,17 @@
 #include "webrtc/test/gmock.h"
 
 #include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
 #include "webrtc/call/rtp_stream_receiver_controller.h"
 #include "webrtc/media/base/fakevideorenderer.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "webrtc/modules/utility/include/process_thread.h"
-#include "webrtc/video/call_stats.h"
-#include "webrtc/video/video_receive_stream.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/field_trial.h"
+#include "webrtc/video/call_stats.h"
+#include "webrtc/video/video_receive_stream.h"
 
 namespace webrtc {
 namespace {
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index f4c82f49c1..9dac54eaab 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -16,12 +16,6 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/file.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/trace_event.h"
-#include "webrtc/base/weak_ptr.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/video_bitrate_allocator.h"
@@ -33,6 +27,12 @@
 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/trace_event.h"
+#include "webrtc/rtc_base/weak_ptr.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/video/call_stats.h"
 #include "webrtc/video/payload_router.h"
diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h
index dcdc71c2d4..2f1fec0357 100644
--- a/webrtc/video/video_send_stream.h
+++ b/webrtc/video/video_send_stream.h
@@ -16,11 +16,11 @@
 #include <vector>
 
 #include "webrtc/call/bitrate_allocator.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/task_queue.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_coding/protection_bitrate_calculator.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/task_queue.h"
 #include "webrtc/video/encoder_rtcp_feedback.h"
 #include "webrtc/video/send_delay_stats.h"
 #include "webrtc/video/send_statistics_proxy.h"
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 37a0249e37..d2844f317b 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -11,14 +11,6 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/rate_limiter.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/call/call.h"
 #include "webrtc/common_video/include/frame_callback.h"
 #include "webrtc/common_video/include/video_frame.h"
@@ -28,17 +20,25 @@
 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.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/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/rate_limiter.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/call_test.h"
 #include "webrtc/test/configurable_frame_size_encoder.h"
 #include "webrtc/test/fake_texture_frame.h"
+#include "webrtc/test/field_trial.h"
 #include "webrtc/test/frame_generator.h"
 #include "webrtc/test/frame_utils.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/null_transport.h"
 #include "webrtc/test/rtcp_packet_parser.h"
 #include "webrtc/test/testsupport/perf_test.h"
-#include "webrtc/test/field_trial.h"
 
 #include "webrtc/video/send_statistics_proxy.h"
 #include "webrtc/video/transport_adapter.h"
diff --git a/webrtc/video/video_stream_decoder.cc b/webrtc/video/video_stream_decoder.cc
index a7688ce13c..742ffd8485 100644
--- a/webrtc/video/video_stream_decoder.cc
+++ b/webrtc/video/video_stream_decoder.cc
@@ -14,10 +14,10 @@
 #include <map>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/common_video/include/frame_callback.h"
 #include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/video/call_stats.h"
 #include "webrtc/video/payload_router.h"
diff --git a/webrtc/video/video_stream_decoder.h b/webrtc/video/video_stream_decoder.h
index b670b12659..3e1a4d8939 100644
--- a/webrtc/video/video_stream_decoder.h
+++ b/webrtc/video/video_stream_decoder.h
@@ -16,12 +16,12 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
index 4522300c9c..c49b76b5fa 100644
--- a/webrtc/video/vie_encoder.cc
+++ b/webrtc/video/vie_encoder.cc
@@ -16,12 +16,6 @@
 #include <utility>
 
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/trace_event.h"
 #include "webrtc/common_video/include/video_bitrate_allocator.h"
 #include "webrtc/common_video/include/video_frame.h"
 #include "webrtc/modules/pacing/paced_sender.h"
@@ -29,6 +23,12 @@
 #include "webrtc/modules/video_coding/include/video_codec_initializer.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/trace_event.h"
 #include "webrtc/video/overuse_frame_detector.h"
 #include "webrtc/video/send_statistics_proxy.h"
 
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
index 91c6ca4f01..6e9234f383 100644
--- a/webrtc/video/vie_encoder.h
+++ b/webrtc/video/vie_encoder.h
@@ -18,10 +18,6 @@
 
 #include "webrtc/api/video/video_rotation.h"
 #include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
 #include "webrtc/call/call.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/video_bitrate_allocator.h"
@@ -29,6 +25,10 @@
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
 #include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video/overuse_frame_detector.h"
diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc
index 3a9e95e465..09ac4c95ea 100644
--- a/webrtc/video/vie_encoder_unittest.cc
+++ b/webrtc/video/vie_encoder_unittest.cc
@@ -13,11 +13,11 @@
 #include <utility>
 
 #include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/media/base/videoadapter.h"
 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
 #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/metrics_default.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/encoder_settings.h"
diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h
index b3a98c617a..a53d869513 100644
--- a/webrtc/video_receive_stream.h
+++ b/webrtc/video_receive_stream.h
@@ -17,11 +17,11 @@
 #include <vector>
 
 #include "webrtc/api/call/transport.h"
-#include "webrtc/base/platform_file.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/frame_callback.h"
 #include "webrtc/config.h"
 #include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/rtc_base/platform_file.h"
 
 namespace webrtc {
 
diff --git a/webrtc/video_send_stream.h b/webrtc/video_send_stream.h
index 266112e587..c5a1f9b647 100644
--- a/webrtc/video_send_stream.h
+++ b/webrtc/video_send_stream.h
@@ -18,12 +18,12 @@
 #include <utility>
 
 #include "webrtc/api/call/transport.h"
-#include "webrtc/base/platform_file.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/frame_callback.h"
 #include "webrtc/config.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/platform_file.h"
 
 namespace webrtc {
 
diff --git a/webrtc/voice_engine/audio_level.h b/webrtc/voice_engine/audio_level.h
index 50409501e7..3bcb0d9b45 100644
--- a/webrtc/voice_engine/audio_level.h
+++ b/webrtc/voice_engine/audio_level.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_AUDIO_LEVEL_H_
 #define WEBRTC_VOICE_ENGINE_AUDIO_LEVEL_H_
 
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 16122709c3..45b6db065b 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -14,16 +14,6 @@
 #include <utility>
 
 #include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/rate_limiter.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timeutils.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
 #include "webrtc/config.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
@@ -38,6 +28,16 @@
 #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
 #include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/rate_limiter.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index 101de4060b..492083e0a8 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -16,10 +16,6 @@
 #include "webrtc/api/audio/audio_mixer.h"
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
@@ -31,6 +27,10 @@
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/voice_engine/audio_level.h"
 #include "webrtc/voice_engine/file_player.h"
 #include "webrtc/voice_engine/file_recorder.h"
diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc
index 58aef6f7ee..ff7a802a46 100644
--- a/webrtc/voice_engine/channel_manager.cc
+++ b/webrtc/voice_engine/channel_manager.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/voice_engine/channel_manager.h"
 
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/voice_engine/channel.h"
 
 namespace webrtc {
diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h
index 65cf9942d1..11a44cffca 100644
--- a/webrtc/voice_engine/channel_manager.h
+++ b/webrtc/voice_engine/channel_manager.h
@@ -14,10 +14,10 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/random.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/random.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/voice_engine/include/voe_base.h"
diff --git a/webrtc/voice_engine/channel_proxy.cc b/webrtc/voice_engine/channel_proxy.cc
index 4a0b3cc4b1..4c6dd383ec 100644
--- a/webrtc/voice_engine/channel_proxy.cc
+++ b/webrtc/voice_engine/channel_proxy.cc
@@ -13,10 +13,10 @@
 #include <utility>
 
 #include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_minmax.h"
 #include "webrtc/call/rtp_transport_controller_send_interface.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_minmax.h"
 #include "webrtc/voice_engine/channel.h"
 
 namespace webrtc {
diff --git a/webrtc/voice_engine/channel_proxy.h b/webrtc/voice_engine/channel_proxy.h
index f5417f254a..eb4bd701a9 100644
--- a/webrtc/voice_engine/channel_proxy.h
+++ b/webrtc/voice_engine/channel_proxy.h
@@ -14,10 +14,10 @@
 #include "webrtc/api/audio/audio_mixer.h"
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/race_checker.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/call/rtp_packet_sink_interface.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/race_checker.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/voice_engine/channel_manager.h"
 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
 
diff --git a/webrtc/voice_engine/file_player.cc b/webrtc/voice_engine/file_player.cc
index d2eadaeba4..6d9aaae6b8 100644
--- a/webrtc/voice_engine/file_player.cc
+++ b/webrtc/voice_engine/file_player.cc
@@ -10,11 +10,11 @@
 
 #include "webrtc/voice_engine/file_player.h"
 
-#include "webrtc/base/logging.h"
 #include "webrtc/common_audio/resampler/include/resampler.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/media_file/media_file.h"
 #include "webrtc/modules/media_file/media_file_defines.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/voice_engine/coder.h"
 
diff --git a/webrtc/voice_engine/file_player_unittests.cc b/webrtc/voice_engine/file_player_unittests.cc
index d41f4044b4..38ee987c12 100644
--- a/webrtc/voice_engine/file_player_unittests.cc
+++ b/webrtc/voice_engine/file_player_unittests.cc
@@ -18,8 +18,8 @@
 #include <string>
 
 #include "gflags/gflags.h"
-#include "webrtc/base/md5digest.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/md5digest.h"
+#include "webrtc/rtc_base/stringencode.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
diff --git a/webrtc/voice_engine/file_recorder.cc b/webrtc/voice_engine/file_recorder.cc
index eed3c0799a..1d35be9be4 100644
--- a/webrtc/voice_engine/file_recorder.cc
+++ b/webrtc/voice_engine/file_recorder.cc
@@ -13,13 +13,13 @@
 #include <list>
 
 #include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/platform_thread.h"
 #include "webrtc/common_audio/resampler/include/resampler.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/media_file/media_file.h"
 #include "webrtc/modules/media_file/media_file_defines.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/platform_thread.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/voice_engine/coder.h"
diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h
index 05fe4550c4..b32d8df211 100644
--- a/webrtc/voice_engine/include/voe_base.h
+++ b/webrtc/voice_engine/include/voe_base.h
@@ -35,9 +35,9 @@
 #define WEBRTC_VOICE_ENGINE_VOE_BASE_H
 
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 
diff --git a/webrtc/voice_engine/output_mixer.cc b/webrtc/voice_engine/output_mixer.cc
index 170689afa1..c497cc1e16 100644
--- a/webrtc/voice_engine/output_mixer.cc
+++ b/webrtc/voice_engine/output_mixer.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/voice_engine/output_mixer.h"
 
-#include "webrtc/base/format_macros.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/format_macros.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/statistics.h"
diff --git a/webrtc/voice_engine/output_mixer.h b/webrtc/voice_engine/output_mixer.h
index 79c5e097ea..fe0cb308f1 100644
--- a/webrtc/voice_engine/output_mixer.h
+++ b/webrtc/voice_engine/output_mixer.h
@@ -13,11 +13,11 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"
 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/voice_engine/file_recorder.h"
 
 namespace webrtc {
diff --git a/webrtc/voice_engine/shared_data.h b/webrtc/voice_engine/shared_data.h
index 951a85189d..971d7d7139 100644
--- a/webrtc/voice_engine/shared_data.h
+++ b/webrtc/voice_engine/shared_data.h
@@ -13,14 +13,14 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/voice_engine/channel_manager.h"
 #include "webrtc/voice_engine/statistics.h"
 #include "webrtc/voice_engine/voice_engine_defines.h"
diff --git a/webrtc/voice_engine/statistics.h b/webrtc/voice_engine/statistics.h
index 785fe14ed7..e0aa248ad6 100644
--- a/webrtc/voice_engine/statistics.h
+++ b/webrtc/voice_engine/statistics.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_VOICE_ENGINE_STATISTICS_H
 #define WEBRTC_VOICE_ENGINE_STATISTICS_H
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 #include "webrtc/voice_engine/voice_engine_defines.h"
diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
index f7510c7972..305b236b6d 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
+++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
@@ -12,8 +12,8 @@
 
 #include <string>
 
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/voice_engine/channel_proxy.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
index 19fb15f619..22711bd5fb 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
+++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
@@ -16,11 +16,11 @@
 #include <memory>
 #include <utility>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/platform_thread.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/platform_thread.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/voice_engine/include/voe_base.h"
diff --git a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc
index 4ee73860bf..ec1d66734a 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc
+++ b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h"
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace voetest {
diff --git a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h
index 525e8eef1a..dd5a426fe1 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h
+++ b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h
@@ -12,8 +12,8 @@
 #define WEBRTC_VOICE_ENGINE_TEST_AUTO_TEST_FAKES_LOUDEST_FILTER_H_
 
 #include <map>
-#include "webrtc/base/timeutils.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/timeutils.h"
 
 namespace webrtc {
 namespace voetest {
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
index 66086695d2..1404fa5b23 100644
--- a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
+++ b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
@@ -14,10 +14,10 @@
 #include <deque>
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/platform_thread.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/platform_thread.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/sleep.h"
diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
index 0cb999029c..9af0eeca0b 100644
--- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
@@ -10,7 +10,7 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc
index ffffb486be..9e466afdaa 100644
--- a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc
+++ b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc
@@ -10,8 +10,8 @@
 
 #include <queue>
 
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc
index 6796f8457c..ab0b6c782a 100644
--- a/webrtc/voice_engine/transmit_mixer.cc
+++ b/webrtc/voice_engine/transmit_mixer.cc
@@ -13,9 +13,9 @@
 #include <memory>
 
 #include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/channel.h"
diff --git a/webrtc/voice_engine/transmit_mixer.h b/webrtc/voice_engine/transmit_mixer.h
index a045cf8322..47f67f9040 100644
--- a/webrtc/voice_engine/transmit_mixer.h
+++ b/webrtc/voice_engine/transmit_mixer.h
@@ -13,11 +13,11 @@
 
 #include <memory>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_processing/typing_detection.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/voice_engine/audio_level.h"
 #include "webrtc/voice_engine/file_player.h"
 #include "webrtc/voice_engine/file_recorder.h"
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc
index 07af861944..86ca61eed7 100644
--- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc
+++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc
@@ -13,10 +13,10 @@
 #include <limits>
 #include <utility>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/mod_ops.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/mod_ops.h"
 
 namespace {
 constexpr uint16_t kSeqNumHalf = 0x8000u;
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h
index ea82f74ca5..987ba25832 100644
--- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h
+++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h
@@ -13,8 +13,8 @@
 
 #include <map>
 
-#include "webrtc/base/optional.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc b/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
index f019203667..b3fa25bf4f 100644
--- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
+++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
@@ -13,9 +13,9 @@
 #include <numeric>
 #include <vector>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
diff --git a/webrtc/voice_engine/utility.cc b/webrtc/voice_engine/utility.cc
index f877c43b15..4b4397a3bf 100644
--- a/webrtc/voice_engine/utility.cc
+++ b/webrtc/voice_engine/utility.cc
@@ -11,12 +11,12 @@
 #include "webrtc/voice_engine/utility.h"
 
 #include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/voice_engine/voice_engine_defines.h"
 
 namespace webrtc {
diff --git a/webrtc/voice_engine/utility_unittest.cc b/webrtc/voice_engine/utility_unittest.cc
index 992cb71ec7..fc4f399d66 100644
--- a/webrtc/voice_engine/utility_unittest.cc
+++ b/webrtc/voice_engine/utility_unittest.cc
@@ -10,13 +10,13 @@
 
 #include <math.h>
 
-#include "webrtc/base/format_macros.h"
 #include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/format_macros.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/voice_engine/utility.h"
 #include "webrtc/voice_engine/voice_engine_defines.h"
-#include "webrtc/base/arraysize.h"
 
 namespace webrtc {
 namespace voe {
diff --git a/webrtc/voice_engine/voe_base_impl.cc b/webrtc/voice_engine/voe_base_impl.cc
index 196c6a555f..9b82ec9592 100644
--- a/webrtc/voice_engine/voe_base_impl.cc
+++ b/webrtc/voice_engine/voe_base_impl.cc
@@ -11,13 +11,13 @@
 #include "webrtc/voice_engine/voe_base_impl.h"
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_device/audio_device_impl.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/voice_engine/channel.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
diff --git a/webrtc/voice_engine/voe_base_impl.h b/webrtc/voice_engine/voe_base_impl.h
index 6d7a086926..0324abdb53 100644
--- a/webrtc/voice_engine/voe_base_impl.h
+++ b/webrtc/voice_engine/voe_base_impl.h
@@ -13,8 +13,8 @@
 
 #include "webrtc/voice_engine/include/voe_base.h"
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
 #include "webrtc/voice_engine/shared_data.h"
 
 namespace webrtc {
diff --git a/webrtc/voice_engine/voe_codec_impl.cc b/webrtc/voice_engine/voe_codec_impl.cc
index 2022024536..cdd2403e8c 100644
--- a/webrtc/voice_engine/voe_codec_impl.cc
+++ b/webrtc/voice_engine/voe_codec_impl.cc
@@ -10,8 +10,8 @@
 
 #include "webrtc/voice_engine/voe_codec_impl.h"
 
-#include "webrtc/base/format_macros.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
+#include "webrtc/rtc_base/format_macros.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/channel.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
diff --git a/webrtc/voice_engine/voe_network_impl.cc b/webrtc/voice_engine/voe_network_impl.cc
index 4dc1a5f9ab..26ad417668 100644
--- a/webrtc/voice_engine/voe_network_impl.cc
+++ b/webrtc/voice_engine/voe_network_impl.cc
@@ -10,9 +10,9 @@
 
 #include "webrtc/voice_engine/voe_network_impl.h"
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/voice_engine/channel.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc
index ab2dc65e5b..d2d0fdd8f4 100644
--- a/webrtc/voice_engine/voice_engine_impl.cc
+++ b/webrtc/voice_engine/voice_engine_impl.cc
@@ -14,8 +14,8 @@
 #include "webrtc/modules/audio_device/android/audio_track_jni.h"
 #endif
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/channel_proxy.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"