diff --git a/webrtc/modules/video_capture/android/device_info_android.cc b/webrtc/modules/video_capture/android/device_info_android.cc
index e2e6f8a06e..b221fd93cc 100644
--- a/webrtc/modules/video_capture/android/device_info_android.cc
+++ b/webrtc/modules/video_capture/android/device_info_android.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "device_info_android.h"
+#include "webrtc/modules/video_capture/android/device_info_android.h"
 
 #include <stdio.h>
 
-#include "ref_count.h"
-#include "trace.h"
-#include "video_capture_android.h"
+#include "webrtc/modules/video_capture/android/video_capture_android.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/android/device_info_android.h b/webrtc/modules/video_capture/android/device_info_android.h
index bfebd9cba8..6d985c380e 100644
--- a/webrtc/modules/video_capture/android/device_info_android.h
+++ b/webrtc/modules/video_capture/android/device_info_android.h
@@ -12,8 +12,9 @@
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_DEVICE_INFO_ANDROID_H_
 
 #include <jni.h>
-#include "../video_capture_impl.h"
-#include "../device_info_impl.h"
+
+#include "webrtc/modules/video_capture/device_info_impl.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/android/video_capture_android.cc b/webrtc/modules/video_capture/android/video_capture_android.cc
index b8ee514631..a66ce5c326 100644
--- a/webrtc/modules/video_capture/android/video_capture_android.cc
+++ b/webrtc/modules/video_capture/android/video_capture_android.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video_capture_android.h"
+#include "webrtc/modules/video_capture/android/video_capture_android.h"
 
 #include <stdio.h>
 
-#include "critical_section_wrapper.h"
-#include "ref_count.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/android/video_capture_android.h b/webrtc/modules/video_capture/android/video_capture_android.h
index 2a87eb25ec..31cf76d64d 100644
--- a/webrtc/modules/video_capture/android/video_capture_android.h
+++ b/webrtc/modules/video_capture/android/video_capture_android.h
@@ -12,8 +12,9 @@
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_ANDROID_VIDEO_CAPTURE_ANDROID_H_
 
 #include <jni.h>
-#include "device_info_android.h"
-#include "../video_capture_impl.h"
+
+#include "webrtc/modules/video_capture/android/device_info_android.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
 
 #define AndroidJavaCaptureClass "org/webrtc/videoengine/VideoCaptureAndroid"
 
diff --git a/webrtc/modules/video_capture/device_info_impl.cc b/webrtc/modules/video_capture/device_info_impl.cc
index 7f4913f2f8..c360cf3593 100644
--- a/webrtc/modules/video_capture/device_info_impl.cc
+++ b/webrtc/modules/video_capture/device_info_impl.cc
@@ -8,11 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "device_info_impl.h"
-#include "video_capture_config.h"
-#include "trace.h"
 #include <stdlib.h>
 
+#include "webrtc/modules/video_capture/device_info_impl.h"
+#include "webrtc/modules/video_capture/video_capture_config.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+
 #ifndef abs
 #define abs(a) (a>=0?a:-a)
 #endif
