diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 9f9ec1e1d0..3e73e302bd 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -124,8 +124,9 @@
   },
   'target_defaults': {
     'include_dirs': [
-      # TODO(andrew): we should be able to just use <(webrtc_root) here.
-      '..','../..',
+      # TODO(andrew): Remove '..' when we've added webrtc/ to include paths.
+      '..',
+      '../..',
     ],
     'defines': [
       # TODO(leozwang): Run this as a gclient hook rather than at build-time:
diff --git a/webrtc/modules/video_capture/main/test/video_capture_unittest.cc b/webrtc/modules/video_capture/main/test/video_capture_unittest.cc
index 62a0069e27..9da7bb28a2 100644
--- a/webrtc/modules/video_capture/main/test/video_capture_unittest.cc
+++ b/webrtc/modules/video_capture/main/test/video_capture_unittest.cc
@@ -10,17 +10,15 @@
 
 #include <stdio.h>
 
-
-
+#include "gtest/gtest.h"
+#include "modules/utility/interface/process_thread.h"
+#include "modules/video_capture/main/interface/video_capture.h"
+#include "modules/video_capture/main/interface/video_capture_factory.h"
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/scoped_ptr.h"
 #include "system_wrappers/interface/scoped_refptr.h"
 #include "system_wrappers/interface/sleep.h"
 #include "system_wrappers/interface/tick_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "modules/utility/interface/process_thread.h"
-#include "modules/video_capture/main/interface/video_capture.h"
-#include "modules/video_capture/main/interface/video_capture_factory.h"
 
 using webrtc::CriticalSectionWrapper;
 using webrtc::CriticalSectionScoped;