diff --git a/modules/video_processing/main/interface/video_processing.h b/modules/video_processing/main/interface/video_processing.h
index 9effc33..09a4b2e 100644
--- a/modules/video_processing/main/interface/video_processing.h
+++ b/modules/video_processing/main/interface/video_processing.h
@@ -18,10 +18,10 @@
 #ifndef WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H
 #define WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_H
 
-#include "common_video/interface/i420_video_frame.h"
-#include "module.h"
-#include "module_common_types.h"
-#include "video_processing_defines.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/modules/interface/module.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h"
 
 /**
    The module is largely intended to process video streams, except functionality 
diff --git a/modules/video_processing/main/interface/video_processing_defines.h b/modules/video_processing/main/interface/video_processing_defines.h
index d9bebd4..fd47979 100644
--- a/modules/video_processing/main/interface/video_processing_defines.h
+++ b/modules/video_processing/main/interface/video_processing_defines.h
@@ -16,7 +16,7 @@
 #ifndef WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_DEFINES_H
 #define WEBRTC_MODULES_INTERFACE_VIDEO_PROCESSING_DEFINES_H
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/brighten.cc b/modules/video_processing/main/source/brighten.cc
index dd3d701..12da574 100644
--- a/modules/video_processing/main/source/brighten.cc
+++ b/modules/video_processing/main/source/brighten.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_processing/main/source/brighten.h"
+#include "webrtc/modules/video_processing/main/source/brighten.h"
 
 #include <cstdlib>
 
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 namespace VideoProcessing {
diff --git a/modules/video_processing/main/source/brighten.h b/modules/video_processing/main/source/brighten.h
index 5dfb407..4d4c0f6 100644
--- a/modules/video_processing/main/source/brighten.h
+++ b/modules/video_processing/main/source/brighten.h
@@ -11,8 +11,8 @@
 #ifndef MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTEN_H_
 #define MODULES_VIDEO_PROCESSING_MAIN_SOURCE_BRIGHTEN_H_
 
-#include "typedefs.h"
-#include "modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 namespace VideoProcessing {
diff --git a/modules/video_processing/main/source/brightness_detection.cc b/modules/video_processing/main/source/brightness_detection.cc
index fc4a4ba..5f44f09 100644
--- a/modules/video_processing/main/source/brightness_detection.cc
+++ b/modules/video_processing/main/source/brightness_detection.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video_processing.h"
-#include "brightness_detection.h"
-#include "trace.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/main/source/brightness_detection.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #include <math.h>
 
diff --git a/modules/video_processing/main/source/brightness_detection.h b/modules/video_processing/main/source/brightness_detection.h
index 4d0f3a7..506e26d 100644
--- a/modules/video_processing/main/source/brightness_detection.h
+++ b/modules/video_processing/main/source/brightness_detection.h
@@ -14,8 +14,8 @@
 #ifndef VPM_BRIGHTNESS_DETECTION_H
 #define VPM_BRIGHTNESS_DETECTION_H
 
-#include "typedefs.h"
-#include "video_processing.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/color_enhancement.cc b/modules/video_processing/main/source/color_enhancement.cc
index 918fec7..ed568fa 100644
--- a/modules/video_processing/main/source/color_enhancement.cc
+++ b/modules/video_processing/main/source/color_enhancement.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "color_enhancement.h"
-#include "color_enhancement_private.h"
-#include "trace.h"
 #include <cstdlib>  // NULL
+#include "webrtc/modules/video_processing/main/source/color_enhancement.h"
+#include "webrtc/modules/video_processing/main/source/color_enhancement_private.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/color_enhancement.h b/modules/video_processing/main/source/color_enhancement.h
index 33381d0..f720da2 100644
--- a/modules/video_processing/main/source/color_enhancement.h
+++ b/modules/video_processing/main/source/color_enhancement.h
@@ -14,8 +14,8 @@
 #ifndef VPM_COLOR_ENHANCEMENT_H
 #define VPM_COLOR_ENHANCEMENT_H
 
-#include "typedefs.h"
-#include "video_processing.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/color_enhancement_private.h b/modules/video_processing/main/source/color_enhancement_private.h
index 79fde15..863135c 100644
--- a/modules/video_processing/main/source/color_enhancement_private.h
+++ b/modules/video_processing/main/source/color_enhancement_private.h
@@ -1,7 +1,7 @@
 #ifndef VPM_COLOR_ENHANCEMENT_PRIVATE_H
 #define VPM_COLOR_ENHANCEMENT_PRIVATE_H
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/content_analysis.cc b/modules/video_processing/main/source/content_analysis.cc
index c8f3c83..a5b75af 100644
--- a/modules/video_processing/main/source/content_analysis.cc
+++ b/modules/video_processing/main/source/content_analysis.cc
@@ -7,13 +7,14 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "content_analysis.h"
-#include "tick_util.h"
-#include "system_wrappers/interface/cpu_features_wrapper.h"
+#include "webrtc/modules/video_processing/main/source/content_analysis.h"
 
 #include <math.h>
 #include <stdlib.h>
 
+#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+
 namespace webrtc {
 
 VPMContentAnalysis::VPMContentAnalysis(bool runtime_cpu_detection):
diff --git a/modules/video_processing/main/source/content_analysis.h b/modules/video_processing/main/source/content_analysis.h
index 2322e40..4cdd185 100644
--- a/modules/video_processing/main/source/content_analysis.h
+++ b/modules/video_processing/main/source/content_analysis.h
@@ -11,10 +11,10 @@
 #ifndef VPM_CONTENT_ANALYSIS_H
 #define VPM_CONTENT_ANALYSIS_H
 
-#include "common_video/interface/i420_video_frame.h"
-#include "typedefs.h"
-#include "module_common_types.h"
-#include "video_processing_defines.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/content_analysis_sse2.cc b/modules/video_processing/main/source/content_analysis_sse2.cc
index 8214bf9..565312b 100644
--- a/modules/video_processing/main/source/content_analysis_sse2.cc
+++ b/modules/video_processing/main/source/content_analysis_sse2.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "content_analysis.h"
+#include "webrtc/modules/video_processing/main/source/content_analysis.h"
 
 #include <emmintrin.h>
 #include <math.h>
diff --git a/modules/video_processing/main/source/deflickering.cc b/modules/video_processing/main/source/deflickering.cc
index 4bd617b..74d0e12 100644
--- a/modules/video_processing/main/source/deflickering.cc
+++ b/modules/video_processing/main/source/deflickering.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "webrtc/modules/video_processing/main/source/deflickering.h"
 
 #include <math.h>
 #include <stdlib.h>
 
-#include "deflickering.h"
-#include "trace.h"
-#include "signal_processing_library.h"
-#include "sort.h"
+#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/system_wrappers/interface/sort.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/deflickering.h b/modules/video_processing/main/source/deflickering.h
index 5d4ae2d..ae02bfe 100644
--- a/modules/video_processing/main/source/deflickering.h
+++ b/modules/video_processing/main/source/deflickering.h
@@ -15,8 +15,8 @@
 #ifndef VPM_DEFLICKERING_H
 #define VPM_DEFLICKERING_H
 
-#include "typedefs.h"
-#include "video_processing.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/typedefs.h"
 
 #include <cstring>  // NULL
 
@@ -63,4 +63,3 @@
 } //namespace
 
 #endif // VPM_DEFLICKERING_H
-
diff --git a/modules/video_processing/main/source/denoising.cc b/modules/video_processing/main/source/denoising.cc
index 801a970..c0ea0fb 100644
--- a/modules/video_processing/main/source/denoising.cc
+++ b/modules/video_processing/main/source/denoising.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "denoising.h"
-#include "trace.h"
+#include "webrtc/modules/video_processing/main/source/denoising.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #include <cstring>
 
diff --git a/modules/video_processing/main/source/denoising.h b/modules/video_processing/main/source/denoising.h
index 3e61dcd..4b2cb87 100644
--- a/modules/video_processing/main/source/denoising.h
+++ b/modules/video_processing/main/source/denoising.h
@@ -14,8 +14,8 @@
 #ifndef VPM_DENOISING_H
 #define VPM_DENOISING_H
 
-#include "typedefs.h"
-#include "video_processing.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/frame_preprocessor.cc b/modules/video_processing/main/source/frame_preprocessor.cc
index 5922155..54eeef2 100644
--- a/modules/video_processing/main/source/frame_preprocessor.cc
+++ b/modules/video_processing/main/source/frame_preprocessor.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "frame_preprocessor.h"
-#include "trace.h"
+#include "webrtc/modules/video_processing/main/source/frame_preprocessor.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/frame_preprocessor.h b/modules/video_processing/main/source/frame_preprocessor.h
index 03d18ee..e3edfc8 100644
--- a/modules/video_processing/main/source/frame_preprocessor.h
+++ b/modules/video_processing/main/source/frame_preprocessor.h
@@ -14,11 +14,11 @@
 #ifndef VPM_FRAME_PREPROCESSOR_H
 #define VPM_FRAME_PREPROCESSOR_H
 
-#include "typedefs.h"
-#include "video_processing.h"
-#include "content_analysis.h"
-#include "spatial_resampler.h"
-#include "video_decimator.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/main/source/content_analysis.h"
+#include "webrtc/modules/video_processing/main/source/spatial_resampler.h"
+#include "webrtc/modules/video_processing/main/source/video_decimator.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/spatial_resampler.cc b/modules/video_processing/main/source/spatial_resampler.cc
index 4dc73e9..89a449a 100644
--- a/modules/video_processing/main/source/spatial_resampler.cc
+++ b/modules/video_processing/main/source/spatial_resampler.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "spatial_resampler.h"
+#include "webrtc/modules/video_processing/main/source/spatial_resampler.h"
 
 
 namespace webrtc {
diff --git a/modules/video_processing/main/source/spatial_resampler.h b/modules/video_processing/main/source/spatial_resampler.h
index b8952d1..43368d1 100644
--- a/modules/video_processing/main/source/spatial_resampler.h
+++ b/modules/video_processing/main/source/spatial_resampler.h
@@ -15,13 +15,13 @@
 #ifndef VPM_SPATIAL_RESAMPLER_H
 #define VPM_SPATIAL_RESAMPLER_H
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
-#include "module_common_types.h"
-#include "video_processing_defines.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h"
 
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "common_video/libyuv/include/scaler.h"
+#include "webrtc/common_video/libyuv/include/scaler.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/video_decimator.cc b/modules/video_processing/main/source/video_decimator.cc
index a50189e..e2d09e3 100644
--- a/modules/video_processing/main/source/video_decimator.cc
+++ b/modules/video_processing/main/source/video_decimator.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "video_decimator.h"
-#include "tick_util.h"
-#include "video_processing.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/main/source/video_decimator.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
 
 #define VD_MIN(a, b) ((a) < (b)) ? (a) : (b)
 
diff --git a/modules/video_processing/main/source/video_decimator.h b/modules/video_processing/main/source/video_decimator.h
index f543633..0ea0019 100644
--- a/modules/video_processing/main/source/video_decimator.h
+++ b/modules/video_processing/main/source/video_decimator.h
@@ -14,8 +14,8 @@
 #ifndef VPM_VIDEO_DECIMATOR_H
 #define VPM_VIDEO_DECIMATOR_H
 
-#include "typedefs.h"
-#include "module_common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/source/video_processing_impl.cc b/modules/video_processing/main/source/video_processing_impl.cc
index 4f1433d..7fd4f6e 100644
--- a/modules/video_processing/main/source/video_processing_impl.cc
+++ b/modules/video_processing/main/source/video_processing_impl.cc
@@ -9,9 +9,9 @@
  */
 
 