@@ -396,5 +397,3 @@ int32_t DeviceInfoImpl::GetOrientation(const char* deviceUniqueIdUTF8,
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc
-
-
diff --git a/webrtc/modules/video_capture/device_info_impl.h b/webrtc/modules/video_capture/device_info_impl.h
index b8772db409..79cf527355 100644
--- a/webrtc/modules/video_capture/device_info_impl.h
+++ b/webrtc/modules/video_capture/device_info_impl.h
@@ -11,11 +11,10 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_DEVICE_INFO_IMPL_H_
 
-#include "video_capture.h"
-
-#include "map_wrapper.h"
-#include "rw_lock_wrapper.h"
-#include "video_capture_delay.h"
+#include "webrtc/modules/video_capture/include/video_capture.h"
+#include "webrtc/modules/video_capture/video_capture_delay.h"
+#include "webrtc/system_wrappers/interface/map_wrapper.h"
+#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/external/device_info_external.cc b/webrtc/modules/video_capture/external/device_info_external.cc
index 64dfa16076..c9977bc343 100644
--- a/webrtc/modules/video_capture/external/device_info_external.cc
+++ b/webrtc/modules/video_capture/external/device_info_external.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "../device_info_impl.h"
-#include "../video_capture_impl.h"
+#include "webrtc/modules/video_capture/android/device_info_impl.h"
+#include "webrtc/modules/video_capture/android/video_capture_impl.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/video_capture/external/video_capture_external.cc b/webrtc/modules/video_capture/external/video_capture_external.cc
index 5ec2b0419f..4329668f3a 100644
--- a/webrtc/modules/video_capture/external/video_capture_external.cc
+++ b/webrtc/modules/video_capture/external/video_capture_external.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "../video_capture_impl.h"
-#include "ref_count.h"
+#include "webrtc/modules/video_capture/android/video_capture_impl.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/video_capture/include/video_capture_defines.h b/webrtc/modules/video_capture/include/video_capture_defines.h
index b461dc6855..c592633b64 100644
--- a/webrtc/modules/video_capture/include/video_capture_defines.h
+++ b/webrtc/modules/video_capture/include/video_capture_defines.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_
 
-#include "webrtc/typedefs.h"
-#include "webrtc/modules/interface/module_common_types.h"
 #include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/linux/device_info_linux.cc b/webrtc/modules/video_capture/linux/device_info_linux.cc
index add9b989fd..d94a838e21 100644
--- a/webrtc/modules/video_capture/linux/device_info_linux.cc
+++ b/webrtc/modules/video_capture/linux/device_info_linux.cc
@@ -8,21 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "device_info_linux.h"
+#include "webrtc/modules/video_capture/linux/device_info_linux.h"
 
 #include <errno.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <unistd.h>
 //v4l includes
 #include <linux/videodev2.h>
 
-#include "ref_count.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 
 namespace webrtc
diff --git a/webrtc/modules/video_capture/linux/device_info_linux.h b/webrtc/modules/video_capture/linux/device_info_linux.h
index a3e53cf877..3309f26fda 100644
--- a/webrtc/modules/video_capture/linux/device_info_linux.h
+++ b/webrtc/modules/video_capture/linux/device_info_linux.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_DEVICE_INFO_LINUX_H_
 
-#include "../video_capture_impl.h"
-#include "../device_info_impl.h"
+#include "webrtc/modules/video_capture/device_info_impl.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/linux/video_capture_linux.cc b/webrtc/modules/video_capture/linux/video_capture_linux.cc
index 4cbebb3fa2..6cad637f2d 100644
--- a/webrtc/modules/video_capture/linux/video_capture_linux.cc
+++ b/webrtc/modules/video_capture/linux/video_capture_linux.cc
@@ -8,24 +8,24 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <linux/videodev2.h>
-#include <errno.h>
 #include <stdio.h>
-#include <sys/mman.h>
 #include <string.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include <iostream>
 #include <new>
 
-#include "ref_count.h"
-#include "trace.h"
-#include "thread_wrapper.h"
-#include "critical_section_wrapper.h"
-#include "video_capture_linux.h"
+#include "webrtc/modules/video_capture/linux/video_capture_linux.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/linux/video_capture_linux.h b/webrtc/modules/video_capture/linux/video_capture_linux.h
index 896b89d70a..6883f60cd9 100644
--- a/webrtc/modules/video_capture/linux/video_capture_linux.h
+++ b/webrtc/modules/video_capture/linux/video_capture_linux.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_LINUX_VIDEO_CAPTURE_LINUX_H_
 
-#include "common_types.h"
-#include "../video_capture_impl.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h
index 425835d0dc..e3ddd9fe10 100644
--- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h
+++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h
@@ -14,9 +14,9 @@
 #import <QTKit/QTKit.h>
 #include <stdio.h>
 
-#include "webrtc/modules/video_capture/video_capture_impl.h"
-#include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_utility.h"
 #include "webrtc/modules/video_capture/device_info_impl.h"
+#include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_utility.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
 
 @class VideoCaptureMacQTKitObjC;
 @class VideoCaptureMacQTKitInfoObjC;
diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm
index 0ff7df93b3..4f03e5e113 100644
--- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm
+++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video_capture_qtkit.h"
-#import "video_capture_qtkit_objc.h"
-#import "video_capture_qtkit_info_objc.h"
-#include "trace.h"
-#include "critical_section_wrapper.h"
-#include "../../video_capture_config.h"
+#include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h"
+#import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h"
+#import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h"
+#include "webrtc/modules/video_capture/video_capture_config.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {
@@ -209,4 +209,3 @@ struct VideoCaptureCapabilityMacQTKit:public VideoCaptureCapability
 };
 }  // namespace videocapturemodule
 }  // namespace webrtc
