diff --git a/webrtc/modules/media_file/interface/media_file.h b/webrtc/modules/media_file/interface/media_file.h
index 5ee40fd6c8..f2ec103752 100644
--- a/webrtc/modules/media_file/interface/media_file.h
+++ b/webrtc/modules/media_file/interface/media_file.h
@@ -11,11 +11,11 @@
 #ifndef WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_H_
 #define WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_H_
 
-#include "common_types.h"
-#include "typedefs.h"
-#include "module.h"
-#include "module_common_types.h"
-#include "media_file_defines.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/interface/module.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 class MediaFile : public Module
diff --git a/webrtc/modules/media_file/interface/media_file_defines.h b/webrtc/modules/media_file/interface/media_file_defines.h
index 7cc5436959..ded71a8ca7 100644
--- a/webrtc/modules/media_file/interface/media_file_defines.h
+++ b/webrtc/modules/media_file/interface/media_file_defines.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_DEFINES_H_
 #define WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_DEFINES_H_
 
-#include "engine_configurations.h"
-#include "module_common_types.h"
-#include "typedefs.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 // Callback class for the MediaFile class.
diff --git a/webrtc/modules/media_file/source/avi_file.cc b/webrtc/modules/media_file/source/avi_file.cc
index bfc0b8ac4f..92c51acce6 100644
--- a/webrtc/modules/media_file/source/avi_file.cc
+++ b/webrtc/modules/media_file/source/avi_file.cc
@@ -12,7 +12,7 @@
 // is detected by asserts in many places. Also a refactoring of this class would
 // be beneficial.
 
-#include "avi_file.h"
+#include "webrtc/modules/media_file/source/avi_file.h"
 
 #include <assert.h>
 #include <string.h>
@@ -21,10 +21,10 @@
 #include <windows.h>
 #endif
 
-#include "critical_section_wrapper.h"
-#include "file_wrapper.h"
-#include "list_wrapper.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/list_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 // http://msdn2.microsoft.com/en-us/library/ms779636.aspx
 // A chunk has the following form:
diff --git a/webrtc/modules/media_file/source/avi_file.h b/webrtc/modules/media_file/source/avi_file.h
index 39ae3261de..a55fc18748 100644
--- a/webrtc/modules/media_file/source/avi_file.h
+++ b/webrtc/modules/media_file/source/avi_file.h
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;
diff --git a/webrtc/modules/media_file/source/media_file_impl.cc b/webrtc/modules/media_file/source/media_file_impl.cc
index 275ca20b24..983a1e30c4 100644
--- a/webrtc/modules/media_file/source/media_file_impl.cc
+++ b/webrtc/modules/media_file/source/media_file_impl.cc
@@ -10,11 +10,11 @@
 
 #include <assert.h>
 
-#include "critical_section_wrapper.h"
-#include "file_wrapper.h"
-#include "media_file_impl.h"
-#include "tick_util.h"
-#include "trace.h"
+#include "webrtc/modules/media_file/source/media_file_impl.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #if (defined(WIN32) || defined(WINCE))
     #define STR_CASE_CMP _stricmp
diff --git a/webrtc/modules/media_file/source/media_file_impl.h b/webrtc/modules/media_file/source/media_file_impl.h
index 33c45e9215..1a19e71065 100644
--- a/webrtc/modules/media_file/source/media_file_impl.h
+++ b/webrtc/modules/media_file/source/media_file_impl.h
@@ -11,11 +11,12 @@
 #ifndef WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_IMPL_H_
 #define WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_IMPL_H_
 
-#include "common_types.h"
-#include "media_file.h"
-#include "media_file_defines.h"
-#include "media_file_utility.h"
-#include "module_common_types.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/media_file/interface/media_file.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
+#include "webrtc/modules/media_file/source/media_file_utility.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 
 namespace webrtc {
 class MediaFileImpl : public MediaFile
diff --git a/webrtc/modules/media_file/source/media_file_unittest.cc b/webrtc/modules/media_file/source/media_file_unittest.cc
index 9f3f0ccf9f..d658dc2c7a 100644
--- a/webrtc/modules/media_file/source/media_file_unittest.cc
+++ b/webrtc/modules/media_file/source/media_file_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/modules/media_file/interface/media_file.h"
 #include "webrtc/system_wrappers/interface/sleep.h"
 #include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/modules/media_file/source/media_file_utility.cc b/webrtc/modules/media_file/source/media_file_utility.cc
index 58869aa020..44a48e3423 100644
--- a/webrtc/modules/media_file/source/media_file_utility.cc
+++ b/webrtc/modules/media_file/source/media_file_utility.cc
@@ -12,12 +12,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "common_types.h"
-#include "engine_configurations.h"
-#include "file_wrapper.h"
-#include "media_file_utility.h"
-#include "module_common_types.h"
-#include "trace.h"
+#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/media_file/source/media_file_utility.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
     #include "avi_file.h"
diff --git a/webrtc/modules/media_file/source/media_file_utility.h b/webrtc/modules/media_file/source/media_file_utility.h
index 8376169a74..5fc9ef428d 100644
--- a/webrtc/modules/media_file/source/media_file_utility.h
+++ b/webrtc/modules/media_file/source/media_file_utility.h
@@ -14,8 +14,8 @@
 
 #include <stdio.h>
 
-#include "common_types.h"
-#include "media_file_defines.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
 
 namespace webrtc {
 class AviFile;