From 811269df40fd8cd036b68cfe39bc04cacac0a698 Mon Sep 17 00:00:00 2001
From: "pbos@webrtc.org" <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 11 Jul 2013 13:24:38 +0000
Subject: [PATCH] Include files from webrtc/.. paths in audio_device/.

BUG=1662
R=xians@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1785005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4330 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../android/audio_device_jni_android.cc          | 12 ++++++------
 .../android/audio_device_jni_android.h           |  4 ++--
 .../android/audio_device_opensles_android.cc     | 10 +++++-----
 .../android/audio_device_opensles_android.h      |  4 ++--
 .../android/audio_device_utility_android.cc      |  6 +++---
 .../android/audio_device_utility_android.h       |  4 ++--
 .../modules/audio_device/audio_device_buffer.cc  | 14 +++++++-------
 .../modules/audio_device/audio_device_buffer.h   | 10 +++++-----
 .../modules/audio_device/audio_device_generic.cc |  5 ++---
 .../modules/audio_device/audio_device_generic.h  |  5 ++---
 webrtc/modules/audio_device/audio_device_impl.cc | 16 ++++++++--------
 webrtc/modules/audio_device/audio_device_impl.h  |  4 ++--
 .../modules/audio_device/audio_device_utility.cc | 10 ++++------
 .../modules/audio_device/audio_device_utility.h  |  3 +--
 .../audio_device/dummy/audio_device_dummy.h      |  2 +-
 .../dummy/audio_device_utility_dummy.h           |  4 ++--
 .../modules/audio_device/include/audio_device.h  |  4 ++--
 .../audio_device/include/audio_device_defines.h  |  2 +-
 .../modules/audio_device/ios/audio_device_ios.cc |  7 +++----
 .../modules/audio_device/ios/audio_device_ios.h  |  4 ++--
 .../audio_device/ios/audio_device_utility_ios.cc |  8 ++++----
 .../audio_device/ios/audio_device_utility_ios.h  |  4 ++--
 .../audio_device/linux/alsasymboltable_linux.cc  |  2 +-
 .../audio_device/linux/alsasymboltable_linux.h   |  2 +-
 .../linux/audio_device_alsa_linux.cc             | 14 +++++++-------
 .../audio_device/linux/audio_device_alsa_linux.h | 12 ++++++------
 .../linux/audio_device_pulse_linux.cc            | 12 ++++++------
 .../linux/audio_device_pulse_linux.h             |  8 ++++----
 .../linux/audio_device_utility_linux.cc          |  8 ++++----
 .../linux/audio_device_utility_linux.h           |  4 ++--
 .../linux/audio_mixer_manager_alsa_linux.cc      |  4 ++--
 .../linux/audio_mixer_manager_alsa_linux.h       |  8 ++++----
 .../linux/audio_mixer_manager_pulse_linux.cc     |  5 ++---
 .../linux/audio_mixer_manager_pulse_linux.h      | 10 +++++-----
 .../linux/latebindingsymboltable_linux.cc        |  2 +-
 .../linux/latebindingsymboltable_linux.h         |  4 ++--
 .../linux/pulseaudiosymboltable_linux.cc         |  2 +-
 .../linux/pulseaudiosymboltable_linux.h          |  2 +-
 .../modules/audio_device/mac/audio_device_mac.cc | 14 +++++++-------
 .../modules/audio_device/mac/audio_device_mac.h  |  8 ++++----
 .../audio_device/mac/audio_device_utility_mac.cc |  8 ++++----
 .../audio_device/mac/audio_device_utility_mac.h  |  4 ++--
 .../audio_device/mac/audio_mixer_manager_mac.cc  |  4 ++--
 .../audio_device/mac/audio_mixer_manager_mac.h   |  6 +++---
 .../audio_device/mac/portaudio/pa_ringbuffer.c   |  6 +++---
 .../audio_device/main/interface/audio_device.h   |  2 +-
 .../jni/audio_device_android_test.cc             |  6 +++---
 .../audio_device/test/audio_device_test_api.cc   | 14 +++++++-------
 .../test/audio_device_test_defines.h             |  9 ++++-----
 .../audio_device/test/audio_device_test_func.cc  |  4 ++--
 .../audio_device/test/func_test_manager.cc       | 16 ++++++++--------
 .../audio_device/test/func_test_manager.h        | 14 +++++++-------
 .../audio_device/win/audio_device_core_win.cc    | 12 ++++++------
 .../audio_device/win/audio_device_core_win.h     |  8 ++++----
 .../audio_device/win/audio_device_utility_win.cc |  8 ++++----
 .../audio_device/win/audio_device_utility_win.h  |  4 ++--
 .../audio_device/win/audio_device_wave_win.cc    | 13 ++++++-------
 .../audio_device/win/audio_device_wave_win.h     |  4 ++--
 .../audio_device/win/audio_mixer_manager_win.cc  |  6 +++---
 .../audio_device/win/audio_mixer_manager_win.h   |  6 +++---
 60 files changed, 204 insertions(+), 213 deletions(-)