-
diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.h b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.h
index 4462542190..cae923b47f 100644
--- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.h
+++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.h
@@ -11,11 +11,10 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_MAC_QTKIT_VIDEO_CAPTURE_QTKIT_INFO_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_MAC_QTKIT_VIDEO_CAPTURE_QTKIT_INFO_H_
 
-#include "../../video_capture_impl.h"
-#include "../../device_info_impl.h"
-#include "video_capture_qtkit_utility.h"
-
-#include "map_wrapper.h"
+#include "webrtc/modules/video_capture/device_info_impl.h"
+#include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_utility.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
+#include "webrtc/system_wrappers/interface/map_wrapper.h"
 
 
 @class VideoCaptureMacQTKitInfoObjC;
diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm
index 9a8db3c193..311f8ac770 100644
--- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm
+++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm
@@ -8,11 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "trace.h"
-#include "../../video_capture_config.h"
-#import "video_capture_qtkit_info_objc.h"
-
-#include "video_capture.h"
+#import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h"
+#include "webrtc/modules/video_capture/include/video_capture.h"
+#include "webrtc/modules/video_capture/video_capture_config.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h
index a7fd58a0fb..c03aa935f5 100644
--- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h
+++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h
@@ -16,10 +16,11 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_MAC_QTKIT_VIDEO_CAPTURE_QTKIT_INFO_OBJC_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_MAC_QTKIT_VIDEO_CAPTURE_QTKIT_INFO_OBJC_H_
 
-#import <QTKit/QTKit.h>
 #import <Foundation/Foundation.h>
-#include "video_capture_qtkit_utility.h"
-#include "video_capture_qtkit_info.h"
+#import <QTKit/QTKit.h>
+
+#include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.h"
+#include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_utility.h"
 
 @interface VideoCaptureMacQTKitInfoObjC : NSObject{
     bool                                _OSSupportedInfo;
diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm
index dbc5db8d00..18ff5ed12f 100644
--- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm
+++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm
@@ -10,9 +10,9 @@
 
 #pragma mark **** imports/includes
 
-#import "video_capture_qtkit_info_objc.h"
+#import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h"
 
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 using namespace webrtc;
 
diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h
index b8eb75b071..29f7d04bdc 100644
--- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h
+++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h
@@ -16,14 +16,14 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_MAC_QTKIT_VIDEO_CAPTURE_QTKIT_OBJC_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_MAC_QTKIT_VIDEO_CAPTURE_QTKIT_OBJC_H_
 
-#import <Foundation/Foundation.h>
-#import <QTKit/QTKit.h>
 #import <AppKit/AppKit.h>
 #import <CoreData/CoreData.h>
 #import <CoreFoundation/CoreFoundation.h>
 #import <CoreVideo/CoreVideo.h>
+#import <Foundation/Foundation.h>
+#import <QTKit/QTKit.h>
 
-#include "video_capture_qtkit.h"
+#include "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.h"
 
 @interface VideoCaptureMacQTKitObjC : NSObject {
   bool _capturing;
diff --git a/webrtc/modules/video_capture/mac/video_capture_mac.mm b/webrtc/modules/video_capture/mac/video_capture_mac.mm
index 2f9197e0a0..661b0f7b4e 100644
--- a/webrtc/modules/video_capture/mac/video_capture_mac.mm
+++ b/webrtc/modules/video_capture/mac/video_capture_mac.mm
@@ -13,25 +13,22 @@
  *
  */
 
-
-// super class stuff
-#include "../video_capture_impl.h"
-#include "../device_info_impl.h"
-#include "../video_capture_config.h"
-#include "ref_count.h"
-
-#include "trace.h"
-
 #include <QuickTime/QuickTime.h>
 
+#include "webrtc/modules/video_capture/device_info_impl.h"
+#include "webrtc/modules/video_capture/video_capture_config.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+
 // 10.4 support must be decided runtime. We will just decide which framework to
 // use at compile time "work" classes. One for QTKit, one for QuickTime
 #if __MAC_OS_X_VERSION_MIN_REQUIRED == __MAC_10_4 // QuickTime version
-#include "QuickTime/video_capture_quick_time.h"
-#include "QuickTime/video_capture_quick_time_info.h"
+#include <QuickTime/video_capture_quick_time.h>
+#include <QuickTime/video_capture_quick_time_info.h>
 #else
-#include "QTKit/video_capture_qtkit.h"
-#include "QTKit/video_capture_qtkit_info.h"
+#include <QTKit/video_capture_qtkit.h>
+#include <QTKit/video_capture_qtkit_info.h>
 #endif
 
 namespace webrtc
@@ -272,4 +269,3 @@ VideoCaptureImpl::CreateDeviceInfo(const int32_t id)
  ***************************************************************************/
 }  // namespace videocapturemodule
 }  // namespace webrtc