-#include "video_processing_impl.h"
-#include "critical_section_wrapper.h"
-#include "trace.h"
+#include "webrtc/modules/video_processing/main/source/video_processing_impl.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #include <cassert>
 
diff --git a/modules/video_processing/main/source/video_processing_impl.h b/modules/video_processing/main/source/video_processing_impl.h
index e622c99..57556ec 100644
--- a/modules/video_processing/main/source/video_processing_impl.h
+++ b/modules/video_processing/main/source/video_processing_impl.h
@@ -11,13 +11,13 @@
 #ifndef WEBRTC_MODULE_VIDEO_PROCESSING_IMPL_H
 #define WEBRTC_MODULE_VIDEO_PROCESSING_IMPL_H
 
-#include "video_processing.h"
-#include "brighten.h"
-#include "brightness_detection.h"
-#include "color_enhancement.h"
-#include "deflickering.h"
-#include "denoising.h"
-#include "frame_preprocessor.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/main/source/brighten.h"
+#include "webrtc/modules/video_processing/main/source/brightness_detection.h"
+#include "webrtc/modules/video_processing/main/source/color_enhancement.h"
+#include "webrtc/modules/video_processing/main/source/deflickering.h"
+#include "webrtc/modules/video_processing/main/source/denoising.h"
+#include "webrtc/modules/video_processing/main/source/frame_preprocessor.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;
diff --git a/modules/video_processing/main/test/unit_test/color_enhancement_test.cc b/modules/video_processing/main/test/unit_test/color_enhancement_test.cc
index 34fd163..f8129e3 100644
--- a/modules/video_processing/main/test/unit_test/color_enhancement_test.cc
+++ b/modules/video_processing/main/test/unit_test/color_enhancement_test.cc
@@ -11,11 +11,11 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "modules/video_processing/main/interface/video_processing.h"
-#include "modules/video_processing/main/test/unit_test/unit_test.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "testsupport/fileutils.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/test/unit_test/content_metrics_test.cc b/modules/video_processing/main/test/unit_test/content_metrics_test.cc
index 063a7af..e73eaa3 100644
--- a/modules/video_processing/main/test/unit_test/content_metrics_test.cc
+++ b/modules/video_processing/main/test/unit_test/content_metrics_test.cc
@@ -9,9 +9,9 @@
  */
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "modules/video_processing/main/interface/video_processing.h"
-#include "modules/video_processing/main/source/content_analysis.h"
-#include "modules/video_processing/main/test/unit_test/unit_test.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/main/source/content_analysis.h"
+#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/test/unit_test/denoising_test.cc b/modules/video_processing/main/test/unit_test/denoising_test.cc
index fab064e..8d6ea47 100644
--- a/modules/video_processing/main/test/unit_test/denoising_test.cc
+++ b/modules/video_processing/main/test/unit_test/denoising_test.cc
@@ -11,11 +11,11 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "modules/video_processing/main/interface/video_processing.h"
-#include "modules/video_processing/main/test/unit_test/unit_test.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "testsupport/fileutils.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/test/unit_test/unit_test.cc b/modules/video_processing/main/test/unit_test/unit_test.cc
index e22d1d0..eea8081 100644
--- a/modules/video_processing/main/test/unit_test/unit_test.cc
+++ b/modules/video_processing/main/test/unit_test/unit_test.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/video_processing/main/test/unit_test/unit_test.h"
+#include "webrtc/modules/video_processing/main/test/unit_test/unit_test.h"
 
 #include <string>
 
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "test/testsupport/fileutils.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 
diff --git a/modules/video_processing/main/test/unit_test/unit_test.h b/modules/video_processing/main/test/unit_test/unit_test.h
index 67496d1..62c4039 100644
--- a/modules/video_processing/main/test/unit_test/unit_test.h
+++ b/modules/video_processing/main/test/unit_test/unit_test.h
@@ -11,10 +11,10 @@
 #ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VPM_UNIT_TEST_H
 #define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_TEST_UNIT_TEST_VPM_UNIT_TEST_H
 
-#include "gtest/gtest.h"
-#include "modules/video_processing/main/interface/video_processing.h"
-#include "system_wrappers/interface/trace.h"
-#include "testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {