Fixing WebRTC after moving from src/webrtc to src/
In https://webrtc-review.googlesource.com/c/src/+/1560 we moved WebRTC
from src/webrtc to src/ (in order to preserve an healthy git history).
This CL takes care of fixing header guards, #include paths, etc...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
TBR=tommi@webrtc.org
Bug: chromium:611808
Change-Id: Iea91618212bee0af16aa3f05071eab8f93706578
Reviewed-on: https://webrtc-review.googlesource.com/1561
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19846}diff --git a/system_wrappers/source/aligned_array_unittest.cc b/system_wrappers/source/aligned_array_unittest.cc
index 5f3cdf7..e5a3c18 100644
--- a/system_wrappers/source/aligned_array_unittest.cc
+++ b/system_wrappers/source/aligned_array_unittest.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/aligned_array.h"
+#include "system_wrappers/include/aligned_array.h"
#include <stdint.h>
-#include "webrtc/test/gtest.h"
+#include "test/gtest.h"
namespace {
diff --git a/system_wrappers/source/aligned_malloc.cc b/system_wrappers/source/aligned_malloc.cc
index f700f8b..b7f1dfa 100644
--- a/system_wrappers/source/aligned_malloc.cc
+++ b/system_wrappers/source/aligned_malloc.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/aligned_malloc.h"
+#include "system_wrappers/include/aligned_malloc.h"
#include <memory.h>
#include <stdlib.h>
@@ -19,7 +19,7 @@
#include <stdint.h>
#endif
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
// Reference on memory alignment:
// http://stackoverflow.com/questions/227897/solve-the-memory-alignment-in-c-interview-question-that-stumped-me
diff --git a/system_wrappers/source/aligned_malloc_unittest.cc b/system_wrappers/source/aligned_malloc_unittest.cc
index fbd5d6e..f9a8d5a 100644
--- a/system_wrappers/source/aligned_malloc_unittest.cc
+++ b/system_wrappers/source/aligned_malloc_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/aligned_malloc.h"
+#include "system_wrappers/include/aligned_malloc.h"
#include <memory>
@@ -18,8 +18,8 @@
#include <stdint.h>
#endif
-#include "webrtc/test/gtest.h"
-#include "webrtc/typedefs.h"
+#include "test/gtest.h"
+#include "typedefs.h"
namespace webrtc {
diff --git a/system_wrappers/source/atomic32_darwin.cc b/system_wrappers/source/atomic32_darwin.cc
index 7c77d09..b745af5 100644
--- a/system_wrappers/source/atomic32_darwin.cc
+++ b/system_wrappers/source/atomic32_darwin.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/atomic32.h"
+#include "system_wrappers/include/atomic32.h"
#include <assert.h>
#include <libkern/OSAtomic.h>
#include <stdlib.h>
-#include "webrtc/common_types.h"
+#include "common_types.h"
namespace webrtc {
diff --git a/system_wrappers/source/atomic32_non_darwin_unix.cc b/system_wrappers/source/atomic32_non_darwin_unix.cc
index fbc9c29..5424ab0 100644
--- a/system_wrappers/source/atomic32_non_darwin_unix.cc
+++ b/system_wrappers/source/atomic32_non_darwin_unix.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/atomic32.h"
+#include "system_wrappers/include/atomic32.h"
#include <assert.h>
#include <inttypes.h>
#include <malloc.h>
-#include "webrtc/common_types.h"
+#include "common_types.h"
namespace webrtc {
diff --git a/system_wrappers/source/atomic32_win.cc b/system_wrappers/source/atomic32_win.cc
index cd4ce08..cce5dcd 100644
--- a/system_wrappers/source/atomic32_win.cc
+++ b/system_wrappers/source/atomic32_win.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/atomic32.h"
+#include "system_wrappers/include/atomic32.h"
#include <assert.h>
#include <windows.h>
-#include "webrtc/common_types.h"
+#include "common_types.h"
namespace webrtc {
diff --git a/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc
index f4533fb..184b35e 100644
--- a/system_wrappers/source/clock.cc
+++ b/system_wrappers/source/clock.cc
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/clock.h"
+#include "system_wrappers/include/clock.h"
#if defined(_WIN32)
// Windows needs to be included before mmsystem.h
-#include "webrtc/rtc_base/win32.h"
+#include "rtc_base/win32.h"
#include <MMSystem.h>
#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
#include <sys/time.h>
#include <time.h>
#endif
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/timeutils.h"
+#include "system_wrappers/include/rw_lock_wrapper.h"
namespace webrtc {
diff --git a/system_wrappers/source/clock_unittest.cc b/system_wrappers/source/clock_unittest.cc
index dcd9327..f7b0ed7 100644
--- a/system_wrappers/source/clock_unittest.cc
+++ b/system_wrappers/source/clock_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/clock.h"
+#include "system_wrappers/include/clock.h"
-#include "webrtc/test/gtest.h"
+#include "test/gtest.h"
namespace webrtc {
diff --git a/system_wrappers/source/cpu_features.cc b/system_wrappers/source/cpu_features.cc
index 49840eb..2fc97f8 100644
--- a/system_wrappers/source/cpu_features.cc
+++ b/system_wrappers/source/cpu_features.cc
@@ -10,13 +10,13 @@
// Parts of this file derived from Chromium's base/cpu.cc.
-#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(_MSC_VER)
#include <intrin.h>
#endif
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
// No CPU feature is available => straight C path.
int GetCPUInfoNoASM(CPUFeature feature) {
diff --git a/system_wrappers/source/cpu_features_linux.c b/system_wrappers/source/cpu_features_linux.c
index 112ad03..9c56450 100644
--- a/system_wrappers/source/cpu_features_linux.c
+++ b/system_wrappers/source/cpu_features_linux.c
@@ -22,7 +22,7 @@
#include <errno.h>
#include <link.h>
#endif
-#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
#if defined(WEBRTC_ARCH_ARM_FAMILY)
#include <asm/hwcap.h>
diff --git a/system_wrappers/source/cpu_info.cc b/system_wrappers/source/cpu_info.cc
index 590d2d9..b96369d 100644
--- a/system_wrappers/source/cpu_info.cc
+++ b/system_wrappers/source/cpu_info.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/cpu_info.h"
+#include "system_wrappers/include/cpu_info.h"
#if defined(WEBRTC_WIN)
#include <winsock2.h>
@@ -23,7 +23,7 @@
#include <sys/sysctl.h>
#endif
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/logging.h"
namespace internal {
static int DetectNumberOfCores() {
diff --git a/system_wrappers/source/event.cc b/system_wrappers/source/event.cc
index 2f08a1a..1bbd01f 100644
--- a/system_wrappers/source/event.cc
+++ b/system_wrappers/source/event.cc
@@ -8,21 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/event_wrapper.h"
+#include "system_wrappers/include/event_wrapper.h"
#if defined(_WIN32)
#include <windows.h>
-#include "webrtc/system_wrappers/source/event_timer_win.h"
+#include "system_wrappers/source/event_timer_win.h"
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
#include <ApplicationServices/ApplicationServices.h>
#include <pthread.h>
-#include "webrtc/system_wrappers/source/event_timer_posix.h"
+#include "system_wrappers/source/event_timer_posix.h"
#else
#include <pthread.h>
-#include "webrtc/system_wrappers/source/event_timer_posix.h"
+#include "system_wrappers/source/event_timer_posix.h"
#endif
-#include "webrtc/rtc_base/event.h"
+#include "rtc_base/event.h"
namespace webrtc {
diff --git a/system_wrappers/source/event_timer_posix.cc b/system_wrappers/source/event_timer_posix.cc
index dead7c9..bc663ad 100644
--- a/system_wrappers/source/event_timer_posix.cc
+++ b/system_wrappers/source/event_timer_posix.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/source/event_timer_posix.h"
+#include "system_wrappers/source/event_timer_posix.h"
#include <errno.h>
#include <pthread.h>
@@ -18,7 +18,7 @@
#include <sys/time.h>
#include <unistd.h>
-#include "webrtc/rtc_base/checks.h"
+#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/system_wrappers/source/event_timer_posix.h b/system_wrappers/source/event_timer_posix.h
index 1b01e4b..4de7422 100644
--- a/system_wrappers/source/event_timer_posix.h
+++ b/system_wrappers/source/event_timer_posix.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_
-#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_
+#ifndef SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_
+#define SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_
-#include "webrtc/system_wrappers/include/event_wrapper.h"
+#include "system_wrappers/include/event_wrapper.h"
#include <memory>
#include <pthread.h>
#include <time.h>
-#include "webrtc/rtc_base/platform_thread.h"
+#include "rtc_base/platform_thread.h"
namespace webrtc {
@@ -64,4 +64,4 @@
} // namespace webrtc
-#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_
+#endif // SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_
diff --git a/system_wrappers/source/event_timer_posix_unittest.cc b/system_wrappers/source/event_timer_posix_unittest.cc
index 5feac80..e0c5cbc 100644
--- a/system_wrappers/source/event_timer_posix_unittest.cc
+++ b/system_wrappers/source/event_timer_posix_unittest.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/source/event_timer_posix.h"
+#include "system_wrappers/source/event_timer_posix.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/test/gtest.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/event.h"
+#include "test/gtest.h"
namespace webrtc {
diff --git a/system_wrappers/source/event_timer_win.cc b/system_wrappers/source/event_timer_win.cc
index 4c58698..19ed3fa 100644
--- a/system_wrappers/source/event_timer_win.cc
+++ b/system_wrappers/source/event_timer_win.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/source/event_timer_win.h"
+#include "system_wrappers/source/event_timer_win.h"
#include "Mmsystem.h"
diff --git a/system_wrappers/source/event_timer_win.h b/system_wrappers/source/event_timer_win.h
index 163cdde..732dec7 100644
--- a/system_wrappers/source/event_timer_win.h
+++ b/system_wrappers/source/event_timer_win.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_
-#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_
+#ifndef SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_
+#define SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_
#include <windows.h>
-#include "webrtc/system_wrappers/include/event_wrapper.h"
+#include "system_wrappers/include/event_wrapper.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
namespace webrtc {
@@ -37,4 +37,4 @@
} // namespace webrtc
-#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_
+#endif // SYSTEM_WRAPPERS_SOURCE_EVENT_WIN_H_
diff --git a/system_wrappers/source/field_trial_default.cc b/system_wrappers/source/field_trial_default.cc
index 0e2c286..94e56b5 100644
--- a/system_wrappers/source/field_trial_default.cc
+++ b/system_wrappers/source/field_trial_default.cc
@@ -7,8 +7,8 @@
// be found in the AUTHORS file in the root of the source tree.
//
-#include "webrtc/system_wrappers/include/field_trial.h"
-#include "webrtc/system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
+#include "system_wrappers/include/field_trial_default.h"
#include <string>
diff --git a/system_wrappers/source/file_impl.cc b/system_wrappers/source/file_impl.cc
index f62e712..350aaeb 100644
--- a/system_wrappers/source/file_impl.cc
+++ b/system_wrappers/source/file_impl.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/file_wrapper.h"
+#include "system_wrappers/include/file_wrapper.h"
#ifdef _WIN32
#include <Windows.h>
@@ -17,7 +17,7 @@
#include <string.h>
#endif
-#include "webrtc/rtc_base/checks.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace {
diff --git a/system_wrappers/source/logcat_trace_context.cc b/system_wrappers/source/logcat_trace_context.cc
index 7ad1b1d..cb43ddd 100644
--- a/system_wrappers/source/logcat_trace_context.cc
+++ b/system_wrappers/source/logcat_trace_context.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/logcat_trace_context.h"
+#include "system_wrappers/include/logcat_trace_context.h"
#include <android/log.h>
#include <assert.h>
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/logging.h"
namespace webrtc {
diff --git a/system_wrappers/source/metrics_default.cc b/system_wrappers/source/metrics_default.cc
index 6e5715e..3263ec0 100644
--- a/system_wrappers/source/metrics_default.cc
+++ b/system_wrappers/source/metrics_default.cc
@@ -7,13 +7,13 @@
// be found in the AUTHORS file in the root of the source tree.
//
-#include "webrtc/system_wrappers/include/metrics_default.h"
+#include "system_wrappers/include/metrics_default.h"
#include <algorithm>
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/thread_annotations.h"
-#include "webrtc/system_wrappers/include/metrics.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/thread_annotations.h"
+#include "system_wrappers/include/metrics.h"
// Default implementation of histogram methods for WebRTC clients that do not
// want to provide their own implementation.
diff --git a/system_wrappers/source/metrics_default_unittest.cc b/system_wrappers/source/metrics_default_unittest.cc
index 0414bc7..dfac863 100644
--- a/system_wrappers/source/metrics_default_unittest.cc
+++ b/system_wrappers/source/metrics_default_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
-#include "webrtc/test/gtest.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/metrics_default.h"
+#include "test/gtest.h"
namespace webrtc {
diff --git a/system_wrappers/source/metrics_unittest.cc b/system_wrappers/source/metrics_unittest.cc
index d7be229..0eeda0d 100644
--- a/system_wrappers/source/metrics_unittest.cc
+++ b/system_wrappers/source/metrics_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/metrics.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
-#include "webrtc/test/gtest.h"
+#include "system_wrappers/include/metrics.h"
+#include "system_wrappers/include/metrics_default.h"
+#include "test/gtest.h"
namespace webrtc {
namespace {
diff --git a/system_wrappers/source/ntp_time_unittest.cc b/system_wrappers/source/ntp_time_unittest.cc
index 9a2a926..3fb1743 100644
--- a/system_wrappers/source/ntp_time_unittest.cc
+++ b/system_wrappers/source/ntp_time_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/system_wrappers/include/ntp_time.h"
-#include "webrtc/test/gtest.h"
+#include "system_wrappers/include/clock.h"
+#include "system_wrappers/include/ntp_time.h"
+#include "test/gtest.h"
namespace webrtc {
namespace {
diff --git a/system_wrappers/source/rtp_to_ntp_estimator.cc b/system_wrappers/source/rtp_to_ntp_estimator.cc
index 4227599..3496fc0 100644
--- a/system_wrappers/source/rtp_to_ntp_estimator.cc
+++ b/system_wrappers/source/rtp_to_ntp_estimator.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h"
+#include "system_wrappers/include/rtp_to_ntp_estimator.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
namespace {
diff --git a/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc b/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc
index cfcb13b..4084620 100644
--- a/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc
+++ b/system_wrappers/source/rtp_to_ntp_estimator_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h"
-#include "webrtc/test/gtest.h"
+#include "system_wrappers/include/rtp_to_ntp_estimator.h"
+#include "test/gtest.h"
namespace webrtc {
namespace {
diff --git a/system_wrappers/source/rw_lock.cc b/system_wrappers/source/rw_lock.cc
index ff53e8d..c38c44a 100644
--- a/system_wrappers/source/rw_lock.cc
+++ b/system_wrappers/source/rw_lock.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
+#include "system_wrappers/include/rw_lock_wrapper.h"
#include <assert.h>
#if defined(_WIN32)
-#include "webrtc/system_wrappers/source/rw_lock_win.h"
+#include "system_wrappers/source/rw_lock_win.h"
#else
-#include "webrtc/system_wrappers/source/rw_lock_posix.h"
+#include "system_wrappers/source/rw_lock_posix.h"
#endif
namespace webrtc {
diff --git a/system_wrappers/source/rw_lock_posix.cc b/system_wrappers/source/rw_lock_posix.cc
index cdcb7fb..f1b743b 100644
--- a/system_wrappers/source/rw_lock_posix.cc
+++ b/system_wrappers/source/rw_lock_posix.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/source/rw_lock_posix.h"
+#include "system_wrappers/source/rw_lock_posix.h"
namespace webrtc {
diff --git a/system_wrappers/source/rw_lock_posix.h b/system_wrappers/source/rw_lock_posix.h
index 0ce7305..eec7cb7 100644
--- a/system_wrappers/source/rw_lock_posix.h
+++ b/system_wrappers/source/rw_lock_posix.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_
-#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_
+#ifndef SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_
+#define SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_
-#include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
-#include "webrtc/typedefs.h"
+#include "system_wrappers/include/rw_lock_wrapper.h"
+#include "typedefs.h"
#include <pthread.h>
@@ -38,4 +38,4 @@
} // namespace webrtc
-#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_
+#endif // SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_
diff --git a/system_wrappers/source/rw_lock_win.cc b/system_wrappers/source/rw_lock_win.cc
index 2372b9b..1d222d2 100644
--- a/system_wrappers/source/rw_lock_win.cc
+++ b/system_wrappers/source/rw_lock_win.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/source/rw_lock_win.h"
+#include "system_wrappers/source/rw_lock_win.h"
-#include "webrtc/system_wrappers/include/trace.h"
+#include "system_wrappers/include/trace.h"
namespace webrtc {
diff --git a/system_wrappers/source/rw_lock_win.h b/system_wrappers/source/rw_lock_win.h
index c279eab..41537ba 100644
--- a/system_wrappers/source/rw_lock_win.h
+++ b/system_wrappers/source/rw_lock_win.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_
-#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_
+#ifndef SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_
+#define SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_
-#include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
+#include "system_wrappers/include/rw_lock_wrapper.h"
#include <Windows.h>
@@ -37,4 +37,4 @@
} // namespace webrtc
-#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_
+#endif // SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_
diff --git a/system_wrappers/source/sleep.cc b/system_wrappers/source/sleep.cc
index 181381f..e2fa486 100644
--- a/system_wrappers/source/sleep.cc
+++ b/system_wrappers/source/sleep.cc
@@ -9,7 +9,7 @@
*/
// An OS-independent sleep function.
-#include "webrtc/system_wrappers/include/sleep.h"
+#include "system_wrappers/include/sleep.h"
#ifdef _WIN32
// For Sleep()
diff --git a/system_wrappers/source/timestamp_extrapolator.cc b/system_wrappers/source/timestamp_extrapolator.cc
index b9243ca..98f6a7b 100644
--- a/system_wrappers/source/timestamp_extrapolator.cc
+++ b/system_wrappers/source/timestamp_extrapolator.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/include/timestamp_extrapolator.h"
+#include "system_wrappers/include/timestamp_extrapolator.h"
#include <algorithm>
diff --git a/system_wrappers/source/trace_impl.cc b/system_wrappers/source/trace_impl.cc
index 513327e..c1ec984 100644
--- a/system_wrappers/source/trace_impl.cc
+++ b/system_wrappers/source/trace_impl.cc
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/source/trace_impl.h"
+#include "system_wrappers/source/trace_impl.h"
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
-#include "webrtc/rtc_base/atomicops.h"
-#include "webrtc/rtc_base/platform_thread.h"
+#include "rtc_base/atomicops.h"
+#include "rtc_base/platform_thread.h"
#ifdef _WIN32
-#include "webrtc/system_wrappers/source/trace_win.h"
+#include "system_wrappers/source/trace_win.h"
#else
-#include "webrtc/system_wrappers/source/trace_posix.h"
+#include "system_wrappers/source/trace_posix.h"
#endif // _WIN32
#define KEY_LEN_CHARS 31
diff --git a/system_wrappers/source/trace_impl.h b/system_wrappers/source/trace_impl.h
index 0e36aff..3e730f6 100644
--- a/system_wrappers/source/trace_impl.h
+++ b/system_wrappers/source/trace_impl.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_
-#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_
+#ifndef SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_
+#define SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_
#include <memory>
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/system_wrappers/include/event_wrapper.h"
-#include "webrtc/system_wrappers/include/file_wrapper.h"
-#include "webrtc/system_wrappers/include/static_instance.h"
-#include "webrtc/system_wrappers/include/trace.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/platform_thread.h"
+#include "system_wrappers/include/event_wrapper.h"
+#include "system_wrappers/include/file_wrapper.h"
+#include "system_wrappers/include/static_instance.h"
+#include "system_wrappers/include/trace.h"
namespace webrtc {
@@ -102,4 +102,4 @@
} // namespace webrtc
-#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_
+#endif // SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_
diff --git a/system_wrappers/source/trace_posix.cc b/system_wrappers/source/trace_posix.cc
index f181ad2..a017333 100644
--- a/system_wrappers/source/trace_posix.cc
+++ b/system_wrappers/source/trace_posix.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/source/trace_posix.h"
+#include "system_wrappers/source/trace_posix.h"
#include <assert.h>
#include <stdarg.h>
diff --git a/system_wrappers/source/trace_posix.h b/system_wrappers/source/trace_posix.h
index 4387895..357d226 100644
--- a/system_wrappers/source/trace_posix.h
+++ b/system_wrappers/source/trace_posix.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
-#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
+#ifndef SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
+#define SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/system_wrappers/source/trace_impl.h"
+#include "rtc_base/criticalsection.h"
+#include "system_wrappers/source/trace_impl.h"
namespace webrtc {
@@ -36,4 +36,4 @@
} // namespace webrtc
-#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
+#endif // SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
diff --git a/system_wrappers/source/trace_win.cc b/system_wrappers/source/trace_win.cc
index 4caedfc..2becb78 100644
--- a/system_wrappers/source/trace_win.cc
+++ b/system_wrappers/source/trace_win.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/system_wrappers/source/trace_win.h"
+#include "system_wrappers/source/trace_win.h"
#include <assert.h>
#include <stdarg.h>
diff --git a/system_wrappers/source/trace_win.h b/system_wrappers/source/trace_win.h
index 1311b23..b1a41f2 100644
--- a/system_wrappers/source/trace_win.h
+++ b/system_wrappers/source/trace_win.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_
-#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_
+#ifndef SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_
+#define SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_
#include <stdio.h>
#include <windows.h>
-#include "webrtc/system_wrappers/source/trace_impl.h"
+#include "system_wrappers/source/trace_impl.h"
namespace webrtc {
@@ -33,4 +33,4 @@
} // namespace webrtc
-#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_
+#endif // SYSTEM_WRAPPERS_SOURCE_TRACE_WIN_H_