diff --git a/webrtc/modules/audio_device/android/audio_device_jni_android.cc b/webrtc/modules/audio_device/android/audio_device_jni_android.cc
index d6375382e..33b7db983 100644
--- a/webrtc/modules/audio_device/android/audio_device_jni_android.cc
+++ b/webrtc/modules/audio_device/android/audio_device_jni_android.cc
@@ -18,13 +18,13 @@
 #include <android/log.h>
 #include <stdlib.h>
 
-#include "audio_device_utility.h"
-#include "audio_device_jni_android.h"
-#include "audio_device_config.h"
+#include "webrtc/modules/audio_device/android/audio_device_jni_android.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
 
-#include "trace.h"
-#include "thread_wrapper.h"
-#include "event_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/audio_device/android/audio_device_jni_android.h b/webrtc/modules/audio_device/android/audio_device_jni_android.h
index dee9eac53..677d37566 100644
--- a/webrtc/modules/audio_device/android/audio_device_jni_android.h
+++ b/webrtc/modules/audio_device/android/audio_device_jni_android.h
@@ -15,8 +15,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_JNI_ANDROID_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_JNI_ANDROID_H
 
-#include "audio_device_generic.h"
-#include "critical_section_wrapper.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 
 #include <jni.h> // For accessing AudioDeviceAndroid java class
 
diff --git a/webrtc/modules/audio_device/android/audio_device_opensles_android.cc b/webrtc/modules/audio_device/android/audio_device_opensles_android.cc
index dd0805df9..77479bdee 100644
--- a/webrtc/modules/audio_device/android/audio_device_opensles_android.cc
+++ b/webrtc/modules/audio_device/android/audio_device_opensles_android.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/audio_device/android/audio_device_opensles_android.h"
+#include "webrtc/modules/audio_device/android/audio_device_opensles_android.h"
 
 #ifdef WEBRTC_ANDROID_DEBUG
 #include <android/log.h>
@@ -18,10 +18,10 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "modules/audio_device/audio_device_utility.h"
-#include "system_wrappers/interface/event_wrapper.h"
-#include "system_wrappers/interface/thread_wrapper.h"
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #ifdef WEBRTC_ANDROID_DEBUG
 #define WEBRTC_OPENSL_TRACE(a, b, c, ...)                               \
diff --git a/webrtc/modules/audio_device/android/audio_device_opensles_android.h b/webrtc/modules/audio_device/android/audio_device_opensles_android.h
index 578999fa7..c33a03435 100644
--- a/webrtc/modules/audio_device/android/audio_device_opensles_android.h
+++ b/webrtc/modules/audio_device/android/audio_device_opensles_android.h
@@ -21,8 +21,8 @@
 
 #include <queue>
 
-#include "modules/audio_device/audio_device_generic.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_device/android/audio_device_utility_android.cc b/webrtc/modules/audio_device/android/audio_device_utility_android.cc
index b3dadf439..73c941771 100644
--- a/webrtc/modules/audio_device/android/audio_device_utility_android.cc
+++ b/webrtc/modules/audio_device/android/audio_device_utility_android.cc
@@ -12,10 +12,10 @@
  *  Android audio device utility implementation
  */
 
-#include "audio_device_utility_android.h"
+#include "webrtc/modules/audio_device/android/audio_device_utility_android.h"
 
-#include "critical_section_wrapper.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/audio_device/android/audio_device_utility_android.h b/webrtc/modules/audio_device/android/audio_device_utility_android.h
index ae66e4282..c677099d5 100644
--- a/webrtc/modules/audio_device/android/audio_device_utility_android.h
+++ b/webrtc/modules/audio_device/android/audio_device_utility_android.h
@@ -15,8 +15,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_ANDROID_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_ANDROID_H
 
-#include "audio_device_utility.h"
-#include "audio_device.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/audio_device/audio_device_buffer.cc b/webrtc/modules/audio_device/audio_device_buffer.cc
index 779641dc8..63218ddfc 100644
--- a/webrtc/modules/audio_device/audio_device_buffer.cc
+++ b/webrtc/modules/audio_device/audio_device_buffer.cc
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "trace.h"
-#include "critical_section_wrapper.h"
-#include "audio_device_buffer.h"
-#include "audio_device_utility.h"
-#include "audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_buffer.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
+#include <cassert>
 #include <stdlib.h>
 #include <string.h>
-#include <cassert>
 
-#include "signal_processing_library.h"
+#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_device/audio_device_buffer.h b/webrtc/modules/audio_device/audio_device_buffer.h
index 6a02c2be2..90e07de8e 100644
--- a/webrtc/modules/audio_device/audio_device_buffer.h
+++ b/webrtc/modules/audio_device/audio_device_buffer.h
@@ -11,11 +11,11 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H
 
