diff --git a/media/base/aes_encryptor_unittest.cc b/media/base/aes_encryptor_unittest.cc
index e3b4ac43a2..11f31337f9 100644
--- a/media/base/aes_encryptor_unittest.cc
+++ b/media/base/aes_encryptor_unittest.cc
@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/aes_encryptor.h"
+#include <gtest/gtest.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/base/aes_encryptor.h"
 
 namespace {
 
diff --git a/media/base/audio_timestamp_helper_unittest.cc b/media/base/audio_timestamp_helper_unittest.cc
index ed40c84777..3e3ed44444 100644
--- a/media/base/audio_timestamp_helper_unittest.cc
+++ b/media/base/audio_timestamp_helper_unittest.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <gtest/gtest.h>
+
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/timestamp.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
diff --git a/media/base/bit_reader_unittest.cc b/media/base/bit_reader_unittest.cc
index 3dca9c632d..ec20b7d4a3 100644
--- a/media/base/bit_reader_unittest.cc
+++ b/media/base/bit_reader_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/bit_reader.h"
+#include <gtest/gtest.h>
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/base/bit_reader.h"
 
 namespace media {
 
diff --git a/media/base/closure_thread_unittest.cc b/media/base/closure_thread_unittest.cc
index 73622418cb..7334a13601 100644
--- a/media/base/closure_thread_unittest.cc
+++ b/media/base/closure_thread_unittest.cc
@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/closure_thread.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/base/closure_thread.h"
 
 using ::testing::DoAll;
 using ::testing::Invoke;
diff --git a/media/base/container_names_unittest.cc b/media/base/container_names_unittest.cc
index dadd523634..d27ea9bfbf 100644
--- a/media/base/container_names_unittest.cc
+++ b/media/base/container_names_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/container_names.h"
+#include <gtest/gtest.h>
 
 #include "base/file_util.h"
+#include "media/base/container_names.h"
 #include "media/test/test_data_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
diff --git a/media/base/muxer_util_unittest.cc b/media/base/muxer_util_unittest.cc
index 0b8a98c955..94c15218ae 100644
--- a/media/base/muxer_util_unittest.cc
+++ b/media/base/muxer_util_unittest.cc
@@ -4,9 +4,9 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/muxer_util.h"
+#include <gtest/gtest.h>
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/base/muxer_util.h"
 
 namespace media {
 
diff --git a/media/base/offset_byte_queue_unittest.cc b/media/base/offset_byte_queue_unittest.cc
index 3ba42be86a..52329953bf 100644
--- a/media/base/offset_byte_queue_unittest.cc
+++ b/media/base/offset_byte_queue_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <gtest/gtest.h>
 #include <string.h>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/offset_byte_queue.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
diff --git a/media/base/producer_consumer_queue_unittest.cc b/media/base/producer_consumer_queue_unittest.cc
index c31ebdc97f..800f47fcdf 100644
--- a/media/base/producer_consumer_queue_unittest.cc
+++ b/media/base/producer_consumer_queue_unittest.cc
@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/producer_consumer_queue.h"
+#include <gtest/gtest.h>
 
 #include "base/bind.h"
 #include "base/synchronization/waitable_event.h"
 #include "media/base/closure_thread.h"
+#include "media/base/producer_consumer_queue.h"
 #include "media/base/status_test_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 const size_t kCapacity = 10u;
diff --git a/media/base/rsa_key_unittest.cc b/media/base/rsa_key_unittest.cc
index 6cb07d1d37..ea1a47d895 100644
--- a/media/base/rsa_key_unittest.cc
+++ b/media/base/rsa_key_unittest.cc
@@ -6,12 +6,12 @@
 //
 // Unit test for rsa_key RSA encryption and signing.
 
-#include "media/base/rsa_key.h"
+#include <gtest/gtest.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/fake_prng.h"
+#include "media/base/rsa_key.h"
 #include "media/base/rsa_test_data.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
diff --git a/media/base/status_test_util.h b/media/base/status_test_util.h
index 909db27520..0b649e9f57 100644
--- a/media/base/status_test_util.h
+++ b/media/base/status_test_util.h
@@ -7,8 +7,9 @@
 #ifndef MEDIA_BASE_STATUS_TEST_UTIL_H_
 #define MEDIA_BASE_STATUS_TEST_UTIL_H_
 
+#include <gtest/gtest.h>
+
 #include "media/base/status.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 #define EXPECT_OK(val) EXPECT_EQ(media::Status::OK, (val))
 #define ASSERT_OK(val) ASSERT_EQ(media::Status::OK, (val))
diff --git a/media/base/status_test_util_unittest.cc b/media/base/status_test_util_unittest.cc
index f319af24f9..c2e827a21a 100644
--- a/media/base/status_test_util_unittest.cc
+++ b/media/base/status_test_util_unittest.cc
@@ -4,9 +4,9 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/status_test_util.h"
+#include <gtest/gtest-spi.h>
 
-#include "testing/gtest/include/gtest/gtest-spi.h"
+#include "media/base/status_test_util.h"
 
 TEST(StatusTestUtil, ExpectOkSuccess) {
   EXPECT_OK(media::Status::OK);
diff --git a/media/base/status_unittest.cc b/media/base/status_unittest.cc
index b22e3fea28..f486cc5744 100644
--- a/media/base/status_unittest.cc
+++ b/media/base/status_unittest.cc
@@ -4,11 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/status.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include "base/strings/string_number_conversions.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/base/status.h"
 
 namespace media {
 
diff --git a/media/base/widevine_encryption_key_source_unittest.cc b/media/base/widevine_encryption_key_source_unittest.cc
index ebb695ab2f..0435b997d2 100644
--- a/media/base/widevine_encryption_key_source_unittest.cc
+++ b/media/base/widevine_encryption_key_source_unittest.cc
@@ -4,7 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/base/widevine_encryption_key_source.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 
 #include "base/base64.h"
 #include "base/strings/string_number_conversions.h"
@@ -12,8 +13,7 @@
 #include "media/base/http_fetcher.h"
 #include "media/base/request_signer.h"
 #include "media/base/status_test_util.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/base/widevine_encryption_key_source.h"
 
 namespace {
 const char kServerUrl[] = "http://www.foo.com/getcontentkey";
diff --git a/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/media/event/vod_media_info_dump_muxer_listener_unittest.cc
index 6842f67144..8321e6bb6e 100644
--- a/media/event/vod_media_info_dump_muxer_listener_unittest.cc
+++ b/media/event/vod_media_info_dump_muxer_listener_unittest.cc
@@ -4,6 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <gtest/gtest.h>
+
 #include <vector>
 
 #include "base/file_util.h"
@@ -14,7 +16,6 @@
 #include "media/base/muxer_options.h"
 #include "media/base/video_stream_info.h"
 #include "mpd/base/media_info.pb.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/protobuf/src/google/protobuf/text_format.h"
 
 using dash_packager::MediaInfo;
diff --git a/media/file/file_unittest.cc b/media/file/file_unittest.cc
index e17d907b00..a9cc79f9a9 100644
--- a/media/file/file_unittest.cc
+++ b/media/file/file_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/file/file.h"
+#include <gtest/gtest.h>
 
 #include "base/file_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/file/file.h"
 
 namespace {
 const int kDataSize = 1024;
diff --git a/media/filters/h264_bit_reader_unittest.cc b/media/filters/h264_bit_reader_unittest.cc
index e12e75ebcd..c758659798 100644
--- a/media/filters/h264_bit_reader_unittest.cc
+++ b/media/filters/h264_bit_reader_unittest.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <gtest/gtest.h>
+
 #include "media/filters/h264_bit_reader.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
diff --git a/media/filters/h264_byte_to_unit_stream_converter_unittest.cc b/media/filters/h264_byte_to_unit_stream_converter_unittest.cc
index e62d976db4..63caa67709 100644
--- a/media/filters/h264_byte_to_unit_stream_converter_unittest.cc
+++ b/media/filters/h264_byte_to_unit_stream_converter_unittest.cc
@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <gtest/gtest.h>
+#include <stdio.h>
+
 #include "base/strings/string_number_conversions.h"
 #include "media/filters/h264_byte_to_unit_stream_converter.h"
 #include "media/test/test_data_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#include <stdio.h>
 
 namespace {
 const char kExpectedConfigRecord[] =
diff --git a/media/filters/h264_parser_unittest.cc b/media/filters/h264_parser_unittest.cc
index 57a9501bd1..d72aff9509 100644
--- a/media/filters/h264_parser_unittest.cc
+++ b/media/filters/h264_parser_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <gtest/gtest.h>
+
 #include "base/command_line.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/logging.h"
@@ -9,7 +11,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "media/test/test_data_util.h"
 #include "media/filters/h264_parser.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
diff --git a/media/formats/mp2t/adts_header_unittest.cc b/media/formats/mp2t/adts_header_unittest.cc
index c3c81bd63a..452438bf16 100644
--- a/media/formats/mp2t/adts_header_unittest.cc
+++ b/media/formats/mp2t/adts_header_unittest.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <gtest/gtest.h>
+
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/formats/mp2t/adts_header.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
diff --git a/media/formats/mp2t/es_parser_h264_unittest.cc b/media/formats/mp2t/es_parser_h264_unittest.cc
index ced13709b4..69c91165ef 100644
--- a/media/formats/mp2t/es_parser_h264_unittest.cc
+++ b/media/formats/mp2t/es_parser_h264_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <vector>
 
@@ -15,7 +17,6 @@
 #include "media/filters/h264_parser.h"
 #include "media/formats/mp2t/es_parser_h264.h"
 #include "media/test/test_data_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 class VideoStreamInfo;
diff --git a/media/formats/mp2t/mp2t_media_parser_unittest.cc b/media/formats/mp2t/mp2t_media_parser_unittest.cc
index 34726cc869..fe57a4807b 100644
--- a/media/formats/mp2t/mp2t_media_parser_unittest.cc
+++ b/media/formats/mp2t/mp2t_media_parser_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <string>
 
@@ -16,7 +18,6 @@
 #include "media/formats/mp2t/mp2t_common.h"
 #include "media/formats/mp2t/mp2t_media_parser.h"
 #include "media/test/test_data_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace mp2t {
diff --git a/media/formats/mp4/aac_audio_specific_config_unittest.cc b/media/formats/mp4/aac_audio_specific_config_unittest.cc
index bf0155df11..af79256748 100644
--- a/media/formats/mp4/aac_audio_specific_config_unittest.cc
+++ b/media/formats/mp4/aac_audio_specific_config_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/formats/mp4/aac_audio_specific_config.h"
+#include <gtest/gtest.h>
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/formats/mp4/aac_audio_specific_config.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/formats/mp4/box_definitions_unittest.cc b/media/formats/mp4/box_definitions_unittest.cc
index e569466221..7590aa93d8 100644
--- a/media/formats/mp4/box_definitions_unittest.cc
+++ b/media/formats/mp4/box_definitions_unittest.cc
@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/formats/mp4/box_definitions.h"
+#include <gtest/gtest.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffer_writer.h"
+#include "media/formats/mp4/box_definitions.h"
 #include "media/formats/mp4/box_definitions_comparison.h"
 #include "media/formats/mp4/box_reader.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 const uint8 kData16Bytes[] = {8, 7, 6, 5, 4, 3, 2, 1, 1, 2, 3, 4, 5, 6, 7, 8};
diff --git a/media/formats/mp4/box_reader_unittest.cc b/media/formats/mp4/box_reader_unittest.cc
index f35d2eedcb..8040b0e7db 100644
--- a/media/formats/mp4/box_reader_unittest.cc
+++ b/media/formats/mp4/box_reader_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <gtest/gtest.h>
 #include <string.h>
 
 #include "base/basictypes.h"
@@ -9,7 +10,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/formats/mp4/box_buffer.h"
 #include "media/formats/mp4/rcheck.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/formats/mp4/chunk_info_iterator_unittest.cc b/media/formats/mp4/chunk_info_iterator_unittest.cc
index 823c7c157a..3a681a5d9c 100644
--- a/media/formats/mp4/chunk_info_iterator_unittest.cc
+++ b/media/formats/mp4/chunk_info_iterator_unittest.cc
@@ -4,11 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/formats/mp4/chunk_info_iterator.h"
+#include <gtest/gtest.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/formats/mp4/chunk_info_iterator.h"
 
 namespace {
 struct ChunkProperty {
diff --git a/media/formats/mp4/composition_offset_iterator_unittest.cc b/media/formats/mp4/composition_offset_iterator_unittest.cc
index ecf071e3bf..a684dc7c52 100644
--- a/media/formats/mp4/composition_offset_iterator_unittest.cc
+++ b/media/formats/mp4/composition_offset_iterator_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/formats/mp4/composition_offset_iterator.h"
+#include <gtest/gtest.h>
 
 #include "base/memory/scoped_ptr.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/formats/mp4/composition_offset_iterator.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/formats/mp4/decoding_time_iterator_unittest.cc b/media/formats/mp4/decoding_time_iterator_unittest.cc
index 838039bef1..62fb3a9695 100644
--- a/media/formats/mp4/decoding_time_iterator_unittest.cc
+++ b/media/formats/mp4/decoding_time_iterator_unittest.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/formats/mp4/decoding_time_iterator.h"
+#include <gtest/gtest.h>
 
 #include "base/memory/scoped_ptr.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/formats/mp4/decoding_time_iterator.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/formats/mp4/es_descriptor_unittest.cc b/media/formats/mp4/es_descriptor_unittest.cc
index 2e1d707f3d..24ce42eac0 100644
--- a/media/formats/mp4/es_descriptor_unittest.cc
+++ b/media/formats/mp4/es_descriptor_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/formats/mp4/es_descriptor.h"
+#include <gtest/gtest.h>
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/formats/mp4/es_descriptor.h"
 
 namespace media {
 
diff --git a/media/formats/mp4/mp4_media_parser_unittest.cc b/media/formats/mp4/mp4_media_parser_unittest.cc
index b8b42aa5c7..c67588b475 100644
--- a/media/formats/mp4/mp4_media_parser_unittest.cc
+++ b/media/formats/mp4/mp4_media_parser_unittest.cc
@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/formats/mp4/mp4_media_parser.h"
+#include <gtest/gtest.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "media/base/media_sample.h"
+#include "media/formats/mp4/mp4_media_parser.h"
 #include "media/test/test_data_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/formats/mp4/sync_sample_iterator_unittest.cc b/media/formats/mp4/sync_sample_iterator_unittest.cc
index 5ebab60544..a3efae4034 100644
--- a/media/formats/mp4/sync_sample_iterator_unittest.cc
+++ b/media/formats/mp4/sync_sample_iterator_unittest.cc
@@ -4,9 +4,9 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/formats/mp4/sync_sample_iterator.h"
+#include <gtest/gtest.h>
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "media/formats/mp4/sync_sample_iterator.h"
 
 namespace {
 const uint32 kNumSamples = 100;
diff --git a/media/formats/mp4/track_run_iterator_unittest.cc b/media/formats/mp4/track_run_iterator_unittest.cc
index 1b0aeba8f2..8fd879d7e7 100644
--- a/media/formats/mp4/track_run_iterator_unittest.cc
+++ b/media/formats/mp4/track_run_iterator_unittest.cc
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <gtest/gtest.h>
+
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/formats/mp4/box_definitions.h"
 #include "media/formats/mp4/rcheck.h"
 #include "media/formats/mp4/track_run_iterator.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 // The sum of the elements in a vector initialized with SumAscending,
 // less the value of the last element.
diff --git a/media/test/packager_test.cc b/media/test/packager_test.cc
index 8ba3a77e37..691596bf44 100644
--- a/media/test/packager_test.cc
+++ b/media/test/packager_test.cc
@@ -4,6 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <gtest/gtest.h>
+
 #include "base/file_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ -16,7 +18,6 @@
 #include "media/base/stream_info.h"
 #include "media/formats/mp4/mp4_muxer.h"
 #include "media/test/test_data_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::ValuesIn;
 
diff --git a/media/test/run_tests_with_atexit_manager.cc b/media/test/run_tests_with_atexit_manager.cc
index 000792ef7e..4917828394 100644
--- a/media/test/run_tests_with_atexit_manager.cc
+++ b/media/test/run_tests_with_atexit_manager.cc
@@ -4,10 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <gtest/gtest.h>
+
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
diff --git a/mpd/base/bandwidth_estimator_test.cc b/mpd/base/bandwidth_estimator_test.cc
index aea809ebfe..7fd9c651ff 100644
--- a/mpd/base/bandwidth_estimator_test.cc
+++ b/mpd/base/bandwidth_estimator_test.cc
@@ -4,10 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <gtest/gtest.h>
+
 #include <cmath>
 
 #include "mpd/base/bandwidth_estimator.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace dash_packager {
 
diff --git a/mpd/base/mpd_builder_unittest.cc b/mpd/base/mpd_builder_unittest.cc
index 35f0654622..f8e6d0d981 100644
--- a/mpd/base/mpd_builder_unittest.cc
+++ b/mpd/base/mpd_builder_unittest.cc
@@ -4,6 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <gtest/gtest.h>
 #include <inttypes.h>
 
 #include "base/file_util.h"
@@ -16,7 +17,6 @@
 #include "mpd/base/mpd_utils.h"
 #include "mpd/test/mpd_builder_test_helper.h"
 #include "mpd/test/xml_compare.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libxml/src/include/libxml/xmlstring.h"
 
 namespace dash_packager {
diff --git a/mpd/base/xml/xml_node_unittest.cc b/mpd/base/xml/xml_node_unittest.cc
index 575db7a5c4..f5aae7964f 100644
--- a/mpd/base/xml/xml_node_unittest.cc
+++ b/mpd/base/xml/xml_node_unittest.cc
@@ -3,6 +3,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
+
+#include <gtest/gtest.h>
+
 #include <list>
 
 #include "base/logging.h"
@@ -10,7 +13,6 @@
 #include "mpd/base/mpd_builder.h"
 #include "mpd/base/xml/xml_node.h"
 #include "mpd/test/xml_compare.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libxml/src/include/libxml/tree.h"
 
 namespace dash_packager {
diff --git a/mpd/test/mpd_builder_test_helper.cc b/mpd/test/mpd_builder_test_helper.cc
index dc6e9c8070..9d1b487450 100644
--- a/mpd/test/mpd_builder_test_helper.cc
+++ b/mpd/test/mpd_builder_test_helper.cc
@@ -6,13 +6,14 @@
 
 #include "mpd/test/mpd_builder_test_helper.h"
 
+#include <gtest/gtest.h>
+
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "mpd/base/media_info.pb.h"
 #include "mpd/base/mpd_builder.h"
 #include "mpd/base/xml/scoped_xml_ptr.h"
 #include "mpd/test/xml_compare.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/protobuf/src/google/protobuf/text_format.h"
 
 namespace dash_packager {
diff --git a/mpd/util/mpd_writer_unittest.cc b/mpd/util/mpd_writer_unittest.cc
index 8bff7e5d03..25eb3a26a1 100644
--- a/mpd/util/mpd_writer_unittest.cc
+++ b/mpd/util/mpd_writer_unittest.cc
@@ -4,11 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <gtest/gtest.h>
+
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "mpd/test/mpd_builder_test_helper.h"
 #include "mpd/util/mpd_writer.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 namespace dash_packager {