-
diff --git a/webrtc/modules/video_capture/test/video_capture_main_mac.mm b/webrtc/modules/video_capture/test/video_capture_main_mac.mm
index 94fb6fc8b5..15cd1d555f 100644
--- a/webrtc/modules/video_capture/test/video_capture_main_mac.mm
+++ b/webrtc/modules/video_capture/test/video_capture_main_mac.mm
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "gtest/gtest.h"
-#include "testsupport/mac/run_threaded_main_mac.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/mac/run_threaded_main_mac.h"
 
 int ImplementThisToRunYourTest(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc
index 28937f82fb..3d735c9a93 100644
--- a/webrtc/modules/video_capture/test/video_capture_unittest.cc
+++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc
@@ -10,17 +10,17 @@
 
 #include <stdio.h>
 
-#include "gtest/gtest.h"
-#include "modules/utility/interface/process_thread.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
 #include "webrtc/modules/video_capture/include/video_capture.h"
 #include "webrtc/modules/video_capture/include/video_capture_factory.h"
-#include "common_video/interface/i420_video_frame.h"
-#include "common_video/libyuv/include/webrtc_libyuv.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 "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/system_wrappers/interface/scoped_refptr.h"
+#include "webrtc/system_wrappers/interface/sleep.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
 
 using webrtc::CriticalSectionWrapper;
 using webrtc::CriticalSectionScoped;
@@ -639,4 +639,3 @@ TEST_F(VideoCaptureExternalTest, Rotation) {
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
     length, capture_callback_.capability(), 0));
 }
