diff --git a/webrtc/video_engine/test/common/gl/gl_renderer.h b/webrtc/video_engine/test/common/gl/gl_renderer.h
index cd8ea44118..033f1cb1d8 100644
--- a/webrtc/video_engine/test/common/gl/gl_renderer.h
+++ b/webrtc/video_engine/test/common/gl/gl_renderer.h
@@ -17,8 +17,8 @@
 #include <GL/gl.h>
 #endif
 
-#include "webrtc/video_engine/test/common/video_renderer.h"
 #include "webrtc/typedefs.h"
+#include "webrtc/video_engine/test/common/video_renderer.h"
 
 
 namespace webrtc {
diff --git a/webrtc/video_engine/test/common/linux/glx_renderer.h b/webrtc/video_engine/test/common/linux/glx_renderer.h
index eb126545a2..5a2f562a61 100644
--- a/webrtc/video_engine/test/common/linux/glx_renderer.h
+++ b/webrtc/video_engine/test/common/linux/glx_renderer.h
@@ -14,8 +14,8 @@
 #include <GL/glx.h>
 #include <X11/Xlib.h>
 
-#include "webrtc/video_engine/test/common/gl/gl_renderer.h"
 #include "webrtc/typedefs.h"
+#include "webrtc/video_engine/test/common/gl/gl_renderer.h"
 
 namespace webrtc {
 namespace test {
diff --git a/webrtc/video_engine/test/common/null_platform_renderer.cc b/webrtc/video_engine/test/common/null_platform_renderer.cc
index db8c654dc7..a79ee1d793 100644
--- a/webrtc/video_engine/test/common/null_platform_renderer.cc
+++ b/webrtc/video_engine/test/common/null_platform_renderer.cc
@@ -20,4 +20,3 @@ VideoRenderer* VideoRenderer::CreatePlatformRenderer(const char* window_title,
 }
 }  // test
 }  // webrtc
-
diff --git a/webrtc/video_engine/test/common/video_capturer.cc b/webrtc/video_engine/test/common/video_capturer.cc
index 010b4c5060..30988c2007 100644
--- a/webrtc/video_engine/test/common/video_capturer.cc
+++ b/webrtc/video_engine/test/common/video_capturer.cc
@@ -10,7 +10,7 @@
 
 #include "webrtc/video_engine/test/common/video_capturer.h"
 
-#include "test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/video_engine/test/common/file_capturer.h"
 #include "webrtc/video_engine/test/common/frame_generator.h"
 #include "webrtc/video_engine/test/common/frame_generator_capturer.h"
diff --git a/webrtc/video_engine/test/full_stack.cc b/webrtc/video_engine/test/full_stack.cc
index b2a37ce951..b19d20ab04 100644
--- a/webrtc/video_engine/test/full_stack.cc
+++ b/webrtc/video_engine/test/full_stack.cc
@@ -12,8 +12,8 @@
 #include <deque>
 #include <map>
 
-#include "testing/gtest/include/gtest/gtest.h"
 #include "gflags/gflags.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"