diff --git a/webrtc/tools/converter/converter.cc b/webrtc/tools/converter/converter.cc
index 3b5f27b3c9..ca3ba9ace6 100644
--- a/webrtc/tools/converter/converter.cc
+++ b/webrtc/tools/converter/converter.cc
@@ -14,7 +14,7 @@
 #include <iomanip>
 #include <sstream>
 
-#include "tools/converter/converter.h"
+#include "webrtc/tools/converter/converter.h"
 
 #ifdef WIN32
 #define SEPARATOR '\\'
@@ -170,5 +170,3 @@ std::string Converter::FormFrameName(int width, int number) {
 
 }  // namespace test
 }  // namespace webrtc
-
-
diff --git a/webrtc/tools/converter/converter.h b/webrtc/tools/converter/converter.h
index 1d8afd171d..ce21c95db9 100644
--- a/webrtc/tools/converter/converter.h
+++ b/webrtc/tools/converter/converter.h
@@ -13,8 +13,8 @@
 
 #include <string>
 
-#include "libyuv/convert.h"
-#include "libyuv/compare.h"
+#include "third_party/libyuv/include/libyuv/compare.h"
+#include "third_party/libyuv/include/libyuv/convert.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/tools/converter/rgba_to_i420_converter.cc b/webrtc/tools/converter/rgba_to_i420_converter.cc
index ee15f80a33..4e53f943a2 100644
--- a/webrtc/tools/converter/rgba_to_i420_converter.cc
+++ b/webrtc/tools/converter/rgba_to_i420_converter.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "tools/converter/converter.h"
-#include "tools/simple_command_line_parser.h"
+#include "webrtc/tools/converter/converter.h"
+#include "webrtc/tools/simple_command_line_parser.h"
 
 /*
  * A command-line tool based on libyuv to convert a set of RGBA files to a YUV
@@ -86,4 +86,3 @@ int main(int argc, char** argv) {
     return -1;
   }
 }
-
diff --git a/webrtc/tools/frame_analyzer/frame_analyzer.cc b/webrtc/tools/frame_analyzer/frame_analyzer.cc
index 2e9154c05d..6b46cfd858 100644
--- a/webrtc/tools/frame_analyzer/frame_analyzer.cc
+++ b/webrtc/tools/frame_analyzer/frame_analyzer.cc
@@ -10,12 +10,12 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
-#include "tools/frame_analyzer/video_quality_analysis.h"
-#include "tools/simple_command_line_parser.h"
+#include "webrtc/tools/frame_analyzer/video_quality_analysis.h"
+#include "webrtc/tools/simple_command_line_parser.h"
 
 /*
  * A command line tool running PSNR and SSIM on a reference video and a test
diff --git a/webrtc/tools/frame_analyzer/video_quality_analysis.cc b/webrtc/tools/frame_analyzer/video_quality_analysis.cc
index c38ad84cdf..d685634056 100644
--- a/webrtc/tools/frame_analyzer/video_quality_analysis.cc
+++ b/webrtc/tools/frame_analyzer/video_quality_analysis.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "tools/frame_analyzer/video_quality_analysis.h"
+#include "webrtc/tools/frame_analyzer/video_quality_analysis.h"
 
 #include <cassert>
 #include <cstdio>
diff --git a/webrtc/tools/frame_analyzer/video_quality_analysis.h b/webrtc/tools/frame_analyzer/video_quality_analysis.h
index a385b77832..354fe2f141 100644
--- a/webrtc/tools/frame_analyzer/video_quality_analysis.h
+++ b/webrtc/tools/frame_analyzer/video_quality_analysis.h
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "libyuv/convert.h"
-#include "libyuv/compare.h"
+#include "third_party/libyuv/include/libyuv/compare.h"
+#include "third_party/libyuv/include/libyuv/convert.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/tools/frame_editing/frame_editing.cc b/webrtc/tools/frame_editing/frame_editing.cc
index 20454f6d74..fa234ef8e2 100644
--- a/webrtc/tools/frame_editing/frame_editing.cc
+++ b/webrtc/tools/frame_editing/frame_editing.cc
@@ -106,4 +106,3 @@ int main(int argc, char** argv) {
   return webrtc::EditFrames(in_path, width, height, first_frame_to_cut,
                             interval, last_frame_to_cut, out_path);
 }
-
diff --git a/webrtc/tools/frame_editing/frame_editing_unittest.cc b/webrtc/tools/frame_editing/frame_editing_unittest.cc
index 98569f0e78..d333fd41b8 100644
--- a/webrtc/tools/frame_editing/frame_editing_unittest.cc
+++ b/webrtc/tools/frame_editing/frame_editing_unittest.cc
@@ -13,7 +13,7 @@
 #include <cstdlib>
 #include <fstream>
 
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/testsupport/fileutils.h"
@@ -211,4 +211,3 @@ TEST_F(FrameEditingTest, RepeatFrames) {
 }
 }  // namespace test
 }  // namespace webrtc
-
diff --git a/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc b/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc
index 00fdf63566..8f63dae39c 100644
--- a/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc
+++ b/webrtc/tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "tools/frame_analyzer/video_quality_analysis.h"
-#include "tools/simple_command_line_parser.h"
+#include "webrtc/tools/frame_analyzer/video_quality_analysis.h"
+#include "webrtc/tools/simple_command_line_parser.h"
 
 void CompareFiles(const char* reference_file_name, const char* test_file_name,
                   const char* results_file_name, int width, int height) {
diff --git a/webrtc/tools/simple_command_line_parser.h b/webrtc/tools/simple_command_line_parser.h
index 3ccfb0c064..f791fe9623 100644
--- a/webrtc/tools/simple_command_line_parser.h
+++ b/webrtc/tools/simple_command_line_parser.h
@@ -11,12 +11,12 @@
 #ifndef WEBRTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_
 #define WEBRTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
-#include "system_wrappers/interface/constructor_magic.h"
-#include "test/testsupport/gtest_prod_util.h"
+#include "webrtc/system_wrappers/interface/constructor_magic.h"
+#include "webrtc/test/testsupport/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/tools/simple_command_line_parser_unittest.cc b/webrtc/tools/simple_command_line_parser_unittest.cc
index dbf6239318..f016b17d99 100644
--- a/webrtc/tools/simple_command_line_parser_unittest.cc
+++ b/webrtc/tools/simple_command_line_parser_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/tools/simple_command_line_parser.h"
 
 namespace webrtc {
@@ -84,4 +84,3 @@ TEST_F(CommandLineParserTest, GetCommandLineFlagValue) {
 
 }  // namespace test
 }  // namespace webrtc
-