-#include "typedefs.h"
-#include "common_audio/resampler/include/resampler.h"
-#include "file_wrapper.h"
-#include "audio_device.h"
-#include "list_wrapper.h"
+#include "webrtc/common_audio/resampler/include/resampler.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/list_wrapper.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;
diff --git a/webrtc/modules/audio_device/audio_device_generic.cc b/webrtc/modules/audio_device/audio_device_generic.cc
index 27ea60409..543c6ffc6 100644
--- a/webrtc/modules/audio_device/audio_device_generic.cc
+++ b/webrtc/modules/audio_device/audio_device_generic.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_device_generic.h"
-#include "trace.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 
@@ -73,4 +73,3 @@ bool AudioDeviceGeneric::BuiltInAECIsEnabled() const
 }
 
 }  // namespace webrtc
-
diff --git a/webrtc/modules/audio_device/audio_device_generic.h b/webrtc/modules/audio_device/audio_device_generic.h
index 013679004..803802802 100644
--- a/webrtc/modules/audio_device/audio_device_generic.h
+++ b/webrtc/modules/audio_device/audio_device_generic.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H
 
-#include "audio_device.h"
-#include "audio_device_buffer.h"
+#include "webrtc/modules/audio_device/audio_device_buffer.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 
 namespace webrtc {
 
@@ -180,4 +180,3 @@ public:
 }  // namespace webrtc
 
 #endif  // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_GENERIC_H
-
diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/webrtc/modules/audio_device/audio_device_impl.cc
index 978a7b657..9acaf8048 100644
--- a/webrtc/modules/audio_device/audio_device_impl.cc
+++ b/webrtc/modules/audio_device/audio_device_impl.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_device_impl.h"
-#include "audio_device_config.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "system_wrappers/interface/ref_count.h"
+#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_impl.h"
+#include "webrtc/system_wrappers/interface/ref_count.h"
 
 #include <assert.h>
 #include <string.h>
@@ -45,10 +45,10 @@
     #include "audio_device_utility_mac.h"
     #include "audio_device_mac.h"
 #endif
