Include files from webrtc/.. paths in system_wrappers/
BUG=1662
R=henrikg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1550004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4111 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/system_wrappers/interface/aligned_malloc.h b/system_wrappers/interface/aligned_malloc.h
index 662acab..6409999 100644
--- a/system_wrappers/interface/aligned_malloc.h
+++ b/system_wrappers/interface/aligned_malloc.h
@@ -19,7 +19,7 @@
#include <stddef.h>
-#include "system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
diff --git a/system_wrappers/interface/atomic32.h b/system_wrappers/interface/atomic32.h
index 97eca29..9a28d41 100644
--- a/system_wrappers/interface/atomic32.h
+++ b/system_wrappers/interface/atomic32.h
@@ -18,8 +18,8 @@
#include <cstddef>
-#include "common_types.h"
-#include "constructor_magic.h"
+#include "webrtc/common_types.h"
+#include "webrtc/system_wrappers/interface/constructor_magic.h"
namespace webrtc {
diff --git a/system_wrappers/interface/cpu_info.h b/system_wrappers/interface/cpu_info.h
index cf1025f..7086427 100644
--- a/system_wrappers/interface/cpu_info.h
+++ b/system_wrappers/interface/cpu_info.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CPU_INFO_H_
#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CPU_INFO_H_
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/system_wrappers/interface/data_log_c.h b/system_wrappers/interface/data_log_c.h
index 557e2cd..4ff8329 100644
--- a/system_wrappers/interface/data_log_c.h
+++ b/system_wrappers/interface/data_log_c.h
@@ -17,7 +17,7 @@
#include <stddef.h> // size_t
-#include "webrtc/typedefs.h" // NOLINT(build/include)
+#include "webrtc/typedefs.h"
#ifdef __cplusplus
extern "C" {
diff --git a/system_wrappers/interface/ref_count.h b/system_wrappers/interface/ref_count.h
index 5112bd9..6861666 100644
--- a/system_wrappers/interface/ref_count.h
+++ b/system_wrappers/interface/ref_count.h
@@ -11,7 +11,7 @@
#ifndef SYSTEM_WRAPPERS_INTERFACE_REF_COUNT_H_
#define SYSTEM_WRAPPERS_INTERFACE_REF_COUNT_H_
-#include "system_wrappers/interface/atomic32.h"
+#include "webrtc/system_wrappers/interface/atomic32.h"
namespace webrtc {
diff --git a/system_wrappers/interface/tick_util.h b/system_wrappers/interface/tick_util.h
index 38d95f5..c742c71 100644
--- a/system_wrappers/interface/tick_util.h
+++ b/system_wrappers/interface/tick_util.h
@@ -15,7 +15,7 @@
#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_TICK_UTIL_H_
#if _WIN32
-// Note: These includes must be in this order since mmsystem depends on windows.
+// Note: The Windows header must always be included before mmsystem.h
#include <windows.h>
#include <mmsystem.h>
#elif WEBRTC_LINUX
diff --git a/system_wrappers/source/aligned_malloc.cc b/system_wrappers/source/aligned_malloc.cc
index c2f8f70..258b6be 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 "aligned_malloc.h"
+#include "webrtc/system_wrappers/interface/aligned_malloc.h"
#include <memory.h>
#include <stdlib.h>
@@ -19,7 +19,7 @@
#include <stdint.h>
#endif
-#include "typedefs.h"
+#include "webrtc/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 42e13c5..10e08aa 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 "system_wrappers/interface/aligned_malloc.h"
+#include "webrtc/system_wrappers/interface/aligned_malloc.h"
#if _WIN32
#include <windows.h>
@@ -16,9 +16,9 @@
#include <stdint.h>
#endif
-#include "typedefs.h" // NOLINT
+#include "webrtc/typedefs.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
// Returns true if |size| and |alignment| are valid combinations.
bool CorrectUsage(size_t size, size_t alignment) {
diff --git a/system_wrappers/source/android/cpu-features.c b/system_wrappers/source/android/cpu-features.c
index 6a5cd8f..efe7b95 100644
--- a/system_wrappers/source/android/cpu-features.c
+++ b/system_wrappers/source/android/cpu-features.c
@@ -12,12 +12,13 @@
#ifdef __arm__
#include <machine/cpu-features.h>
#endif
+#include <errno.h>
+#include <fcntl.h>
#include <pthread.h>
-#include "cpu-features.h"
#include <stdio.h>
#include <stdlib.h>
-#include <fcntl.h>
-#include <errno.h>
+
+#include "webrtc/system_wrappers/source/android/cpu-features.h"
static pthread_once_t g_once;
static AndroidCpuFamily g_cpuFamily;
diff --git a/system_wrappers/source/atomic32_mac.cc b/system_wrappers/source/atomic32_mac.cc
index 9c35058..f03c1fb 100644
--- a/system_wrappers/source/atomic32_mac.cc
+++ b/system_wrappers/source/atomic32_mac.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "atomic32.h"
+#include "webrtc/system_wrappers/interface/atomic32.h"
#include <assert.h>
#include <libkern/OSAtomic.h>
#include <stdlib.h>
-#include "common_types.h"
+#include "webrtc/common_types.h"
namespace webrtc {
diff --git a/system_wrappers/source/atomic32_posix.cc b/system_wrappers/source/atomic32_posix.cc
index ebfe19f..38f36e0 100644
--- a/system_wrappers/source/atomic32_posix.cc
+++ b/system_wrappers/source/atomic32_posix.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "atomic32.h"
+#include "webrtc/system_wrappers/interface/atomic32.h"
#include <assert.h>
#include <inttypes.h>
#include <malloc.h>
-#include "common_types.h"
+#include "webrtc/common_types.h"
namespace webrtc {
diff --git a/system_wrappers/source/atomic32_win.cc b/system_wrappers/source/atomic32_win.cc
index dd61035..2f0cf18 100644
--- a/system_wrappers/source/atomic32_win.cc
+++ b/system_wrappers/source/atomic32_win.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "atomic32.h"
+#include "webrtc/system_wrappers/interface/atomic32.h"
#include <assert.h>
#include <windows.h>
-#include "common_types.h"
-#include "compile_assert.h"
+#include "webrtc/common_types.h"
+#include "webrtc/system_wrappers/interface/compile_assert.h"
namespace webrtc {
diff --git a/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc
index 9b017b8..c74c747 100644
--- a/system_wrappers/source/clock.cc
+++ b/system_wrappers/source/clock.cc
@@ -11,6 +11,7 @@
#include "webrtc/system_wrappers/interface/clock.h"
#if defined(_WIN32)
+// Windows needs to be included before mmsystem.h
#include <Windows.h>
#include <WinSock.h>
#include <MMSystem.h>
diff --git a/system_wrappers/source/condition_variable_posix.cc b/system_wrappers/source/condition_variable_posix.cc
index a5df728..41e8023 100644
--- a/system_wrappers/source/condition_variable_posix.cc
+++ b/system_wrappers/source/condition_variable_posix.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "condition_variable_posix.h"
+#include "webrtc/system_wrappers/source/condition_variable_posix.h"
#include <errno.h>
#if defined(WEBRTC_LINUX)
@@ -17,7 +17,7 @@
#include <sys/time.h>
#endif
-#include "critical_section_posix.h"
+#include "webrtc/system_wrappers/source/critical_section_posix.h"
namespace webrtc {
diff --git a/system_wrappers/source/condition_variable_posix.h b/system_wrappers/source/condition_variable_posix.h
index 07f7605..53adcdb 100644
--- a/system_wrappers/source/condition_variable_posix.h
+++ b/system_wrappers/source/condition_variable_posix.h
@@ -13,7 +13,7 @@
#include <pthread.h>
-#include "condition_variable_wrapper.h"
+#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h"
namespace webrtc {
diff --git a/system_wrappers/source/condition_variable_unittest.cc b/system_wrappers/source/condition_variable_unittest.cc
index 08491fe..0d287b7 100644
--- a/system_wrappers/source/condition_variable_unittest.cc
+++ b/system_wrappers/source/condition_variable_unittest.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "system_wrappers/interface/condition_variable_wrapper.h"
+#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h"
-#include "gtest/gtest.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/thread_wrapper.h"
-#include "system_wrappers/interface/trace.h"
-#include "system_wrappers/source/unittest_utilities.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/source/unittest_utilities.h"
namespace webrtc {
diff --git a/system_wrappers/source/cpu_features.cc b/system_wrappers/source/cpu_features.cc
index 61c1360..b924d77 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 "system_wrappers/interface/cpu_features_wrapper.h"
+#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h"
#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(_MSC_VER)
#include <intrin.h>
#endif
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
// No CPU feature is available => straight C path.
int GetCPUInfoNoASM(CPUFeature feature) {
diff --git a/system_wrappers/source/cpu_features_android.c b/system_wrappers/source/cpu_features_android.c
index 8f5e3ea..9b44d02 100644
--- a/system_wrappers/source/cpu_features_android.c
+++ b/system_wrappers/source/cpu_features_android.c
@@ -11,7 +11,7 @@
#if defined(WEBRTC_CHROMIUM_BUILD)
#include <cpu-features.h>
#else
-#include "android/cpu-features.h"
+#include "webrtc/system_wrappers/source/android/cpu-features.h"
#endif // defined(WEBRTC_CHROMIUM_BUILD)
uint64_t WebRtc_GetCPUFeaturesARM(void) {
diff --git a/system_wrappers/source/cpu_info.cc b/system_wrappers/source/cpu_info.cc
index d858ad5..54fb8d5 100644
--- a/system_wrappers/source/cpu_info.cc
+++ b/system_wrappers/source/cpu_info.cc
@@ -18,11 +18,11 @@
#elif defined(WEBRTC_ANDROID)
// Not implemented yet, might be possible to use Linux implementation
#else // defined(WEBRTC_LINUX)
-#include <unistd.h> // required for get_nprocs() with uClibc
#include <sys/sysinfo.h>
+#include <unistd.h> // required for get_nprocs() with uClibc
#endif
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
diff --git a/system_wrappers/source/critical_section_unittest.cc b/system_wrappers/source/critical_section_unittest.cc
index 1e4f665..40df570 100644
--- a/system_wrappers/source/critical_section_unittest.cc
+++ b/system_wrappers/source/critical_section_unittest.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/sleep.h"
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
diff --git a/system_wrappers/source/critical_section_win.h b/system_wrappers/source/critical_section_win.h
index 760cc10..be4dd74 100644
--- a/system_wrappers/source/critical_section_win.h
+++ b/system_wrappers/source/critical_section_win.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WIN_H_
#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WIN_H_
-#include "webrtc/typedefs.h"
-#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include <windows.h>
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/system_wrappers/source/data_log.cc b/system_wrappers/source/data_log.cc
index 9bf9650..fc267ae 100644
--- a/system_wrappers/source/data_log.cc
+++ b/system_wrappers/source/data_log.cc
@@ -11,6 +11,7 @@
#include "webrtc/system_wrappers/interface/data_log.h"
#include <assert.h>
+
#include <algorithm>
#include <list>
diff --git a/system_wrappers/source/data_log_helpers_unittest.cc b/system_wrappers/source/data_log_helpers_unittest.cc
index 3e430c9..820d8cb 100644
--- a/system_wrappers/source/data_log_helpers_unittest.cc
+++ b/system_wrappers/source/data_log_helpers_unittest.cc
@@ -12,7 +12,7 @@
#include <string>
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
using ::webrtc::DataLog;
diff --git a/system_wrappers/source/data_log_unittest.cc b/system_wrappers/source/data_log_unittest.cc
index fd61e79..e362269 100644
--- a/system_wrappers/source/data_log_unittest.cc
+++ b/system_wrappers/source/data_log_unittest.cc
@@ -13,7 +13,7 @@
#include <map>
#include <string>
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/data_log_c.h"
#include "webrtc/system_wrappers/source/data_log_c_helpers_unittest.h"
diff --git a/system_wrappers/source/data_log_unittest_disabled.cc b/system_wrappers/source/data_log_unittest_disabled.cc
index 31d753e..935f3d6 100644
--- a/system_wrappers/source/data_log_unittest_disabled.cc
+++ b/system_wrappers/source/data_log_unittest_disabled.cc
@@ -12,7 +12,7 @@
#include <cstdio>
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
using ::webrtc::DataLog;
diff --git a/system_wrappers/source/event_tracer_unittest.cc b/system_wrappers/source/event_tracer_unittest.cc
index b9a99ef..643f67e 100644
--- a/system_wrappers/source/event_tracer_unittest.cc
+++ b/system_wrappers/source/event_tracer_unittest.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/interface/event_tracer.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/static_instance.h"
#include "webrtc/system_wrappers/interface/trace_event.h"
diff --git a/system_wrappers/source/list_unittest.cc b/system_wrappers/source/list_unittest.cc
index 7985eab..1e4f922 100644
--- a/system_wrappers/source/list_unittest.cc
+++ b/system_wrappers/source/list_unittest.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/interface/list_wrapper.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
using ::webrtc::ListWrapper;
diff --git a/system_wrappers/source/logging.cc b/system_wrappers/source/logging.cc
index 19c5cef..d168a3c 100644
--- a/system_wrappers/source/logging.cc
+++ b/system_wrappers/source/logging.cc
@@ -11,6 +11,7 @@
#include "webrtc/system_wrappers/interface/logging.h"
#include <string.h>
+
#include <sstream>
#include "webrtc/common_types.h"
diff --git a/system_wrappers/source/logging_unittest.cc b/system_wrappers/source/logging_unittest.cc
index de790a5..ae92f0b 100644
--- a/system_wrappers/source/logging_unittest.cc
+++ b/system_wrappers/source/logging_unittest.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/interface/logging.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
diff --git a/system_wrappers/source/map_unittest.cc b/system_wrappers/source/map_unittest.cc
index 6014458..b82084d 100644
--- a/system_wrappers/source/map_unittest.cc
+++ b/system_wrappers/source/map_unittest.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/interface/map_wrapper.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
using ::webrtc::MapWrapper;
using ::webrtc::MapItem;
diff --git a/system_wrappers/source/sleep.cc b/system_wrappers/source/sleep.cc
index be85238..a916477 100644
--- a/system_wrappers/source/sleep.cc
+++ b/system_wrappers/source/sleep.cc
@@ -9,7 +9,7 @@
*/
// An OS-independent sleep function.
-#include "system_wrappers/interface/sleep.h"
+#include "webrtc/system_wrappers/interface/sleep.h"
#ifdef _WIN32
// For Sleep()
diff --git a/system_wrappers/source/sort.cc b/system_wrappers/source/sort.cc
index 4aa181f..8c774bb 100644
--- a/system_wrappers/source/sort.cc
+++ b/system_wrappers/source/sort.cc
@@ -25,7 +25,8 @@
#include <algorithm> // std::sort
#include <vector>
-#include "spreadsort.hpp" // TODO(ajm) upgrade to spreadsort v2.
+// TODO(ajm) upgrade to spreadsort v2.
+#include "webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp"
#endif
#ifdef NO_STL
diff --git a/system_wrappers/source/spreadsortlib/spreadsort.hpp b/system_wrappers/source/spreadsortlib/spreadsort.hpp
index 2d1529a..b934e3e 100644
--- a/system_wrappers/source/spreadsortlib/spreadsort.hpp
+++ b/system_wrappers/source/spreadsortlib/spreadsort.hpp
@@ -17,9 +17,9 @@
#ifndef BOOST_SPREAD_SORT_H
#define BOOST_SPREAD_SORT_H
#include <algorithm>
-#include <vector>
-#include "constants.hpp"
#include <cstring>
+#include <vector>
+#include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
namespace boost {
namespace detail {
diff --git a/system_wrappers/source/thread_posix.cc b/system_wrappers/source/thread_posix.cc
index 204c77e..b1b445f 100644
--- a/system_wrappers/source/thread_posix.cc
+++ b/system_wrappers/source/thread_posix.cc
@@ -51,11 +51,11 @@
#include <string.h> // strncpy
#include <unistd.h>
#ifdef WEBRTC_LINUX
-#include <sys/types.h>
-#include <sched.h>
-#include <sys/syscall.h>
#include <linux/unistd.h>
+#include <sched.h>
#include <sys/prctl.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
#endif
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
diff --git a/system_wrappers/source/thread_posix_unittest.cc b/system_wrappers/source/thread_posix_unittest.cc
index fadab57..edfb145 100644
--- a/system_wrappers/source/thread_posix_unittest.cc
+++ b/system_wrappers/source/thread_posix_unittest.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/source/thread_posix.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
TEST(ThreadTestPosix, PrioritySettings) {
// API assumes that max_prio - min_prio > 2. Test the extreme case.
diff --git a/system_wrappers/source/thread_unittest.cc b/system_wrappers/source/thread_unittest.cc
index 60302d2..25095e6 100644
--- a/system_wrappers/source/thread_unittest.cc
+++ b/system_wrappers/source/thread_unittest.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
diff --git a/system_wrappers/source/unittest_utilities.h b/system_wrappers/source/unittest_utilities.h
index 32eabfb..c00dd04 100644
--- a/system_wrappers/source/unittest_utilities.h
+++ b/system_wrappers/source/unittest_utilities.h
@@ -17,7 +17,7 @@
#include <stdio.h>
#include <string.h>
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
diff --git a/system_wrappers/source/unittest_utilities_unittest.cc b/system_wrappers/source/unittest_utilities_unittest.cc
index 6e9a0c6..be6647b 100644
--- a/system_wrappers/source/unittest_utilities_unittest.cc
+++ b/system_wrappers/source/unittest_utilities_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "system_wrappers/source/unittest_utilities.h"
+#include "webrtc/system_wrappers/source/unittest_utilities.h"
-#include "gtest/gtest.h"
-#include "system_wrappers/interface/trace.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
diff --git a/system_wrappers/test/TestSort/TestSort.cc b/system_wrappers/test/TestSort/TestSort.cc
index 6fa0cb5..1a3c198 100644
--- a/system_wrappers/test/TestSort/TestSort.cc
+++ b/system_wrappers/test/TestSort/TestSort.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <cstdio>
#include <algorithm>
+#include <cstdio>
#include <cstring>
-#include "sort.h"
-#include "tick_util.h"
+#include "webrtc/system_wrappers/interface/sort.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
// Excellent work polluting the global namespace Visual Studio...
#undef max
diff --git a/system_wrappers/test/list/list.cc b/system_wrappers/test/list/list.cc
index 5c4f0b9..35ddf33 100644
--- a/system_wrappers/test/list/list.cc
+++ b/system_wrappers/test/list/list.cc
@@ -11,7 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "list_wrapper.h"
+#include "webrtc/system_wrappers/interface/list_wrapper.h"
const int kNumberOfElements = 10;
diff --git a/system_wrappers/test/map/map.cc b/system_wrappers/test/map/map.cc
index 8a0d3e3..58f9729 100644
--- a/system_wrappers/test/map/map.cc
+++ b/system_wrappers/test/map/map.cc
@@ -11,7 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "map_wrapper.h"
+#include "webrtc/system_wrappers/interface/map_wrapper.h"
const int kNumberOfElements = 10;