diff --git a/webrtc/test/libtest/helpers/bit_flip_encryption.cc b/webrtc/test/libtest/helpers/bit_flip_encryption.cc
index e6c415206b..cd058ba585 100644
--- a/webrtc/test/libtest/helpers/bit_flip_encryption.cc
+++ b/webrtc/test/libtest/helpers/bit_flip_encryption.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/libtest/include/bit_flip_encryption.h"
+#include "webrtc/test/libtest/include/bit_flip_encryption.h"
 
 #include <cstdlib>
 
diff --git a/webrtc/test/libtest/helpers/random_encryption.cc b/webrtc/test/libtest/helpers/random_encryption.cc
index 4798d130d5..befcb01d4c 100644
--- a/webrtc/test/libtest/helpers/random_encryption.cc
+++ b/webrtc/test/libtest/helpers/random_encryption.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/libtest/include/random_encryption.h"
+#include "webrtc/test/libtest/include/random_encryption.h"
 
 #include <algorithm>
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
 
-#include "video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_defines.h"
 
 static int Saturate(int value, int min, int max) {
   return std::min(std::max(value, min), max);
diff --git a/webrtc/test/libtest/include/bit_flip_encryption.h b/webrtc/test/libtest/include/bit_flip_encryption.h
index 7e14c8898a..9b53368de9 100644
--- a/webrtc/test/libtest/include/bit_flip_encryption.h
+++ b/webrtc/test/libtest/include/bit_flip_encryption.h
@@ -11,7 +11,7 @@
 #ifndef SRC_VIDEO_ENGINE_TEST_AUTO_TEST_HELPERS_BIT_FLIP_ENCRYPTION_H_
 #define SRC_VIDEO_ENGINE_TEST_AUTO_TEST_HELPERS_BIT_FLIP_ENCRYPTION_H_
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 // This encryption scheme will randomly flip bits every now and then in the
 // input data.
diff --git a/webrtc/test/libtest/include/random_encryption.h b/webrtc/test/libtest/include/random_encryption.h
index beaae6cd0d..41bd6a0659 100644
--- a/webrtc/test/libtest/include/random_encryption.h
+++ b/webrtc/test/libtest/include/random_encryption.h
@@ -11,7 +11,7 @@
 #ifndef SRC_VIDEO_ENGINE_TEST_AUTO_TEST_HELPERS_RANDOM_ENCRYPTION_H_
 #define SRC_VIDEO_ENGINE_TEST_AUTO_TEST_HELPERS_RANDOM_ENCRYPTION_H_
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 // These algorithms attempt to create an uncrackable encryption
 // scheme by completely disregarding the input data.
diff --git a/webrtc/test/run_all_unittests.cc b/webrtc/test/run_all_unittests.cc
index 0cdf0cd030..486df5ea8c 100644
--- a/webrtc/test/run_all_unittests.cc
+++ b/webrtc/test/run_all_unittests.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/test_suite.h"
+#include "webrtc/test/test_suite.h"
 
 int main(int argc, char** argv) {
   webrtc::test::TestSuite test_suite(argc, argv);
diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
index 399d8a623f..61e4bcf7bc 100644
--- a/webrtc/test/testsupport/fileutils.cc
+++ b/webrtc/test/testsupport/fileutils.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 #ifdef WIN32
 #include <direct.h>
@@ -26,7 +26,7 @@
 #include <cstdio>
 #include <cstring>
 
-#include "typedefs.h"  // For architecture defines
+#include "webrtc/typedefs.h"  // For architecture defines
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/testsupport/fileutils_unittest.cc b/webrtc/test/testsupport/fileutils_unittest.cc
index 54a308e32c..1eb8aa0e5d 100644
--- a/webrtc/test/testsupport/fileutils_unittest.cc
+++ b/webrtc/test/testsupport/fileutils_unittest.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 #include <cstdio>
 #include <list>
 #include <string>
 
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 #ifdef WIN32
 #define chdir _chdir
diff --git a/webrtc/test/testsupport/frame_reader.cc b/webrtc/test/testsupport/frame_reader.cc
index 273312230a..1742d83419 100644
--- a/webrtc/test/testsupport/frame_reader.cc
+++ b/webrtc/test/testsupport/frame_reader.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testsupport/frame_reader.h"
+#include "webrtc/test/testsupport/frame_reader.h"
 
 #include <cassert>
 
diff --git a/webrtc/test/testsupport/frame_reader_unittest.cc b/webrtc/test/testsupport/frame_reader_unittest.cc
index dbc1bc51a9..ea837a74b4 100644
--- a/webrtc/test/testsupport/frame_reader_unittest.cc
+++ b/webrtc/test/testsupport/frame_reader_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testsupport/frame_reader.h"
+#include "webrtc/test/testsupport/frame_reader.h"
 
-#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/testsupport/frame_writer_unittest.cc b/webrtc/test/testsupport/frame_writer_unittest.cc
index 109ae7d7c0..0978dffd6a 100644
--- a/webrtc/test/testsupport/frame_writer_unittest.cc
+++ b/webrtc/test/testsupport/frame_writer_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testsupport/frame_writer.h"
+#include "webrtc/test/testsupport/frame_writer.h"
 
-#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/testsupport/mac/run_threaded_main_mac.mm b/webrtc/test/testsupport/mac/run_threaded_main_mac.mm
index b0c07edc87..4a908fbf2d 100644
--- a/webrtc/test/testsupport/mac/run_threaded_main_mac.mm
+++ b/webrtc/test/testsupport/mac/run_threaded_main_mac.mm
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import "run_threaded_main_mac.h"
+#import "webrtc/test/testsupport/mac/run_threaded_main_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/webrtc/test/testsupport/metrics/video_metrics.cc b/webrtc/test/testsupport/metrics/video_metrics.cc
index edf898cbca..e9cf57ccd0 100644
--- a/webrtc/test/testsupport/metrics/video_metrics.cc
+++ b/webrtc/test/testsupport/metrics/video_metrics.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testsupport/metrics/video_metrics.h"
+#include "webrtc/test/testsupport/metrics/video_metrics.h"
 
 #include <algorithm>  // min_element, max_element
 #include <cassert>
 #include <cstdio>
 
-#include "common_video/interface/i420_video_frame.h"
-#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc
index e77dbff8c9..7e3a4e68c8 100644
--- a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc
+++ b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testsupport/metrics/video_metrics.h"
+#include "webrtc/test/testsupport/metrics/video_metrics.h"
 
-#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 
diff --git a/webrtc/test/testsupport/mock/mock_frame_reader.h b/webrtc/test/testsupport/mock/mock_frame_reader.h
index 4ac5f4c9d1..f06750ef4a 100644
--- a/webrtc/test/testsupport/mock/mock_frame_reader.h
+++ b/webrtc/test/testsupport/mock/mock_frame_reader.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
 #define WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
 
-#include "testsupport/frame_reader.h"
+#include "webrtc/test/testsupport/frame_reader.h"
 
-#include "gmock/gmock.h"
+#include "testing/gmock/include/gmock/gmock.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/testsupport/mock/mock_frame_writer.h b/webrtc/test/testsupport/mock/mock_frame_writer.h
index 7ac5b49504..10f58fb47b 100644
--- a/webrtc/test/testsupport/mock/mock_frame_writer.h
+++ b/webrtc/test/testsupport/mock/mock_frame_writer.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_
 #define WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_
 
-#include "testsupport/frame_writer.h"
+#include "webrtc/test/testsupport/frame_writer.h"
 
-#include "gmock/gmock.h"
+#include "testing/gmock/include/gmock/gmock.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/testsupport/packet_reader.cc b/webrtc/test/testsupport/packet_reader.cc
index 619a7abd92..eaafc80f7d 100644
--- a/webrtc/test/testsupport/packet_reader.cc
+++ b/webrtc/test/testsupport/packet_reader.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testsupport/packet_reader.h"
+#include "webrtc/test/testsupport/packet_reader.h"
 
 #include <cassert>
 #include <cstdio>
diff --git a/webrtc/test/testsupport/packet_reader_unittest.cc b/webrtc/test/testsupport/packet_reader_unittest.cc
index 1f3b20ac38..83cde6957d 100644
--- a/webrtc/test/testsupport/packet_reader_unittest.cc
+++ b/webrtc/test/testsupport/packet_reader_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testsupport/packet_reader.h"
+#include "webrtc/test/testsupport/packet_reader.h"
 
-#include "gtest/gtest.h"
-#include "testsupport/unittest_utils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/unittest_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/test/testsupport/perf_test.cc b/webrtc/test/testsupport/perf_test.cc
index 12d2bbb735..3266bb7945 100644
--- a/webrtc/test/testsupport/perf_test.cc
+++ b/webrtc/test/testsupport/perf_test.cc
@@ -14,8 +14,8 @@
 
 #include "webrtc/test/testsupport/perf_test.h"
 
-#include <stdio.h>
 #include <sstream>
+#include <stdio.h>
 
 namespace {
 
diff --git a/webrtc/test/testsupport/perf_test_unittest.cc b/webrtc/test/testsupport/perf_test_unittest.cc
index 0e3d09d792..f7e50e1bc6 100644
--- a/webrtc/test/testsupport/perf_test_unittest.cc
+++ b/webrtc/test/testsupport/perf_test_unittest.cc
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace webrtc {
 namespace test {