-
diff --git a/webrtc/modules/video_capture/video_capture_factory.cc b/webrtc/modules/video_capture/video_capture_factory.cc
index 99a070886d..5b44a6c706 100644
--- a/webrtc/modules/video_capture/video_capture_factory.cc
+++ b/webrtc/modules/video_capture/video_capture_factory.cc
@@ -8,8 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video_capture_factory.h"
-#include "video_capture_impl.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
+
+#include "webrtc/modules/video_capture/video_capture_impl.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/video_capture_impl.cc b/webrtc/modules/video_capture/video_capture_impl.cc
index 833f7efd13..842cd9ac79 100644
--- a/webrtc/modules/video_capture/video_capture_impl.cc
+++ b/webrtc/modules/video_capture/video_capture_impl.cc
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video_capture_impl.h"
-
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "critical_section_wrapper.h"
-#include "module_common_types.h"
-#include "ref_count.h"
-#include "tick_util.h"
-#include "trace.h"
-#include "trace_event.h"
-#include "video_capture_config.h"
-#include "webrtc/system_wrappers/interface/clock.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
 
 #include <stdlib.h>
 
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/video_capture/video_capture_config.h"
+#include "webrtc/system_wrappers/interface/clock.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/trace_event.h"
+
 namespace webrtc
 {
 namespace videocapturemodule
diff --git a/webrtc/modules/video_capture/video_capture_impl.h b/webrtc/modules/video_capture/video_capture_impl.h
index f0d496514f..65605068f8 100644
--- a/webrtc/modules/video_capture/video_capture_impl.h
+++ b/webrtc/modules/video_capture/video_capture_impl.h
@@ -15,11 +15,11 @@
  * video_capture_impl.h
  */
 
-#include "video_capture.h"
-#include "video_capture_config.h"
-#include "tick_util.h"
-#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"
+#include "webrtc/modules/video_capture/include/video_capture.h"
+#include "webrtc/modules/video_capture/video_capture_config.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/windows/device_info_ds.cc b/webrtc/modules/video_capture/windows/device_info_ds.cc
index bd4523a866..f459802412 100644
--- a/webrtc/modules/video_capture/windows/device_info_ds.cc
+++ b/webrtc/modules/video_capture/windows/device_info_ds.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "device_info_ds.h"
+#include "webrtc/modules/video_capture/windows/device_info_ds.h"
 
-#include "../video_capture_config.h"
-#include "../video_capture_delay.h"
-#include "help_functions_ds.h"
-#include "ref_count.h"
-#include "trace.h"
+#include "webrtc/modules/video_capture/video_capture_config.h"
+#include "webrtc/modules/video_capture/video_capture_delay.h"
+#include "webrtc/modules/video_capture/windows/help_functions_ds.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
-#include <Streams.h>
 #include <Dvdmedia.h>
+#include <Streams.h>
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/windows/device_info_ds.h b/webrtc/modules/video_capture/windows/device_info_ds.h
index f8e737659f..19961afc91 100644
--- a/webrtc/modules/video_capture/windows/device_info_ds.h
+++ b/webrtc/modules/video_capture/windows/device_info_ds.h
@@ -11,13 +11,12 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_
 
-#include "../video_capture_impl.h"
-#include "../device_info_impl.h"
+#include "webrtc/modules/video_capture/device_info_impl.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
+#include "webrtc/system_wrappers/interface/map_wrapper.h"
 
 #include <Dshow.h>
-#include "map_wrapper.h"
 
-// forward declarations
 namespace webrtc
 {
 namespace videocapturemodule
diff --git a/webrtc/modules/video_capture/windows/device_info_mf.cc b/webrtc/modules/video_capture/windows/device_info_mf.cc
index aa747f1a3d..87c4026384 100644
--- a/webrtc/modules/video_capture/windows/device_info_mf.cc
+++ b/webrtc/modules/video_capture/windows/device_info_mf.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_capture/windows/device_info_mf.h"
+#include "webrtc/modules/video_capture/windows/device_info_mf.h"
 
 namespace webrtc {
 namespace videocapturemodule {
diff --git a/webrtc/modules/video_capture/windows/device_info_mf.h b/webrtc/modules/video_capture/windows/device_info_mf.h
index cb5638af66..b787e002c9 100644
--- a/webrtc/modules/video_capture/windows/device_info_mf.h
+++ b/webrtc/modules/video_capture/windows/device_info_mf.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_DEVICE_INFO_MF_H_
 
-#include "modules/video_capture/device_info_impl.h"
+#include "webrtc/modules/video_capture/device_info_impl.h"
 
 namespace webrtc {
 namespace videocapturemodule {
diff --git a/webrtc/modules/video_capture/windows/help_functions_ds.cc b/webrtc/modules/video_capture/windows/help_functions_ds.cc
index f7ed9572e4..057bffb0af 100644
--- a/webrtc/modules/video_capture/windows/help_functions_ds.cc
+++ b/webrtc/modules/video_capture/windows/help_functions_ds.cc
@@ -12,7 +12,7 @@
                        // that DEFINE_GUID() entries will be defined in this
                        // object file.
 
-#include "help_functions_ds.h"
+#include "webrtc/modules/video_capture/windows/help_functions_ds.h"
 
 #include <cguid.h>
 
@@ -117,4 +117,3 @@ BOOL PinMatchesCategory(IPin *pPin, REFGUID Category)
 }
 }  // namespace videocapturemodule
 }  // namespace webrtc
-
diff --git a/webrtc/modules/video_capture/windows/sink_filter_ds.cc b/webrtc/modules/video_capture/windows/sink_filter_ds.cc
index 0c78917f3c..144f8833b7 100644
--- a/webrtc/modules/video_capture/windows/sink_filter_ds.cc
+++ b/webrtc/modules/video_capture/windows/sink_filter_ds.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sink_filter_ds.h"
+#include "webrtc/modules/video_capture/windows/sink_filter_ds.h"
 
-#include "trace.h"
-#include "help_functions_ds.h"
+#include "webrtc/modules/video_capture/windows/help_functions_ds.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #include <Dvdmedia.h> // VIDEOINFOHEADER2
 #include <initguid.h>
diff --git a/webrtc/modules/video_capture/windows/sink_filter_ds.h b/webrtc/modules/video_capture/windows/sink_filter_ds.h
index 4966a26d39..d1f0ed3eb8 100644
--- a/webrtc/modules/video_capture/windows/sink_filter_ds.h
+++ b/webrtc/modules/video_capture/windows/sink_filter_ds.h
@@ -13,7 +13,7 @@
 
 #include <Streams.h> // Include base DS filter header files
 
-#include "video_capture_defines.h"
+#include "webrtc/modules/video_capture/include/video_capture_defines.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/video_capture/windows/video_capture_ds.cc b/webrtc/modules/video_capture/windows/video_capture_ds.cc
index 085967b809..047d9efc40 100644
--- a/webrtc/modules/video_capture/windows/video_capture_ds.cc
+++ b/webrtc/modules/video_capture/windows/video_capture_ds.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video_capture_ds.h"
+#include "webrtc/modules/video_capture/windows/video_capture_ds.h"
 
-#include "../video_capture_config.h"
-#include "critical_section_wrapper.h"
-#include "help_functions_ds.h"
-#include "sink_filter_ds.h"
-#include "trace.h"
+#include "webrtc/modules/video_capture/video_capture_config.h"
+#include "webrtc/modules/video_capture/windows/help_functions_ds.h"
+#include "webrtc/modules/video_capture/windows/sink_filter_ds.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #include <Dvdmedia.h> // VIDEOINFOHEADER2
 
diff --git a/webrtc/modules/video_capture/windows/video_capture_ds.h b/webrtc/modules/video_capture/windows/video_capture_ds.h
index 4404039337..1f6193dc32 100644
--- a/webrtc/modules/video_capture/windows/video_capture_ds.h
+++ b/webrtc/modules/video_capture/windows/video_capture_ds.h
@@ -11,10 +11,8 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_VIDEO_CAPTURE_DS_H_
 
-#include "../video_capture_impl.h"
-#include <tchar.h>
-
-#include "device_info_ds.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
+#include "webrtc/modules/video_capture/windows/device_info_ds.h"
 
 #define CAPTURE_FILTER_NAME L"VideoCaptureFilter"
 #define SINK_FILTER_NAME L"SinkFilter"
diff --git a/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc b/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc
index 8b6737ff18..89c0297c8f 100644
--- a/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc
+++ b/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "ref_count.h"
-#include "video_capture_ds.h"
-#include "video_capture_mf.h"
+#include "webrtc/modules/video_capture/windows/video_capture_ds.h"
+#include "webrtc/modules/video_capture/windows/video_capture_mf.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
 
 namespace webrtc {
 namespace videocapturemodule {
diff --git a/webrtc/modules/video_capture/windows/video_capture_mf.cc b/webrtc/modules/video_capture/windows/video_capture_mf.cc
index 34cdf3e8a9..c79ed222c0 100644
--- a/webrtc/modules/video_capture/windows/video_capture_mf.cc
+++ b/webrtc/modules/video_capture/windows/video_capture_mf.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_capture/windows/video_capture_mf.h"
+#include "webrtc/modules/video_capture/windows/video_capture_mf.h"
 
 namespace webrtc {
 namespace videocapturemodule {
diff --git a/webrtc/modules/video_capture/windows/video_capture_mf.h b/webrtc/modules/video_capture/windows/video_capture_mf.h
index 5fba9c2de9..076ef55ecf 100644
--- a/webrtc/modules/video_capture/windows/video_capture_mf.h
+++ b/webrtc/modules/video_capture/windows/video_capture_mf.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_
 #define WEBRTC_MODULES_VIDEO_CAPTURE_WINDOWS_VIDEO_CAPTURE_MF_H_
 
-#include "modules/video_capture/video_capture_impl.h"
+#include "webrtc/modules/video_capture/video_capture_impl.h"
 
 namespace webrtc {
 namespace videocapturemodule {