-#include "audio_device_dummy.h"
-#include "audio_device_utility_dummy.h"
-#include "critical_section_wrapper.h"
-#include "trace.h"
+#include "webrtc/modules/audio_device/dummy/audio_device_dummy.h"
+#include "webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #define CHECK_INITIALIZED()         \
 {                                   \
diff --git a/webrtc/modules/audio_device/audio_device_impl.h b/webrtc/modules/audio_device/audio_device_impl.h
index 8cbfbf53e..d34543b2f 100644
--- a/webrtc/modules/audio_device/audio_device_impl.h
+++ b/webrtc/modules/audio_device/audio_device_impl.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H
 
-#include "audio_device.h"
-#include "audio_device_buffer.h"
+#include "webrtc/modules/audio_device/audio_device_buffer.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/audio_device/audio_device_utility.cc b/webrtc/modules/audio_device/audio_device_utility.cc
index 428401134..b272c7e5f 100644
--- a/webrtc/modules/audio_device/audio_device_utility.cc
+++ b/webrtc/modules/audio_device/audio_device_utility.cc
@@ -10,7 +10,7 @@
 
 #include <cassert>
 
-#include "audio_device_utility.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
 
 #if defined(_WIN32)
 
@@ -52,11 +52,11 @@ bool AudioDeviceUtility::StringCompare(
 //                                 Linux & Mac
 // ============================================================================
 
-#include <sys/time.h>   // gettimeofday
-#include <time.h>       // gettimeofday
-#include <string.h>     // strncasecmp
 #include <stdio.h>      // getchar
+#include <string.h>     // strncasecmp
+#include <sys/time.h>   // gettimeofday
 #include <termios.h>    // tcgetattr
+#include <time.h>       // gettimeofday
 
 #include <unistd.h>
 
@@ -110,5 +110,3 @@ bool AudioDeviceUtility::StringCompare(
 }  // namespace webrtc
 
 #endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-
-
diff --git a/webrtc/modules/audio_device/audio_device_utility.h b/webrtc/modules/audio_device/audio_device_utility.h
index 10efbbc12..eb3e623e5 100644
--- a/webrtc/modules/audio_device/audio_device_utility.h
+++ b/webrtc/modules/audio_device/audio_device_utility.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_H
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc
 {
@@ -32,4 +32,3 @@ public:
 }  // namespace webrtc
 
 #endif  // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_H
-
diff --git a/webrtc/modules/audio_device/dummy/audio_device_dummy.h b/webrtc/modules/audio_device/dummy/audio_device_dummy.h
index 3c0ad8917..78baa2ef5 100644
--- a/webrtc/modules/audio_device/dummy/audio_device_dummy.h
+++ b/webrtc/modules/audio_device/dummy/audio_device_dummy.h
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 
-#include "audio_device_generic.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h b/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h
index 5cc49d393..8ae89c8c8 100644
--- a/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h
+++ b/webrtc/modules/audio_device/dummy/audio_device_utility_dummy.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_DUMMY_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_DUMMY_H
 
-#include "audio_device_utility.h"
-#include "audio_device.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/audio_device/include/audio_device.h b/webrtc/modules/audio_device/include/audio_device.h
index 7b6d5e11c..eb403aa9b 100644
--- a/webrtc/modules/audio_device/include/audio_device.h
+++ b/webrtc/modules/audio_device/include/audio_device.h
@@ -11,8 +11,8 @@
 #ifndef MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
 #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
 
-#include "modules/audio_device/include/audio_device_defines.h"
-#include "modules/interface/module.h"
+#include "webrtc/modules/audio_device/include/audio_device_defines.h"
+#include "webrtc/modules/interface/module.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_device/include/audio_device_defines.h b/webrtc/modules/audio_device/include/audio_device_defines.h
index 8f375e833..ce5fd7b3d 100644
--- a/webrtc/modules/audio_device/include/audio_device_defines.h
+++ b/webrtc/modules/audio_device/include/audio_device_defines.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_DEFINES_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_DEFINES_H
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 namespace webrtc {
 
diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.cc b/webrtc/modules/audio_device/ios/audio_device_ios.cc
index f9691f35f..bad3915f1 100644
--- a/webrtc/modules/audio_device/ios/audio_device_ios.cc
+++ b/webrtc/modules/audio_device/ios/audio_device_ios.cc
@@ -10,10 +10,10 @@
 
 #include <AudioToolbox/AudioServices.h>  // AudioSession
 
-#include "audio_device_ios.h"
+#include "webrtc/modules/audio_device/ios/audio_device_ios.h"
 
-#include "trace.h"
-#include "thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 AudioDeviceIPhone::AudioDeviceIPhone(const int32_t id)
@@ -1895,4 +1895,3 @@ bool AudioDeviceIPhone::CaptureWorkerThread() {
 }
 
 }  // namespace webrtc
-
diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.h b/webrtc/modules/audio_device/ios/audio_device_ios.h
index 6b93d0bd7..fdaf94d6a 100644
--- a/webrtc/modules/audio_device/ios/audio_device_ios.h
+++ b/webrtc/modules/audio_device/ios/audio_device_ios.h
@@ -13,8 +13,8 @@
 
 #include <AudioUnit/AudioUnit.h>
 
-#include "audio_device_generic.h"
-#include "critical_section_wrapper.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 
 namespace webrtc {
 class ThreadWrapper;
diff --git a/webrtc/modules/audio_device/ios/audio_device_utility_ios.cc b/webrtc/modules/audio_device/ios/audio_device_utility_ios.cc
index b8cf218ff..6bbceb921 100644
--- a/webrtc/modules/audio_device/ios/audio_device_utility_ios.cc
+++ b/webrtc/modules/audio_device/ios/audio_device_utility_ios.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_device_utility_ios.h"
-#include "audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/ios/audio_device_utility_ios.h"
 
-#include "critical_section_wrapper.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 AudioDeviceUtilityIPhone::AudioDeviceUtilityIPhone(const int32_t id)
diff --git a/webrtc/modules/audio_device/ios/audio_device_utility_ios.h b/webrtc/modules/audio_device/ios/audio_device_utility_ios.h
index e9f8c5455..081ab82d7 100644
--- a/webrtc/modules/audio_device/ios/audio_device_utility_ios.h
+++ b/webrtc/modules/audio_device/ios/audio_device_utility_ios.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_IPHONE_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_IPHONE_H
 
-#include "audio_device_utility.h"
-#include "audio_device.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;
diff --git a/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc b/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc
index 1b1707cb4..a39159078 100644
--- a/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc
+++ b/webrtc/modules/audio_device/linux/alsasymboltable_linux.cc
@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "alsasymboltable_linux.h"
+#include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h"
 
 namespace webrtc_adm_linux_alsa {
 
diff --git a/webrtc/modules/audio_device/linux/alsasymboltable_linux.h b/webrtc/modules/audio_device/linux/alsasymboltable_linux.h
index d25bbd786..82690c500 100644
--- a/webrtc/modules/audio_device/linux/alsasymboltable_linux.h
+++ b/webrtc/modules/audio_device/linux/alsasymboltable_linux.h
@@ -28,7 +28,7 @@
 #ifndef WEBRTC_AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_ALSASYMBOLTABLE_LINUX_H
 
-#include "latebindingsymboltable_linux.h"
+#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h"
 
 namespace webrtc_adm_linux_alsa {
 
diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
index ca45a755e..b2e8702b1 100644
--- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
@@ -10,14 +10,14 @@
 
 #include <cassert>
 
-#include "audio_device_utility.h"
-#include "audio_device_alsa_linux.h"
-#include "audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h"
 
-#include "event_wrapper.h"
-#include "system_wrappers/interface/sleep.h"
-#include "trace.h"
-#include "thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/sleep.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;
 
diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h
index de6deb2ee..924475859 100644
--- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h
+++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h
@@ -11,15 +11,15 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
 
-#include "audio_device_generic.h"
-#include "audio_mixer_manager_alsa_linux.h"
-#include "critical_section_wrapper.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
+#include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 
 
-#include <alsa/asoundlib.h>
-#include <sys/soundcard.h>
-#include <sys/ioctl.h>
 #include <X11/Xlib.h>
+#include <alsa/asoundlib.h>
+#include <sys/ioctl.h>
+#include <sys/soundcard.h>
 
 
 namespace webrtc
diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
index bc3e62134..04de0c643 100644
--- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
@@ -10,13 +10,13 @@
 
 #include <cassert>
 
-#include "audio_device_utility.h"
-#include "audio_device_pulse_linux.h"
-#include "audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/linux/audio_device_pulse_linux.h"
 
-#include "event_wrapper.h"
-#include "trace.h"
-#include "thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 webrtc_adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable;
 
diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
index 3b8a181f0..433dc24d1 100644
--- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
+++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
@@ -11,12 +11,12 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H
 
-#include "audio_device_generic.h"
-#include "audio_mixer_manager_pulse_linux.h"
-#include "critical_section_wrapper.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
+#include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 
-#include <pulse/pulseaudio.h>
 #include <X11/Xlib.h>
+#include <pulse/pulseaudio.h>
 
 // We define this flag if it's missing from our headers, because we want to be
 // able to compile against old headers but still use PA_STREAM_ADJUST_LATENCY
diff --git a/webrtc/modules/audio_device/linux/audio_device_utility_linux.cc b/webrtc/modules/audio_device/linux/audio_device_utility_linux.cc
index a053f5b10..d714f8fc3 100644
--- a/webrtc/modules/audio_device/linux/audio_device_utility_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_device_utility_linux.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_device_utility_linux.h"
-#include "audio_device_config.h"	// DEBUG_PRINT()
-#include "critical_section_wrapper.h"
-#include "trace.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"	// DEBUG_PRINT()
+#include "webrtc/modules/audio_device/linux/audio_device_utility_linux.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/audio_device/linux/audio_device_utility_linux.h b/webrtc/modules/audio_device/linux/audio_device_utility_linux.h
index 75e52b4e7..b56023fa7 100644
--- a/webrtc/modules/audio_device/linux/audio_device_utility_linux.h
+++ b/webrtc/modules/audio_device/linux/audio_device_utility_linux.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_LINUX_H
 
-#include "audio_device_utility.h"
-#include "audio_device.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
index e3acebd03..a70b8e288 100644
--- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
@@ -10,8 +10,8 @@
 
 #include <cassert>
 
-#include "audio_mixer_manager_alsa_linux.h"
-#include "trace.h"
+#include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 extern webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;
 
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
index 99ca29615..21618e2f8 100644
--- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
+++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
@@ -11,10 +11,10 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H
 
-#include "typedefs.h"
-#include "audio_device.h"
-#include "critical_section_wrapper.h"
-#include "alsasymboltable_linux.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/typedefs.h"
 
 #include <alsa/asoundlib.h>
 
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
index b32718c14..953891236 100644
--- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc
@@ -10,8 +10,8 @@
 
 #include <cassert>
 
-#include "audio_mixer_manager_pulse_linux.h"
-#include "trace.h"
+#include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 extern webrtc_adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable;
 
@@ -1265,4 +1265,3 @@ bool AudioMixerManagerLinuxPulse::GetSourceInfoByIndex(
 }
 
 }
-
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
index 3d913955d..9296c7648 100644
--- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
+++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h
@@ -11,13 +11,13 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H
 
-#include "typedefs.h"
-#include "audio_device.h"
-#include "critical_section_wrapper.h"
-#include "pulseaudiosymboltable_linux.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/typedefs.h"
 
-#include <stdint.h>
 #include <pulse/pulseaudio.h>
+#include <stdint.h>
 
 #ifndef UINT32_MAX
 #define UINT32_MAX  ((uint32_t)-1)
diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
index 156ae18e1..d6a216216 100644
--- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
+++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "latebindingsymboltable_linux.h"
+#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h"
 
 #ifdef WEBRTC_LINUX
 #include <dlfcn.h>
diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
index 91d25aa2d..b5186fa7b 100644
--- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
+++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
@@ -32,8 +32,8 @@
 #include <stddef.h>  // for NULL
 #include <string.h>
 
-#include "constructor_magic.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/constructor_magic.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 // This file provides macros for creating "symbol table" classes to simplify the
 // dynamic loading of symbols from DLLs. Currently the implementation only
diff --git a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc b/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
index ae663f700..1f1890a6d 100644
--- a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
+++ b/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.cc
@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "pulseaudiosymboltable_linux.h"
+#include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h"
 
 namespace webrtc_adm_linux_pulse {
 
diff --git a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h b/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h
index 049509ba8..7f3ccabef 100644
--- a/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h
+++ b/webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h
@@ -28,7 +28,7 @@
 #ifndef WEBRTC_AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_PULSEAUDIOSYMBOLTABLE_LINUX_H
 
-#include "latebindingsymboltable_linux.h"
+#include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h"
 
 namespace webrtc_adm_linux_pulse {
 
diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.cc b/webrtc/modules/audio_device/mac/audio_device_mac.cc
index 3cf742b8f..3e669ee99 100644
--- a/webrtc/modules/audio_device/mac/audio_device_mac.cc
+++ b/webrtc/modules/audio_device/mac/audio_device_mac.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_device_utility.h"
-#include "audio_device_mac.h"
-#include "audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/mac/audio_device_mac.h"
 
-#include "event_wrapper.h"
-#include "portaudio/pa_ringbuffer.h"
-#include "trace.h"
-#include "thread_wrapper.h"
+#include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <cassert>
diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.h b/webrtc/modules/audio_device/mac/audio_device_mac.h
index 19eb7c798..7ad4fa063 100644
--- a/webrtc/modules/audio_device/mac/audio_device_mac.h
+++ b/webrtc/modules/audio_device/mac/audio_device_mac.h
@@ -11,12 +11,12 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H
 
-#include "audio_device_generic.h"
-#include "critical_section_wrapper.h"
-#include "audio_mixer_manager_mac.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
+#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 
-#include <CoreAudio/CoreAudio.h>
 #include <AudioToolbox/AudioConverter.h>
+#include <CoreAudio/CoreAudio.h>
 #include <mach/semaphore.h>
 
 struct PaUtilRingBuffer;
diff --git a/webrtc/modules/audio_device/mac/audio_device_utility_mac.cc b/webrtc/modules/audio_device/mac/audio_device_utility_mac.cc
index 0aa74c0bc..10e9659db 100644
--- a/webrtc/modules/audio_device/mac/audio_device_utility_mac.cc
+++ b/webrtc/modules/audio_device/mac/audio_device_utility_mac.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_device_utility_mac.h"
-#include "audio_device_config.h"    // DEBUG_PRINT()
-#include "critical_section_wrapper.h"
-#include "trace.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"    // DEBUG_PRINT()
+#include "webrtc/modules/audio_device/mac/audio_device_utility_mac.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/audio_device/mac/audio_device_utility_mac.h b/webrtc/modules/audio_device/mac/audio_device_utility_mac.h
index 5a96cd8a4..71e07a4ab 100644
--- a/webrtc/modules/audio_device/mac/audio_device_utility_mac.h
+++ b/webrtc/modules/audio_device/mac/audio_device_utility_mac.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_MAC_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_MAC_H
 
-#include "audio_device_utility.h"
-#include "audio_device.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 
 namespace webrtc
 {
diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc
index e7a8b52a1..08e419750 100644
--- a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc
+++ b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_mixer_manager_mac.h"
-#include "trace.h"
+#include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #include <unistd.h>             // getpid()
 
diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
index c5024d122..711d36d15 100644
--- a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
+++ b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H
 
-#include "typedefs.h"
-#include "audio_device.h"
-#include "critical_section_wrapper.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/typedefs.h"
 
 #include <CoreAudio/CoreAudio.h>
 
diff --git a/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c b/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c
index 310d719f2..cb6b8e5d9 100644
--- a/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c
+++ b/webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.c
@@ -52,12 +52,12 @@
  @ingroup common_src
 */
 
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "pa_ringbuffer.h"
 #include <string.h>
-#include "pa_memorybarrier.h"
+#include "webrtc/modules/audio_device/mac/portaudio/pa_memorybarrier.h"
+#include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h"
 
 /***************************************************************************
  * Initialize FIFO.
diff --git a/webrtc/modules/audio_device/main/interface/audio_device.h b/webrtc/modules/audio_device/main/interface/audio_device.h
index 551784f4a..71f16b685 100644
--- a/webrtc/modules/audio_device/main/interface/audio_device.h
+++ b/webrtc/modules/audio_device/main/interface/audio_device.h
@@ -11,6 +11,6 @@
 #ifndef MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
 #define MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
 
-#include "../../include/audio_device.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 
 #endif  // MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
diff --git a/webrtc/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc b/webrtc/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc
index f46c6b296..9e4c62c5a 100644
--- a/webrtc/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc
+++ b/webrtc/modules/audio_device/test/android/audio_device_android_test/jni/audio_device_android_test.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <string.h> // memset
 #include <android/log.h>
+#include <string.h> // memset
 
-#include "org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h"
+#include "webrtc/modules/audio_device/test/android/audio_device_android_test/jni/org_webrtc_voiceengine_test_AudioDeviceAndroidTest.h"
 
-#include "../../../../interface/audio_device.h"
+#include "webrtc/modules/audio_device/main/interface/audio_device.h"
 
 #define LOG_TAG "WebRTC ADM Native"
 
diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc
index 4705f0a53..e6c726114 100644
--- a/webrtc/modules/audio_device/test/audio_device_test_api.cc
+++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc
@@ -12,15 +12,15 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "audio_device_test_defines.h"
+#include "webrtc/modules/audio_device/test/audio_device_test_defines.h"
 
-#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
-#include "modules/audio_device/audio_device_config.h"
-#include "modules/audio_device/audio_device_impl.h"
-#include "modules/audio_device/audio_device_utility.h"
-#include "system_wrappers/interface/sleep.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_impl.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/system_wrappers/interface/sleep.h"
 
 // Helper functions
 #if defined(ANDROID)
diff --git a/webrtc/modules/audio_device/test/audio_device_test_defines.h b/webrtc/modules/audio_device/test/audio_device_test_defines.h
index 4ac2a41cc..479861b12 100644
--- a/webrtc/modules/audio_device/test/audio_device_test_defines.h
+++ b/webrtc/modules/audio_device/test/audio_device_test_defines.h
@@ -11,10 +11,10 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_TEST_DEFINES_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_TEST_DEFINES_H
 
-#include "audio_device.h"
-#include "common_types.h"
-#include "process_thread.h"
-#include "trace.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #ifdef _WIN32
 #define MACRO_DEFAULT_DEVICE AudioDeviceModule::kDefaultDevice
@@ -74,4 +74,3 @@ const char* GetFilename(const char* filename);
 const char* GetResource(const char* resource);
 
 #endif  // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_TEST_DEFINES_H
-
diff --git a/webrtc/modules/audio_device/test/audio_device_test_func.cc b/webrtc/modules/audio_device/test/audio_device_test_func.cc
index 53cfbe22d..fcbbb865d 100644
--- a/webrtc/modules/audio_device/test/audio_device_test_func.cc
+++ b/webrtc/modules/audio_device/test/audio_device_test_func.cc
@@ -9,8 +9,8 @@
  */
 
 #include <stdio.h>
-#include "audio_device_test_defines.h"
-#include "func_test_manager.h"
+#include "webrtc/modules/audio_device/test/audio_device_test_defines.h"
+#include "webrtc/modules/audio_device/test/func_test_manager.h"
 
 #ifndef __GNUC__
 // Disable warning message 4996 ('scanf': This function or variable may be unsafe)
diff --git a/webrtc/modules/audio_device/test/func_test_manager.cc b/webrtc/modules/audio_device/test/func_test_manager.cc
index e48cd338e..eee85cbde 100644
--- a/webrtc/modules/audio_device/test/func_test_manager.cc
+++ b/webrtc/modules/audio_device/test/func_test_manager.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <stdio.h>
-#include <ctype.h>
 #include <cassert>
+#include <ctype.h>
+#include <stdio.h>
 #include <string.h>
 
-#include "func_test_manager.h"
-#include "gtest/gtest.h"
-#include "system_wrappers/interface/sleep.h"
-#include "testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/modules/audio_device/test/func_test_manager.h"
+#include "webrtc/system_wrappers/interface/sleep.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
-#include "modules/audio_device/audio_device_config.h"
-#include "modules/audio_device/audio_device_impl.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_impl.h"
 
 #ifndef __GNUC__
 // Disable warning message ('sprintf': name was marked as #pragma deprecated)
diff --git a/webrtc/modules/audio_device/test/func_test_manager.h b/webrtc/modules/audio_device/test/func_test_manager.h
index ea39d2823..23d26c672 100644
--- a/webrtc/modules/audio_device/test/func_test_manager.h
+++ b/webrtc/modules/audio_device/test/func_test_manager.h
@@ -11,16 +11,16 @@
 #ifndef WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H
 #define WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H
 
-#include "modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
 
 #include <string>
 
-#include "typedefs.h"
-#include "audio_device.h"
-#include "audio_device_test_defines.h"
-#include "file_wrapper.h"
-#include "list_wrapper.h"
-#include "resampler.h"
+#include "webrtc/common_audio/resampler/include/resampler.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/modules/audio_device/test/audio_device_test_defines.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/list_wrapper.h"
+#include "webrtc/typedefs.h"
 
 #if defined(WEBRTC_IOS) || defined(ANDROID)
 #define USE_SLEEP_AS_PAUSE
diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.cc b/webrtc/modules/audio_device/win/audio_device_core_win.cc
index 349dfc778..a71b82118 100644
--- a/webrtc/modules/audio_device/win/audio_device_core_win.cc
+++ b/webrtc/modules/audio_device/win/audio_device_core_win.cc
@@ -18,7 +18,7 @@
 #pragma message(">> INFO: Windows Core Audio is not supported in VS 2003")
 #endif
 
-#include "audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
 
 #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
 #pragma message(">> INFO: WEBRTC_WINDOWS_CORE_AUDIO_BUILD is defined")
@@ -28,7 +28,7 @@
 
 #ifdef WEBRTC_WINDOWS_CORE_AUDIO_BUILD
 
-#include "audio_device_core_win.h"
+#include "webrtc/modules/audio_device/win/audio_device_core_win.h"
 
 #include <assert.h>
 #include <string.h>
@@ -36,14 +36,14 @@
 #include <windows.h>
 #include <comdef.h>
 #include <dmo.h>
-#include "Functiondiscoverykeys_devpkey.h"
+#include <Functiondiscoverykeys_devpkey.h>
 #include <mmsystem.h>
 #include <strsafe.h>
 #include <uuids.h>
 
-#include "audio_device_utility.h"
-#include "system_wrappers/interface/sleep.h"
-#include "trace.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/system_wrappers/interface/sleep.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 // Macro that calls a COM method returning HRESULT value.
 #define EXIT_ON_ERROR(hres)    do { if (FAILED(hres)) goto Exit; } while(0)
diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.h b/webrtc/modules/audio_device/win/audio_device_core_win.h
index b1efec42c..7a9a5245c 100644
--- a/webrtc/modules/audio_device/win/audio_device_core_win.h
+++ b/webrtc/modules/audio_device/win/audio_device_core_win.h
@@ -13,19 +13,19 @@
 
 #if (_MSC_VER >= 1400)  // only include for VS 2005 and higher
 
-#include "audio_device_generic.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
 
 #include <wmcodecdsp.h>      // CLSID_CWMAudioAEC
                              // (must be before audioclient.h)
 #include <Audioclient.h>     // WASAPI
 #include <Audiopolicy.h>
+#include <Mmdeviceapi.h>     // MMDevice
 #include <avrt.h>            // Avrt
 #include <endpointvolume.h>
 #include <mediaobj.h>        // IMediaObject
-#include <Mmdeviceapi.h>     // MMDevice
 
-#include "critical_section_wrapper.h"
-#include "scoped_refptr.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/scoped_refptr.h"
 
 // Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority
 #pragma comment( lib, "avrt.lib" )
diff --git a/webrtc/modules/audio_device/win/audio_device_utility_win.cc b/webrtc/modules/audio_device/win/audio_device_utility_win.cc
index abbbc373c..0d0655b21 100644
--- a/webrtc/modules/audio_device/win/audio_device_utility_win.cc
+++ b/webrtc/modules/audio_device/win/audio_device_utility_win.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_device_utility_win.h"
-#include "audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/win/audio_device_utility_win.h"
 
-#include "critical_section_wrapper.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #include <windows.h>
 #include <tchar.h>
diff --git a/webrtc/modules/audio_device/win/audio_device_utility_win.h b/webrtc/modules/audio_device/win/audio_device_utility_win.h
index b483a61d1..9f836eef1 100644
--- a/webrtc/modules/audio_device/win/audio_device_utility_win.h
+++ b/webrtc/modules/audio_device/win/audio_device_utility_win.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_WIN_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_UTILITY_WIN_H
 
-#include "audio_device_utility.h"
-#include "audio_device.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
 #include <windows.h>
 
 namespace webrtc
diff --git a/webrtc/modules/audio_device/win/audio_device_wave_win.cc b/webrtc/modules/audio_device/win/audio_device_wave_win.cc
index 7a5cd69fa..6efd6e1d7 100644
--- a/webrtc/modules/audio_device/win/audio_device_wave_win.cc
+++ b/webrtc/modules/audio_device/win/audio_device_wave_win.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_device_utility.h"
-#include "audio_device_wave_win.h"
-#include "audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_config.h"
+#include "webrtc/modules/audio_device/audio_device_utility.h"
+#include "webrtc/modules/audio_device/win/audio_device_wave_win.h"
 
-#include "trace.h"
-#include "thread_wrapper.h"
-#include "event_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 #include <windows.h>
 #include <objbase.h>    // CoTaskMemAlloc, CoTaskMemFree
@@ -3833,4 +3833,3 @@ bool AudioDeviceWindowsWave::KeyPressed() const{
   return (key_down > 0);
 }
 }  // namespace webrtc
-
diff --git a/webrtc/modules/audio_device/win/audio_device_wave_win.h b/webrtc/modules/audio_device/win/audio_device_wave_win.h
index 161a30690..480bbcbc7 100644
--- a/webrtc/modules/audio_device/win/audio_device_wave_win.h
+++ b/webrtc/modules/audio_device/win/audio_device_wave_win.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H
 
-#include "audio_device_generic.h"
-#include "audio_mixer_manager_win.h"
+#include "webrtc/modules/audio_device/audio_device_generic.h"
+#include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h"
 
 #pragma comment( lib, "winmm.lib" )
 
diff --git a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc
index 0c4b01e44..80f43cdf3 100644
--- a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc
+++ b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "audio_mixer_manager_win.h"
-#include "trace.h"
+#include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
-#include <strsafe.h>    // StringCchCopy(), StringCchCat(), StringCchPrintf()
 #include <cassert>      // assert()
+#include <strsafe.h>    // StringCchCopy(), StringCchCat(), StringCchPrintf()
 
 #ifdef _WIN32
 // removes warning: "reinterpret_cast: conversion from 'UINT' to 'HMIXEROBJ'
diff --git a/webrtc/modules/audio_device/win/audio_mixer_manager_win.h b/webrtc/modules/audio_device/win/audio_mixer_manager_win.h
index fc507c4c0..52b46e020 100644
--- a/webrtc/modules/audio_device/win/audio_mixer_manager_win.h
+++ b/webrtc/modules/audio_device/win/audio_mixer_manager_win.h
@@ -11,9 +11,9 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_WIN_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_WIN_H
 
-#include "typedefs.h"
-#include "audio_device.h"
-#include "critical_section_wrapper.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include <Windows.h>
 #include <mmsystem.h>