Reland "Move webrtc/{base => rtc_base} (stub headers)
Add the stub headers from https://codereview.webrtc.org/2877023002
as a separate commit. This preserves git blame history of the moved files.
BUG=webrtc:7634
NOTRY=True
TBR=kwiberg@webrtc.org
Change-Id: Ic141abf11801fbfdeea5bcdb23608696ad449013
Reviewed-on: https://chromium-review.googlesource.com/554623
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18822}diff --git a/webrtc/base/array_view.h b/webrtc/base/array_view.h
new file mode 100644
index 0000000..a451b59
--- /dev/null
+++ b/webrtc/base/array_view.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ARRAY_VIEW_H_
+#define WEBRTC_BASE_ARRAY_VIEW_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/array_view.h"
+
+#endif // WEBRTC_BASE_ARRAY_VIEW_H_
diff --git a/webrtc/base/arraysize.h b/webrtc/base/arraysize.h
new file mode 100644
index 0000000..8b37efa
--- /dev/null
+++ b/webrtc/base/arraysize.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ARRAYSIZE_H_
+#define WEBRTC_BASE_ARRAYSIZE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/arraysize.h"
+
+#endif // WEBRTC_BASE_ARRAYSIZE_H_
diff --git a/webrtc/base/asyncinvoker-inl.h b/webrtc/base/asyncinvoker-inl.h
new file mode 100644
index 0000000..cce4226
--- /dev/null
+++ b/webrtc/base/asyncinvoker-inl.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ASYNCINVOKER_INL_H_
+#define WEBRTC_BASE_ASYNCINVOKER_INL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/asyncinvoker-inl.h"
+
+#endif // WEBRTC_BASE_ASYNCINVOKER_INL_H_
diff --git a/webrtc/base/asyncinvoker.h b/webrtc/base/asyncinvoker.h
new file mode 100644
index 0000000..0fcfc04
--- /dev/null
+++ b/webrtc/base/asyncinvoker.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ASYNCINVOKER_H_
+#define WEBRTC_BASE_ASYNCINVOKER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/asyncinvoker.h"
+
+#endif // WEBRTC_BASE_ASYNCINVOKER_H_
diff --git a/webrtc/base/asyncpacketsocket.h b/webrtc/base/asyncpacketsocket.h
new file mode 100644
index 0000000..809f178
--- /dev/null
+++ b/webrtc/base/asyncpacketsocket.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ASYNCPACKETSOCKET_H_
+#define WEBRTC_BASE_ASYNCPACKETSOCKET_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+
+#endif // WEBRTC_BASE_ASYNCPACKETSOCKET_H_
diff --git a/webrtc/base/asyncresolverinterface.h b/webrtc/base/asyncresolverinterface.h
new file mode 100644
index 0000000..b2a172f
--- /dev/null
+++ b/webrtc/base/asyncresolverinterface.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ASYNCRESOLVERINTERFACE_H_
+#define WEBRTC_BASE_ASYNCRESOLVERINTERFACE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/asyncresolverinterface.h"
+
+#endif
diff --git a/webrtc/base/asyncsocket.h b/webrtc/base/asyncsocket.h
new file mode 100644
index 0000000..9c97139
--- /dev/null
+++ b/webrtc/base/asyncsocket.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ASYNCSOCKET_H_
+#define WEBRTC_BASE_ASYNCSOCKET_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/asyncsocket.h"
+
+#endif // WEBRTC_BASE_ASYNCSOCKET_H_
diff --git a/webrtc/base/asynctcpsocket.h b/webrtc/base/asynctcpsocket.h
new file mode 100644
index 0000000..d64927b
--- /dev/null
+++ b/webrtc/base/asynctcpsocket.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ASYNCTCPSOCKET_H_
+#define WEBRTC_BASE_ASYNCTCPSOCKET_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/asynctcpsocket.h"
+
+#endif // WEBRTC_BASE_ASYNCTCPSOCKET_H_
diff --git a/webrtc/base/asyncudpsocket.h b/webrtc/base/asyncudpsocket.h
new file mode 100644
index 0000000..c3212c0
--- /dev/null
+++ b/webrtc/base/asyncudpsocket.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ASYNCUDPSOCKET_H_
+#define WEBRTC_BASE_ASYNCUDPSOCKET_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/asyncudpsocket.h"
+
+#endif // WEBRTC_BASE_ASYNCUDPSOCKET_H_
diff --git a/webrtc/base/atomicops.h b/webrtc/base/atomicops.h
new file mode 100644
index 0000000..3c36848
--- /dev/null
+++ b/webrtc/base/atomicops.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2011 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ATOMICOPS_H_
+#define WEBRTC_BASE_ATOMICOPS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/atomicops.h"
+
+#endif // WEBRTC_BASE_ATOMICOPS_H_
diff --git a/webrtc/base/base64.h b/webrtc/base/base64.h
new file mode 100644
index 0000000..1e28357
--- /dev/null
+++ b/webrtc/base/base64.h
@@ -0,0 +1,20 @@
+
+//*********************************************************************
+//* C_Base64 - a simple base64 encoder and decoder.
+//*
+//* Copyright (c) 1999, Bob Withers - bwit@pobox.com
+//*
+//* This code may be freely used for any purpose, either personal
+//* or commercial, provided the authors copyright notice remains
+//* intact.
+//*********************************************************************
+
+#ifndef WEBRTC_BASE_BASE64_H_
+#define WEBRTC_BASE_BASE64_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/base64.h"
+
+#endif // WEBRTC_BASE_BASE64_H_
diff --git a/webrtc/base/basictypes.h b/webrtc/base/basictypes.h
new file mode 100644
index 0000000..42ffa5a
--- /dev/null
+++ b/webrtc/base/basictypes.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_BASICTYPES_H_
+#define WEBRTC_BASE_BASICTYPES_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/basictypes.h"
+
+#endif // WEBRTC_BASE_BASICTYPES_H_
diff --git a/webrtc/base/bind.h b/webrtc/base/bind.h
new file mode 100644
index 0000000..39d441f
--- /dev/null
+++ b/webrtc/base/bind.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Bind() is an overloaded function that converts method calls into function
+// objects (aka functors). The method object is captured as a scoped_refptr<> if
+// possible, and as a raw pointer otherwise. Any arguments to the method are
+// captured by value. The return value of Bind is a stateful, nullary function
+// object. Care should be taken about the lifetime of objects captured by
+// Bind(); the returned functor knows nothing about the lifetime of a non
+// ref-counted method object or any arguments passed by pointer, and calling the
+// functor with a destroyed object will surely do bad things.
+//
+// To prevent the method object from being captured as a scoped_refptr<>, you
+// can use Unretained. But this should only be done when absolutely necessary,
+// and when the caller knows the extra reference isn't needed.
+//
+// Example usage:
+// struct Foo {
+// int Test1() { return 42; }
+// int Test2() const { return 52; }
+// int Test3(int x) { return x*x; }
+// float Test4(int x, float y) { return x + y; }
+// };
+//
+// int main() {
+// Foo foo;
+// cout << rtc::Bind(&Foo::Test1, &foo)() << endl;
+// cout << rtc::Bind(&Foo::Test2, &foo)() << endl;
+// cout << rtc::Bind(&Foo::Test3, &foo, 3)() << endl;
+// cout << rtc::Bind(&Foo::Test4, &foo, 7, 8.5f)() << endl;
+// }
+//
+// Example usage of ref counted objects:
+// struct Bar {
+// int AddRef();
+// int Release();
+//
+// void Test() {}
+// void BindThis() {
+// // The functor passed to AsyncInvoke() will keep this object alive.
+// invoker.AsyncInvoke(RTC_FROM_HERE,rtc::Bind(&Bar::Test, this));
+// }
+// };
+//
+// int main() {
+// rtc::scoped_refptr<Bar> bar = new rtc::RefCountedObject<Bar>();
+// auto functor = rtc::Bind(&Bar::Test, bar);
+// bar = nullptr;
+// // The functor stores an internal scoped_refptr<Bar>, so this is safe.
+// functor();
+// }
+//
+
+#ifndef WEBRTC_BASE_BIND_H_
+#define WEBRTC_BASE_BIND_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/bind.h"
+
+#endif // WEBRTC_BASE_BIND_H_
diff --git a/webrtc/base/bitbuffer.h b/webrtc/base/bitbuffer.h
new file mode 100644
index 0000000..09cba3c
--- /dev/null
+++ b/webrtc/base/bitbuffer.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_BITBUFFER_H_
+#define WEBRTC_BASE_BITBUFFER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/bitbuffer.h"
+
+#endif // WEBRTC_BASE_BITBUFFER_H_
diff --git a/webrtc/base/buffer.h b/webrtc/base/buffer.h
new file mode 100644
index 0000000..92c85d9
--- /dev/null
+++ b/webrtc/base/buffer.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_BUFFER_H_
+#define WEBRTC_BASE_BUFFER_H_
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/buffer.h"
+
+#endif // WEBRTC_BASE_BUFFER_H_
diff --git a/webrtc/base/bufferqueue.h b/webrtc/base/bufferqueue.h
new file mode 100644
index 0000000..3142ae3
--- /dev/null
+++ b/webrtc/base/bufferqueue.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_BUFFERQUEUE_H_
+#define WEBRTC_BASE_BUFFERQUEUE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/bufferqueue.h"
+
+#endif // WEBRTC_BASE_BUFFERQUEUE_H_
diff --git a/webrtc/base/bytebuffer.h b/webrtc/base/bytebuffer.h
new file mode 100644
index 0000000..0cc9a12
--- /dev/null
+++ b/webrtc/base/bytebuffer.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_BYTEBUFFER_H_
+#define WEBRTC_BASE_BYTEBUFFER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/bytebuffer.h"
+
+#endif // WEBRTC_BASE_BYTEBUFFER_H_
diff --git a/webrtc/base/byteorder.h b/webrtc/base/byteorder.h
new file mode 100644
index 0000000..28cbaa5
--- /dev/null
+++ b/webrtc/base/byteorder.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_BYTEORDER_H_
+#define WEBRTC_BASE_BYTEORDER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/byteorder.h"
+
+#endif // WEBRTC_BASE_BYTEORDER_H_
diff --git a/webrtc/base/callback.h b/webrtc/base/callback.h
new file mode 100644
index 0000000..4da1e6d
--- /dev/null
+++ b/webrtc/base/callback.h
@@ -0,0 +1,70 @@
+// This file was GENERATED by command:
+// pump.py callback.h.pump
+// DO NOT EDIT BY HAND!!!
+
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// To generate callback.h from callback.h.pump, execute:
+// /home/build/google3/third_party/gtest/scripts/pump.py callback.h.pump
+
+// Callbacks are callable object containers. They can hold a function pointer
+// or a function object and behave like a value type. Internally, data is
+// reference-counted, making copies and pass-by-value inexpensive.
+//
+// Callbacks are typed using template arguments. The format is:
+// CallbackN<ReturnType, ParamType1, ..., ParamTypeN>
+// where N is the number of arguments supplied to the callable object.
+// Callbacks are invoked using operator(), just like a function or a function
+// object. Default-constructed callbacks are "empty," and executing an empty
+// callback does nothing. A callback can be made empty by assigning it from
+// a default-constructed callback.
+//
+// Callbacks are similar in purpose to std::function (which isn't available on
+// all platforms we support) and a lightweight alternative to sigslots. Since
+// they effectively hide the type of the object they call, they're useful in
+// breaking dependencies between objects that need to interact with one another.
+// Notably, they can hold the results of Bind(), std::bind*, etc, without
+// needing
+// to know the resulting object type of those calls.
+//
+// Sigslots, on the other hand, provide a fuller feature set, such as multiple
+// subscriptions to a signal, optional thread-safety, and lifetime tracking of
+// slots. When these features are needed, choose sigslots.
+//
+// Example:
+// int sqr(int x) { return x * x; }
+// struct AddK {
+// int k;
+// int operator()(int x) const { return x + k; }
+// } add_k = {5};
+//
+// Callback1<int, int> my_callback;
+// cout << my_callback.empty() << endl; // true
+//
+// my_callback = Callback1<int, int>(&sqr);
+// cout << my_callback.empty() << endl; // false
+// cout << my_callback(3) << endl; // 9
+//
+// my_callback = Callback1<int, int>(add_k);
+// cout << my_callback(10) << endl; // 15
+//
+// my_callback = Callback1<int, int>();
+// cout << my_callback.empty() << endl; // true
+
+#ifndef WEBRTC_BASE_CALLBACK_H_
+#define WEBRTC_BASE_CALLBACK_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/callback.h"
+
+#endif // WEBRTC_BASE_CALLBACK_H_
diff --git a/webrtc/base/checks.h b/webrtc/base/checks.h
new file mode 100644
index 0000000..f56f157
--- /dev/null
+++ b/webrtc/base/checks.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2006 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_CHECKS_H_
+#define WEBRTC_BASE_CHECKS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/checks.h"
+
+#endif // WEBRTC_BASE_CHECKS_H_
diff --git a/webrtc/base/compile_assert_c.h b/webrtc/base/compile_assert_c.h
new file mode 100644
index 0000000..934cc9b
--- /dev/null
+++ b/webrtc/base/compile_assert_c.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_COMPILE_ASSERT_C_H_
+#define WEBRTC_BASE_COMPILE_ASSERT_C_H_
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/compile_assert_c.h"
+
+#endif // WEBRTC_BASE_COMPILE_ASSERT_C_H_
diff --git a/webrtc/base/constructormagic.h b/webrtc/base/constructormagic.h
new file mode 100644
index 0000000..21652c2
--- /dev/null
+++ b/webrtc/base/constructormagic.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_CONSTRUCTORMAGIC_H_
+#define WEBRTC_BASE_CONSTRUCTORMAGIC_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/constructormagic.h"
+
+#endif // WEBRTC_BASE_CONSTRUCTORMAGIC_H_
diff --git a/webrtc/base/copyonwritebuffer.h b/webrtc/base/copyonwritebuffer.h
new file mode 100644
index 0000000..6a95b31
--- /dev/null
+++ b/webrtc/base/copyonwritebuffer.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_COPYONWRITEBUFFER_H_
+#define WEBRTC_BASE_COPYONWRITEBUFFER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+
+#endif // WEBRTC_BASE_COPYONWRITEBUFFER_H_
diff --git a/webrtc/base/cpu_time.h b/webrtc/base/cpu_time.h
new file mode 100644
index 0000000..f627790
--- /dev/null
+++ b/webrtc/base/cpu_time.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_CPU_TIME_H_
+#define WEBRTC_BASE_CPU_TIME_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/cpu_time.h"
+
+#endif // WEBRTC_BASE_CPU_TIME_H_
diff --git a/webrtc/base/crc32.h b/webrtc/base/crc32.h
new file mode 100644
index 0000000..6854567
--- /dev/null
+++ b/webrtc/base/crc32.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_CRC32_H_
+#define WEBRTC_BASE_CRC32_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/crc32.h"
+
+#endif // WEBRTC_BASE_CRC32_H_
diff --git a/webrtc/base/criticalsection.h b/webrtc/base/criticalsection.h
new file mode 100644
index 0000000..ab3f542
--- /dev/null
+++ b/webrtc/base/criticalsection.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_CRITICALSECTION_H_
+#define WEBRTC_BASE_CRITICALSECTION_H_
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/criticalsection.h"
+
+#endif // WEBRTC_BASE_CRITICALSECTION_H_
diff --git a/webrtc/base/cryptstring.h b/webrtc/base/cryptstring.h
new file mode 100644
index 0000000..1a474b4
--- /dev/null
+++ b/webrtc/base/cryptstring.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_CRYPTSTRING_H_
+#define WEBRTC_BASE_CRYPTSTRING_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/cryptstring.h"
+
+#endif // WEBRTC_BASE_CRYPTSTRING_H_
diff --git a/webrtc/base/deprecation.h b/webrtc/base/deprecation.h
new file mode 100644
index 0000000..d6c5124
--- /dev/null
+++ b/webrtc/base/deprecation.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_DEPRECATION_H_
+#define WEBRTC_BASE_DEPRECATION_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/deprecation.h"
+
+#endif // WEBRTC_BASE_DEPRECATION_H_
diff --git a/webrtc/base/dscp.h b/webrtc/base/dscp.h
new file mode 100644
index 0000000..1cf2756
--- /dev/null
+++ b/webrtc/base/dscp.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_DSCP_H_
+#define WEBRTC_BASE_DSCP_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/dscp.h"
+
+#endif // WEBRTC_BASE_DSCP_H_
diff --git a/webrtc/base/event.h b/webrtc/base/event.h
new file mode 100644
index 0000000..28ff731
--- /dev/null
+++ b/webrtc/base/event.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_EVENT_H_
+#define WEBRTC_BASE_EVENT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/event.h"
+
+#endif // WEBRTC_BASE_EVENT_H_
diff --git a/webrtc/base/event_tracer.h b/webrtc/base/event_tracer.h
new file mode 100644
index 0000000..b6da14a
--- /dev/null
+++ b/webrtc/base/event_tracer.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// This file defines the interface for event tracing in WebRTC.
+//
+// Event log handlers are set through SetupEventTracer(). User of this API will
+// provide two function pointers to handle event tracing calls.
+//
+// * GetCategoryEnabledPtr
+// Event tracing system calls this function to determine if a particular
+// event category is enabled.
+//
+// * AddTraceEventPtr
+// Adds a tracing event. It is the user's responsibility to log the data
+// provided.
+//
+// Parameters for the above two functions are described in trace_event.h.
+
+#ifndef WEBRTC_BASE_EVENT_TRACER_H_
+#define WEBRTC_BASE_EVENT_TRACER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/event_tracer.h"
+
+#endif // WEBRTC_BASE_EVENT_TRACER_H_
diff --git a/webrtc/base/fakeclock.h b/webrtc/base/fakeclock.h
new file mode 100644
index 0000000..22d640d
--- /dev/null
+++ b/webrtc/base/fakeclock.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_FAKECLOCK_H_
+#define WEBRTC_BASE_FAKECLOCK_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/fakeclock.h"
+
+#endif // WEBRTC_BASE_FAKECLOCK_H_
diff --git a/webrtc/base/fakenetwork.h b/webrtc/base/fakenetwork.h
new file mode 100644
index 0000000..c2c8e6d
--- /dev/null
+++ b/webrtc/base/fakenetwork.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2009 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_FAKENETWORK_H_
+#define WEBRTC_BASE_FAKENETWORK_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/fakenetwork.h"
+
+#endif // WEBRTC_BASE_FAKENETWORK_H_
diff --git a/webrtc/base/fakesslidentity.h b/webrtc/base/fakesslidentity.h
new file mode 100644
index 0000000..da204b2
--- /dev/null
+++ b/webrtc/base/fakesslidentity.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_FAKESSLIDENTITY_H_
+#define WEBRTC_BASE_FAKESSLIDENTITY_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/fakesslidentity.h"
+
+#endif // WEBRTC_BASE_FAKESSLIDENTITY_H_
diff --git a/webrtc/base/file.h b/webrtc/base/file.h
new file mode 100644
index 0000000..5a4465f
--- /dev/null
+++ b/webrtc/base/file.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_FILE_H_
+#define WEBRTC_BASE_FILE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/file.h"
+
+#endif // WEBRTC_BASE_FILE_H_
diff --git a/webrtc/base/filerotatingstream.h b/webrtc/base/filerotatingstream.h
new file mode 100644
index 0000000..26306db
--- /dev/null
+++ b/webrtc/base/filerotatingstream.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_FILEROTATINGSTREAM_H_
+#define WEBRTC_BASE_FILEROTATINGSTREAM_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/filerotatingstream.h"
+
+#endif // WEBRTC_BASE_FILEROTATINGSTREAM_H_
diff --git a/webrtc/base/fileutils.h b/webrtc/base/fileutils.h
new file mode 100644
index 0000000..18de30c
--- /dev/null
+++ b/webrtc/base/fileutils.h
@@ -0,0 +1,20 @@
+
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_FILEUTILS_H_
+#define WEBRTC_BASE_FILEUTILS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/fileutils.h"
+
+#endif // WEBRTC_BASE_FILEUTILS_H_
diff --git a/webrtc/base/firewallsocketserver.h b/webrtc/base/firewallsocketserver.h
new file mode 100644
index 0000000..18ad9bc
--- /dev/null
+++ b/webrtc/base/firewallsocketserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_FIREWALLSOCKETSERVER_H_
+#define WEBRTC_BASE_FIREWALLSOCKETSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/firewallsocketserver.h"
+
+#endif // WEBRTC_BASE_FIREWALLSOCKETSERVER_H_
diff --git a/webrtc/base/flags.h b/webrtc/base/flags.h
new file mode 100644
index 0000000..9094466
--- /dev/null
+++ b/webrtc/base/flags.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2006 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+// Originally comes from shared/commandlineflags/flags.h
+
+// Flags are defined and declared using DEFINE_xxx and DECLARE_xxx macros,
+// where xxx is the flag type. Flags are referred to via FLAG_yyy,
+// where yyy is the flag name. For intialization and iteration of flags,
+// see the FlagList class. For full programmatic access to any
+// flag, see the Flag class.
+//
+// The implementation only relies and basic C++ functionality
+// and needs no special library or STL support.
+
+#ifndef WEBRTC_BASE_FLAGS_H_
+#define WEBRTC_BASE_FLAGS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/flags.h"
+
+#endif // SHARED_COMMANDLINEFLAGS_FLAGS_H_
diff --git a/webrtc/base/format_macros.h b/webrtc/base/format_macros.h
new file mode 100644
index 0000000..844e71e
--- /dev/null
+++ b/webrtc/base/format_macros.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_FORMAT_MACROS_H_
+#define WEBRTC_BASE_FORMAT_MACROS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/format_macros.h"
+
+#endif // WEBRTC_BASE_FORMAT_MACROS_H_
diff --git a/webrtc/base/function_view.h b/webrtc/base/function_view.h
new file mode 100644
index 0000000..1230026
--- /dev/null
+++ b/webrtc/base/function_view.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_FUNCTION_VIEW_H_
+#define WEBRTC_BASE_FUNCTION_VIEW_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/function_view.h"
+
+#endif // WEBRTC_BASE_FUNCTION_VIEW_H_
diff --git a/webrtc/base/gtest_prod_util.h b/webrtc/base/gtest_prod_util.h
new file mode 100644
index 0000000..0c25943
--- /dev/null
+++ b/webrtc/base/gtest_prod_util.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_GTEST_PROD_UTIL_H_
+#define WEBRTC_BASE_GTEST_PROD_UTIL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/gtest_prod_util.h"
+
+#endif // WEBRTC_BASE_GTEST_PROD_UTIL_H_
diff --git a/webrtc/base/gunit.h b/webrtc/base/gunit.h
new file mode 100644
index 0000000..d6c092e
--- /dev/null
+++ b/webrtc/base/gunit.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_GUNIT_H_
+#define WEBRTC_BASE_GUNIT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/gunit.h"
+
+#endif // WEBRTC_BASE_GUNIT_H_
diff --git a/webrtc/base/gunit_prod.h b/webrtc/base/gunit_prod.h
new file mode 100644
index 0000000..436abee
--- /dev/null
+++ b/webrtc/base/gunit_prod.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_GUNIT_PROD_H_
+#define WEBRTC_BASE_GUNIT_PROD_H_
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/gunit_prod.h"
+
+#endif // WEBRTC_BASE_GUNIT_PROD_H_
diff --git a/webrtc/base/helpers.h b/webrtc/base/helpers.h
new file mode 100644
index 0000000..86a388e
--- /dev/null
+++ b/webrtc/base/helpers.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_HELPERS_H_
+#define WEBRTC_BASE_HELPERS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/helpers.h"
+
+#endif // WEBRTC_BASE_HELPERS_H_
diff --git a/webrtc/base/httpbase.h b/webrtc/base/httpbase.h
new file mode 100644
index 0000000..a66ce15
--- /dev/null
+++ b/webrtc/base/httpbase.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+
+#ifndef WEBRTC_BASE_HTTPBASE_H_
+#define WEBRTC_BASE_HTTPBASE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/httpbase.h"
+
+#endif // WEBRTC_BASE_HTTPBASE_H_
diff --git a/webrtc/base/httpcommon-inl.h b/webrtc/base/httpcommon-inl.h
new file mode 100644
index 0000000..7dfe182
--- /dev/null
+++ b/webrtc/base/httpcommon-inl.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_HTTPCOMMON_INL_H_
+#define WEBRTC_BASE_HTTPCOMMON_INL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/httpcommon-inl.h"
+
+#endif // WEBRTC_BASE_HTTPCOMMON_INL_H_
diff --git a/webrtc/base/httpcommon.h b/webrtc/base/httpcommon.h
new file mode 100644
index 0000000..3946dfc
--- /dev/null
+++ b/webrtc/base/httpcommon.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_HTTPCOMMON_H_
+#define WEBRTC_BASE_HTTPCOMMON_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/httpcommon.h"
+
+#endif // WEBRTC_BASE_HTTPCOMMON_H_
diff --git a/webrtc/base/httpserver.h b/webrtc/base/httpserver.h
new file mode 100644
index 0000000..4fd75a2
--- /dev/null
+++ b/webrtc/base/httpserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_HTTPSERVER_H_
+#define WEBRTC_BASE_HTTPSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/httpserver.h"
+
+#endif // WEBRTC_BASE_HTTPSERVER_H_
diff --git a/webrtc/base/ifaddrs-android.h b/webrtc/base/ifaddrs-android.h
new file mode 100644
index 0000000..9c49c9f
--- /dev/null
+++ b/webrtc/base/ifaddrs-android.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_IFADDRS_ANDROID_H_
+#define WEBRTC_BASE_IFADDRS_ANDROID_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/ifaddrs-android.h"
+
+#endif // WEBRTC_BASE_IFADDRS_ANDROID_H_
diff --git a/webrtc/base/ifaddrs_converter.h b/webrtc/base/ifaddrs_converter.h
new file mode 100644
index 0000000..de7ad87
--- /dev/null
+++ b/webrtc/base/ifaddrs_converter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_IFADDRS_CONVERTER_H_
+#define WEBRTC_BASE_IFADDRS_CONVERTER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/ifaddrs_converter.h"
+
+#endif // WEBRTC_BASE_IFADDRS_CONVERTER_H_
diff --git a/webrtc/base/ignore_wundef.h b/webrtc/base/ignore_wundef.h
new file mode 100644
index 0000000..fdfba9b
--- /dev/null
+++ b/webrtc/base/ignore_wundef.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_IGNORE_WUNDEF_H_
+#define WEBRTC_BASE_IGNORE_WUNDEF_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/ignore_wundef.h"
+
+#endif // WEBRTC_BASE_IGNORE_WUNDEF_H_
diff --git a/webrtc/base/ipaddress.h b/webrtc/base/ipaddress.h
new file mode 100644
index 0000000..44e432d
--- /dev/null
+++ b/webrtc/base/ipaddress.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2011 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_IPADDRESS_H_
+#define WEBRTC_BASE_IPADDRESS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/ipaddress.h"
+
+#endif // WEBRTC_BASE_IPADDRESS_H_
diff --git a/webrtc/base/json.h b/webrtc/base/json.h
new file mode 100644
index 0000000..175028f
--- /dev/null
+++ b/webrtc/base/json.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_JSON_H_
+#define WEBRTC_BASE_JSON_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/json.h"
+
+#endif // WEBRTC_BASE_JSON_H_
diff --git a/webrtc/base/keep_ref_until_done.h b/webrtc/base/keep_ref_until_done.h
new file mode 100644
index 0000000..171e048
--- /dev/null
+++ b/webrtc/base/keep_ref_until_done.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_KEEP_REF_UNTIL_DONE_H_
+#define WEBRTC_BASE_KEEP_REF_UNTIL_DONE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/keep_ref_until_done.h"
+
+#endif // WEBRTC_BASE_KEEP_REF_UNTIL_DONE_H_
diff --git a/webrtc/base/location.h b/webrtc/base/location.h
new file mode 100644
index 0000000..432471c
--- /dev/null
+++ b/webrtc/base/location.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_LOCATION_H_
+#define WEBRTC_BASE_LOCATION_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/location.h"
+
+#endif // WEBRTC_BASE_LOCATION_H_
diff --git a/webrtc/base/logging.h b/webrtc/base/logging.h
new file mode 100644
index 0000000..594d9c9
--- /dev/null
+++ b/webrtc/base/logging.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// LOG(...) an ostream target that can be used to send formatted
+// output to a variety of logging targets, such as debugger console, stderr,
+// or any LogSink.
+// The severity level passed as the first argument to the LOGging
+// functions is used as a filter, to limit the verbosity of the logging.
+// Static members of LogMessage documented below are used to control the
+// verbosity and target of the output.
+// There are several variations on the LOG macro which facilitate logging
+// of common error conditions, detailed below.
+
+// LOG(sev) logs the given stream at severity "sev", which must be a
+// compile-time constant of the LoggingSeverity type, without the namespace
+// prefix.
+// LOG_V(sev) Like LOG(), but sev is a run-time variable of the LoggingSeverity
+// type (basically, it just doesn't prepend the namespace).
+// LOG_F(sev) Like LOG(), but includes the name of the current function.
+// LOG_T(sev) Like LOG(), but includes the this pointer.
+// LOG_T_F(sev) Like LOG_F(), but includes the this pointer.
+// LOG_GLE(M)(sev [, mod]) attempt to add a string description of the
+// HRESULT returned by GetLastError. The "M" variant allows searching of a
+// DLL's string table for the error description.
+// LOG_ERRNO(sev) attempts to add a string description of an errno-derived
+// error. errno and associated facilities exist on both Windows and POSIX,
+// but on Windows they only apply to the C/C++ runtime.
+// LOG_ERR(sev) is an alias for the platform's normal error system, i.e. _GLE on
+// Windows and _ERRNO on POSIX.
+// (The above three also all have _EX versions that let you specify the error
+// code, rather than using the last one.)
+// LOG_E(sev, ctx, err, ...) logs a detailed error interpreted using the
+// specified context.
+// LOG_CHECK_LEVEL(sev) (and LOG_CHECK_LEVEL_V(sev)) can be used as a test
+// before performing expensive or sensitive operations whose sole purpose is
+// to output logging data at the desired level.
+// Lastly, PLOG(sev, err) is an alias for LOG_ERR_EX.
+
+#ifndef WEBRTC_BASE_LOGGING_H_
+#define WEBRTC_BASE_LOGGING_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/logging.h"
+
+#endif // WEBRTC_BASE_LOGGING_H_
diff --git a/webrtc/base/logsinks.h b/webrtc/base/logsinks.h
new file mode 100644
index 0000000..95e6dc6
--- /dev/null
+++ b/webrtc/base/logsinks.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_LOGSINKS_H_
+#define WEBRTC_BASE_LOGSINKS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/logsinks.h"
+
+#endif // WEBRTC_BASE_LOGSINKS_H_
diff --git a/webrtc/base/macutils.h b/webrtc/base/macutils.h
new file mode 100644
index 0000000..ed0c4f5
--- /dev/null
+++ b/webrtc/base/macutils.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2007 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_MACUTILS_H_
+#define WEBRTC_BASE_MACUTILS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/macutils.h"
+
+#endif // WEBRTC_BASE_MACUTILS_H_
diff --git a/webrtc/base/mathutils.h b/webrtc/base/mathutils.h
new file mode 100644
index 0000000..9e5c3ca
--- /dev/null
+++ b/webrtc/base/mathutils.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2005 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_MATHUTILS_H_
+#define WEBRTC_BASE_MATHUTILS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/mathutils.h"
+
+#endif // WEBRTC_BASE_MATHUTILS_H_
diff --git a/webrtc/base/md5.h b/webrtc/base/md5.h
new file mode 100644
index 0000000..fd17541
--- /dev/null
+++ b/webrtc/base/md5.h
@@ -0,0 +1,31 @@
+/*
+ * This is the header file for the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest. This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ *
+ */
+
+// Changes(fbarchard): Ported to C++ and Google style guide.
+// Made context first parameter in MD5Final for consistency with Sha1.
+// Changes(hellner): added rtc namespace
+// Changes(pbos): Reverted types back to uint32(8)_t with _t suffix.
+
+#ifndef WEBRTC_BASE_MD5_H_
+#define WEBRTC_BASE_MD5_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/md5.h"
+
+#endif // WEBRTC_BASE_MD5_H_
diff --git a/webrtc/base/md5digest.h b/webrtc/base/md5digest.h
new file mode 100644
index 0000000..66d6ee1
--- /dev/null
+++ b/webrtc/base/md5digest.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_MD5DIGEST_H_
+#define WEBRTC_BASE_MD5DIGEST_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/md5digest.h"
+
+#endif // WEBRTC_BASE_MD5DIGEST_H_
diff --git a/webrtc/base/memory_usage.h b/webrtc/base/memory_usage.h
new file mode 100644
index 0000000..5c22559
--- /dev/null
+++ b/webrtc/base/memory_usage.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef WEBRTC_BASE_MEMORY_USAGE_H_
+#define WEBRTC_BASE_MEMORY_USAGE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/memory_usage.h"
+
+#endif // WEBRTC_BASE_MEMORY_USAGE_H_
diff --git a/webrtc/base/messagedigest.h b/webrtc/base/messagedigest.h
new file mode 100644
index 0000000..b73f907
--- /dev/null
+++ b/webrtc/base/messagedigest.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_MESSAGEDIGEST_H_
+#define WEBRTC_BASE_MESSAGEDIGEST_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/messagedigest.h"
+
+#endif // WEBRTC_BASE_MESSAGEDIGEST_H_
diff --git a/webrtc/base/messagehandler.h b/webrtc/base/messagehandler.h
new file mode 100644
index 0000000..943d0d7
--- /dev/null
+++ b/webrtc/base/messagehandler.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_MESSAGEHANDLER_H_
+#define WEBRTC_BASE_MESSAGEHANDLER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/messagehandler.h"
+
+#endif // WEBRTC_BASE_MESSAGEHANDLER_H_
diff --git a/webrtc/base/messagequeue.h b/webrtc/base/messagequeue.h
new file mode 100644
index 0000000..353a4b7
--- /dev/null
+++ b/webrtc/base/messagequeue.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_MESSAGEQUEUE_H_
+#define WEBRTC_BASE_MESSAGEQUEUE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/messagequeue.h"
+
+#endif // WEBRTC_BASE_MESSAGEQUEUE_H_
diff --git a/webrtc/base/mod_ops.h b/webrtc/base/mod_ops.h
new file mode 100644
index 0000000..d61bd05
--- /dev/null
+++ b/webrtc/base/mod_ops.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_MOD_OPS_H_
+#define WEBRTC_BASE_MOD_OPS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/mod_ops.h"
+
+#endif // WEBRTC_BASE_MOD_OPS_H_
diff --git a/webrtc/base/natserver.h b/webrtc/base/natserver.h
new file mode 100644
index 0000000..b803ad8
--- /dev/null
+++ b/webrtc/base/natserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NATSERVER_H_
+#define WEBRTC_BASE_NATSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/natserver.h"
+
+#endif // WEBRTC_BASE_NATSERVER_H_
diff --git a/webrtc/base/natsocketfactory.h b/webrtc/base/natsocketfactory.h
new file mode 100644
index 0000000..31c29ab
--- /dev/null
+++ b/webrtc/base/natsocketfactory.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NATSOCKETFACTORY_H_
+#define WEBRTC_BASE_NATSOCKETFACTORY_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/natsocketfactory.h"
+
+#endif // WEBRTC_BASE_NATSOCKETFACTORY_H_
diff --git a/webrtc/base/nattypes.h b/webrtc/base/nattypes.h
new file mode 100644
index 0000000..001f57f
--- /dev/null
+++ b/webrtc/base/nattypes.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NATTYPES_H_
+#define WEBRTC_BASE_NATTYPES_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/nattypes.h"
+
+#endif // WEBRTC_BASE_NATTYPES_H_
diff --git a/webrtc/base/nethelpers.h b/webrtc/base/nethelpers.h
new file mode 100644
index 0000000..9a8e607
--- /dev/null
+++ b/webrtc/base/nethelpers.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2008 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NETHELPERS_H_
+#define WEBRTC_BASE_NETHELPERS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/nethelpers.h"
+
+#endif // WEBRTC_BASE_NETHELPERS_H_
diff --git a/webrtc/base/network.h b/webrtc/base/network.h
new file mode 100644
index 0000000..2953098
--- /dev/null
+++ b/webrtc/base/network.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NETWORK_H_
+#define WEBRTC_BASE_NETWORK_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/network.h"
+
+#endif // WEBRTC_BASE_NETWORK_H_
diff --git a/webrtc/base/networkmonitor.h b/webrtc/base/networkmonitor.h
new file mode 100644
index 0000000..290da4f
--- /dev/null
+++ b/webrtc/base/networkmonitor.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NETWORKMONITOR_H_
+#define WEBRTC_BASE_NETWORKMONITOR_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/networkmonitor.h"
+
+#endif // WEBRTC_BASE_NETWORKMONITOR_H_
diff --git a/webrtc/base/networkroute.h b/webrtc/base/networkroute.h
new file mode 100644
index 0000000..b5e8c13
--- /dev/null
+++ b/webrtc/base/networkroute.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NETWORKROUTE_H_
+#define WEBRTC_BASE_NETWORKROUTE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/networkroute.h"
+
+#endif // WEBRTC_BASE_NETWORKROUTE_H_
diff --git a/webrtc/base/nullsocketserver.h b/webrtc/base/nullsocketserver.h
new file mode 100644
index 0000000..214c542
--- /dev/null
+++ b/webrtc/base/nullsocketserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NULLSOCKETSERVER_H_
+#define WEBRTC_BASE_NULLSOCKETSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/nullsocketserver.h"
+
+#endif // WEBRTC_BASE_NULLSOCKETSERVER_H_
diff --git a/webrtc/base/numerics/exp_filter.h b/webrtc/base/numerics/exp_filter.h
new file mode 100644
index 0000000..a4eaea2
--- /dev/null
+++ b/webrtc/base/numerics/exp_filter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NUMERICS_EXP_FILTER_H_
+#define WEBRTC_BASE_NUMERICS_EXP_FILTER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/numerics/exp_filter.h"
+
+#endif // WEBRTC_BASE_NUMERICS_EXP_FILTER_H_
diff --git a/webrtc/base/numerics/percentile_filter.h b/webrtc/base/numerics/percentile_filter.h
new file mode 100644
index 0000000..a9058a2
--- /dev/null
+++ b/webrtc/base/numerics/percentile_filter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_NUMERICS_PERCENTILE_FILTER_H_
+#define WEBRTC_BASE_NUMERICS_PERCENTILE_FILTER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/numerics/percentile_filter.h"
+
+#endif // WEBRTC_BASE_NUMERICS_PERCENTILE_FILTER_H_
diff --git a/webrtc/base/onetimeevent.h b/webrtc/base/onetimeevent.h
new file mode 100644
index 0000000..6849bac
--- /dev/null
+++ b/webrtc/base/onetimeevent.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ONETIMEEVENT_H_
+#define WEBRTC_BASE_ONETIMEEVENT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/onetimeevent.h"
+
+#endif // WEBRTC_BASE_ONETIMEEVENT_H_
diff --git a/webrtc/base/openssl.h b/webrtc/base/openssl.h
new file mode 100644
index 0000000..795af70
--- /dev/null
+++ b/webrtc/base/openssl.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2013 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_OPENSSL_H_
+#define WEBRTC_BASE_OPENSSL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/openssl.h"
+
+#endif // WEBRTC_BASE_OPENSSL_H_
diff --git a/webrtc/base/openssladapter.h b/webrtc/base/openssladapter.h
new file mode 100644
index 0000000..6444215
--- /dev/null
+++ b/webrtc/base/openssladapter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_OPENSSLADAPTER_H_
+#define WEBRTC_BASE_OPENSSLADAPTER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/openssladapter.h"
+
+#endif // WEBRTC_BASE_OPENSSLADAPTER_H_
diff --git a/webrtc/base/openssldigest.h b/webrtc/base/openssldigest.h
new file mode 100644
index 0000000..031c0b1
--- /dev/null
+++ b/webrtc/base/openssldigest.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_OPENSSLDIGEST_H_
+#define WEBRTC_BASE_OPENSSLDIGEST_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/openssldigest.h"
+
+#endif // WEBRTC_BASE_OPENSSLDIGEST_H_
diff --git a/webrtc/base/opensslidentity.h b/webrtc/base/opensslidentity.h
new file mode 100644
index 0000000..59fa571
--- /dev/null
+++ b/webrtc/base/opensslidentity.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_OPENSSLIDENTITY_H_
+#define WEBRTC_BASE_OPENSSLIDENTITY_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/opensslidentity.h"
+
+#endif // WEBRTC_BASE_OPENSSLIDENTITY_H_
diff --git a/webrtc/base/opensslstreamadapter.h b/webrtc/base/opensslstreamadapter.h
new file mode 100644
index 0000000..e17e029
--- /dev/null
+++ b/webrtc/base/opensslstreamadapter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_OPENSSLSTREAMADAPTER_H_
+#define WEBRTC_BASE_OPENSSLSTREAMADAPTER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/opensslstreamadapter.h"
+
+#endif // WEBRTC_BASE_OPENSSLSTREAMADAPTER_H_
diff --git a/webrtc/base/optional.h b/webrtc/base/optional.h
new file mode 100644
index 0000000..7657ec3
--- /dev/null
+++ b/webrtc/base/optional.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_OPTIONAL_H_
+#define WEBRTC_BASE_OPTIONAL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/optional.h"
+
+#endif // WEBRTC_BASE_OPTIONAL_H_
diff --git a/webrtc/base/optionsfile.h b/webrtc/base/optionsfile.h
new file mode 100644
index 0000000..e77fd8a
--- /dev/null
+++ b/webrtc/base/optionsfile.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2008 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_OPTIONSFILE_H_
+#define WEBRTC_BASE_OPTIONSFILE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/optionsfile.h"
+
+#endif // WEBRTC_BASE_OPTIONSFILE_H_
diff --git a/webrtc/base/pathutils.h b/webrtc/base/pathutils.h
new file mode 100644
index 0000000..b45ca04
--- /dev/null
+++ b/webrtc/base/pathutils.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_PATHUTILS_H_
+#define WEBRTC_BASE_PATHUTILS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/pathutils.h"
+
+#endif // WEBRTC_BASE_PATHUTILS_H_
diff --git a/webrtc/base/physicalsocketserver.h b/webrtc/base/physicalsocketserver.h
new file mode 100644
index 0000000..63e6dfa
--- /dev/null
+++ b/webrtc/base/physicalsocketserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_PHYSICALSOCKETSERVER_H_
+#define WEBRTC_BASE_PHYSICALSOCKETSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/physicalsocketserver.h"
+
+#endif // WEBRTC_BASE_PHYSICALSOCKETSERVER_H_
diff --git a/webrtc/base/platform_file.h b/webrtc/base/platform_file.h
new file mode 100644
index 0000000..c7396ec
--- /dev/null
+++ b/webrtc/base/platform_file.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_PLATFORM_FILE_H_
+#define WEBRTC_BASE_PLATFORM_FILE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/platform_file.h"
+
+#endif // WEBRTC_BASE_PLATFORM_FILE_H_
diff --git a/webrtc/base/platform_thread.h b/webrtc/base/platform_thread.h
new file mode 100644
index 0000000..626d66f
--- /dev/null
+++ b/webrtc/base/platform_thread.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_PLATFORM_THREAD_H_
+#define WEBRTC_BASE_PLATFORM_THREAD_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/platform_thread.h"
+
+#endif // WEBRTC_BASE_PLATFORM_THREAD_H_
diff --git a/webrtc/base/platform_thread_types.h b/webrtc/base/platform_thread_types.h
new file mode 100644
index 0000000..f2dbd58
--- /dev/null
+++ b/webrtc/base/platform_thread_types.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_PLATFORM_THREAD_TYPES_H_
+#define WEBRTC_BASE_PLATFORM_THREAD_TYPES_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/platform_thread_types.h"
+
+#endif // WEBRTC_BASE_PLATFORM_THREAD_TYPES_H_
diff --git a/webrtc/base/protobuf_utils.h b/webrtc/base/protobuf_utils.h
new file mode 100644
index 0000000..3d2dd86
--- /dev/null
+++ b/webrtc/base/protobuf_utils.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <string>
+
+#ifndef WEBRTC_BASE_PROTOBUF_UTILS_H_
+#define WEBRTC_BASE_PROTOBUF_UTILS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/protobuf_utils.h"
+
+#endif // WEBRTC_BASE_PROTOBUF_UTILS_H_
diff --git a/webrtc/base/proxyinfo.h b/webrtc/base/proxyinfo.h
new file mode 100644
index 0000000..f0ae182
--- /dev/null
+++ b/webrtc/base/proxyinfo.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_PROXYINFO_H_
+#define WEBRTC_BASE_PROXYINFO_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/proxyinfo.h"
+
+#endif // WEBRTC_BASE_PROXYINFO_H_
diff --git a/webrtc/base/proxyserver.h b/webrtc/base/proxyserver.h
new file mode 100644
index 0000000..1bf580a
--- /dev/null
+++ b/webrtc/base/proxyserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_PROXYSERVER_H_
+#define WEBRTC_BASE_PROXYSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/proxyserver.h"
+
+#endif // WEBRTC_BASE_PROXYSERVER_H_
diff --git a/webrtc/base/ptr_util.h b/webrtc/base/ptr_util.h
new file mode 100644
index 0000000..aa6f3b4
--- /dev/null
+++ b/webrtc/base/ptr_util.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// This implementation is borrowed from chromium.
+
+#ifndef WEBRTC_BASE_PTR_UTIL_H_
+#define WEBRTC_BASE_PTR_UTIL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/ptr_util.h"
+
+#endif // WEBRTC_BASE_PTR_UTIL_H_
diff --git a/webrtc/base/race_checker.h b/webrtc/base/race_checker.h
new file mode 100644
index 0000000..474fdb5
--- /dev/null
+++ b/webrtc/base/race_checker.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_RACE_CHECKER_H_
+#define WEBRTC_BASE_RACE_CHECKER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/race_checker.h"
+
+#endif // WEBRTC_BASE_RACE_CHECKER_H_
diff --git a/webrtc/base/random.h b/webrtc/base/random.h
new file mode 100644
index 0000000..12a4902
--- /dev/null
+++ b/webrtc/base/random.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_RANDOM_H_
+#define WEBRTC_BASE_RANDOM_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/random.h"
+
+#endif // WEBRTC_BASE_RANDOM_H_
diff --git a/webrtc/base/rate_limiter.h b/webrtc/base/rate_limiter.h
new file mode 100644
index 0000000..0cba5fb
--- /dev/null
+++ b/webrtc/base/rate_limiter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_RATE_LIMITER_H_
+#define WEBRTC_BASE_RATE_LIMITER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/rate_limiter.h"
+
+#endif // WEBRTC_BASE_RATE_LIMITER_H_
diff --git a/webrtc/base/rate_statistics.h b/webrtc/base/rate_statistics.h
new file mode 100644
index 0000000..1a17500
--- /dev/null
+++ b/webrtc/base/rate_statistics.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_RATE_STATISTICS_H_
+#define WEBRTC_BASE_RATE_STATISTICS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/rate_statistics.h"
+
+#endif // WEBRTC_BASE_RATE_STATISTICS_H_
diff --git a/webrtc/base/ratelimiter.h b/webrtc/base/ratelimiter.h
new file mode 100644
index 0000000..0e372db
--- /dev/null
+++ b/webrtc/base/ratelimiter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_RATELIMITER_H_
+#define WEBRTC_BASE_RATELIMITER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/ratelimiter.h"
+
+#endif // WEBRTC_BASE_RATELIMITER_H_
diff --git a/webrtc/base/ratetracker.h b/webrtc/base/ratetracker.h
new file mode 100644
index 0000000..d1fd75d
--- /dev/null
+++ b/webrtc/base/ratetracker.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_RATETRACKER_H_
+#define WEBRTC_BASE_RATETRACKER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/ratetracker.h"
+
+#endif // WEBRTC_BASE_RATETRACKER_H_
diff --git a/webrtc/base/refcount.h b/webrtc/base/refcount.h
new file mode 100644
index 0000000..4a7cea3
--- /dev/null
+++ b/webrtc/base/refcount.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2011 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef WEBRTC_BASE_REFCOUNT_H_
+#define WEBRTC_BASE_REFCOUNT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/refcount.h"
+
+#endif // WEBRTC_BASE_REFCOUNT_H_
diff --git a/webrtc/base/refcountedobject.h b/webrtc/base/refcountedobject.h
new file mode 100644
index 0000000..78304fa
--- /dev/null
+++ b/webrtc/base/refcountedobject.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef WEBRTC_BASE_REFCOUNTEDOBJECT_H_
+#define WEBRTC_BASE_REFCOUNTEDOBJECT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/refcountedobject.h"
+
+#endif // WEBRTC_BASE_REFCOUNTEDOBJECT_H_
diff --git a/webrtc/base/rollingaccumulator.h b/webrtc/base/rollingaccumulator.h
new file mode 100644
index 0000000..a7de4f1
--- /dev/null
+++ b/webrtc/base/rollingaccumulator.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2011 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_ROLLINGACCUMULATOR_H_
+#define WEBRTC_BASE_ROLLINGACCUMULATOR_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/rollingaccumulator.h"
+
+#endif // WEBRTC_BASE_ROLLINGACCUMULATOR_H_
diff --git a/webrtc/base/rtccertificate.h b/webrtc/base/rtccertificate.h
new file mode 100644
index 0000000..22d8fe7
--- /dev/null
+++ b/webrtc/base/rtccertificate.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_RTCCERTIFICATE_H_
+#define WEBRTC_BASE_RTCCERTIFICATE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/rtccertificate.h"
+
+#endif // WEBRTC_BASE_RTCCERTIFICATE_H_
diff --git a/webrtc/base/rtccertificategenerator.h b/webrtc/base/rtccertificategenerator.h
new file mode 100644
index 0000000..fac1cec
--- /dev/null
+++ b/webrtc/base/rtccertificategenerator.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_RTCCERTIFICATEGENERATOR_H_
+#define WEBRTC_BASE_RTCCERTIFICATEGENERATOR_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/rtccertificategenerator.h"
+
+#endif // WEBRTC_BASE_RTCCERTIFICATEGENERATOR_H_
diff --git a/webrtc/base/safe_compare.h b/webrtc/base/safe_compare.h
new file mode 100644
index 0000000..acdd9ce
--- /dev/null
+++ b/webrtc/base/safe_compare.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// This file defines six constexpr functions:
+//
+// rtc::SafeEq // ==
+// rtc::SafeNe // !=
+// rtc::SafeLt // <
+// rtc::SafeLe // <=
+// rtc::SafeGt // >
+// rtc::SafeGe // >=
+//
+// They each accept two arguments of arbitrary types, and in almost all cases,
+// they simply call the appropriate comparison operator. However, if both
+// arguments are integers, they don't compare them using C++'s quirky rules,
+// but instead adhere to the true mathematical definitions. It is as if the
+// arguments were first converted to infinite-range signed integers, and then
+// compared, although of course nothing expensive like that actually takes
+// place. In practice, for signed/signed and unsigned/unsigned comparisons and
+// some mixed-signed comparisons with a compile-time constant, the overhead is
+// zero; in the remaining cases, it is just a few machine instructions (no
+// branches).
+
+#ifndef WEBRTC_BASE_SAFE_COMPARE_H_
+#define WEBRTC_BASE_SAFE_COMPARE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/safe_compare.h"
+
+#endif // WEBRTC_BASE_SAFE_COMPARE_H_
diff --git a/webrtc/base/safe_conversions.h b/webrtc/base/safe_conversions.h
new file mode 100644
index 0000000..ac0bb65
--- /dev/null
+++ b/webrtc/base/safe_conversions.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Borrowed from Chromium's src/base/numerics/safe_conversions.h.
+
+#ifndef WEBRTC_BASE_SAFE_CONVERSIONS_H_
+#define WEBRTC_BASE_SAFE_CONVERSIONS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/safe_conversions.h"
+
+#endif // WEBRTC_BASE_SAFE_CONVERSIONS_H_
diff --git a/webrtc/base/safe_conversions_impl.h b/webrtc/base/safe_conversions_impl.h
new file mode 100644
index 0000000..497e156
--- /dev/null
+++ b/webrtc/base/safe_conversions_impl.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Borrowed from Chromium's src/base/numerics/safe_conversions_impl.h.
+
+#ifndef WEBRTC_BASE_SAFE_CONVERSIONS_IMPL_H_
+#define WEBRTC_BASE_SAFE_CONVERSIONS_IMPL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/safe_conversions_impl.h"
+
+#endif // WEBRTC_BASE_SAFE_CONVERSIONS_IMPL_H_
diff --git a/webrtc/base/safe_minmax.h b/webrtc/base/safe_minmax.h
new file mode 100644
index 0000000..54d99b7
--- /dev/null
+++ b/webrtc/base/safe_minmax.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SAFE_MINMAX_H_
+#define WEBRTC_BASE_SAFE_MINMAX_H_
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/safe_minmax.h"
+
+#endif // WEBRTC_BASE_SAFE_MINMAX_H_
diff --git a/webrtc/base/sanitizer.h b/webrtc/base/sanitizer.h
new file mode 100644
index 0000000..56a5e10
--- /dev/null
+++ b/webrtc/base/sanitizer.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SANITIZER_H_
+#define WEBRTC_BASE_SANITIZER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sanitizer.h"
+
+#endif // WEBRTC_BASE_SANITIZER_H_
diff --git a/webrtc/base/scoped_ref_ptr.h b/webrtc/base/scoped_ref_ptr.h
new file mode 100644
index 0000000..2599562
--- /dev/null
+++ b/webrtc/base/scoped_ref_ptr.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2011 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Originally these classes are from Chromium.
+// http://src.chromium.org/viewvc/chrome/trunk/src/base/memory/ref_counted.h?view=markup
+
+//
+// A smart pointer class for reference counted objects. Use this class instead
+// of calling AddRef and Release manually on a reference counted object to
+// avoid common memory leaks caused by forgetting to Release an object
+// reference. Sample usage:
+//
+// class MyFoo : public RefCounted<MyFoo> {
+// ...
+// };
+//
+// void some_function() {
+// scoped_refptr<MyFoo> foo = new MyFoo();
+// foo->Method(param);
+// // |foo| is released when this function returns
+// }
+//
+// void some_other_function() {
+// scoped_refptr<MyFoo> foo = new MyFoo();
+// ...
+// foo = nullptr; // explicitly releases |foo|
+// ...
+// if (foo)
+// foo->Method(param);
+// }
+//
+// The above examples show how scoped_refptr<T> acts like a pointer to T.
+// Given two scoped_refptr<T> classes, it is also possible to exchange
+// references between the two objects, like so:
+//
+// {
+// scoped_refptr<MyFoo> a = new MyFoo();
+// scoped_refptr<MyFoo> b;
+//
+// b.swap(a);
+// // now, |b| references the MyFoo object, and |a| references null.
+// }
+//
+// To make both |a| and |b| in the above example reference the same MyFoo
+// object, simply use the assignment operator:
+//
+// {
+// scoped_refptr<MyFoo> a = new MyFoo();
+// scoped_refptr<MyFoo> b;
+//
+// b = a;
+// // now, |a| and |b| each own a reference to the same MyFoo object.
+// }
+//
+
+#ifndef WEBRTC_BASE_SCOPED_REF_PTR_H_
+#define WEBRTC_BASE_SCOPED_REF_PTR_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+
+#endif // WEBRTC_BASE_SCOPED_REF_PTR_H_
diff --git a/webrtc/base/sequenced_task_checker.h b/webrtc/base/sequenced_task_checker.h
new file mode 100644
index 0000000..e586b8d
--- /dev/null
+++ b/webrtc/base/sequenced_task_checker.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SEQUENCED_TASK_CHECKER_H_
+#define WEBRTC_BASE_SEQUENCED_TASK_CHECKER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+
+#endif // WEBRTC_BASE_SEQUENCED_TASK_CHECKER_H_
diff --git a/webrtc/base/sequenced_task_checker_impl.h b/webrtc/base/sequenced_task_checker_impl.h
new file mode 100644
index 0000000..4972539
--- /dev/null
+++ b/webrtc/base/sequenced_task_checker_impl.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_
+#define WEBRTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sequenced_task_checker_impl.h"
+
+#endif // WEBRTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_
diff --git a/webrtc/base/sha1.h b/webrtc/base/sha1.h
new file mode 100644
index 0000000..fde3e59
--- /dev/null
+++ b/webrtc/base/sha1.h
@@ -0,0 +1,18 @@
+/*
+ * SHA-1 in C
+ * By Steve Reid <sreid@sea-to-sky.net>
+ * 100% Public Domain
+ *
+*/
+
+// Ported to C++, Google style, under namespace rtc.
+
+#ifndef WEBRTC_BASE_SHA1_H_
+#define WEBRTC_BASE_SHA1_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sha1.h"
+
+#endif // WEBRTC_BASE_SHA1_H_
diff --git a/webrtc/base/sha1digest.h b/webrtc/base/sha1digest.h
new file mode 100644
index 0000000..e3b4ef8
--- /dev/null
+++ b/webrtc/base/sha1digest.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SHA1DIGEST_H_
+#define WEBRTC_BASE_SHA1DIGEST_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sha1digest.h"
+
+#endif // WEBRTC_BASE_SHA1DIGEST_H_
diff --git a/webrtc/base/signalthread.h b/webrtc/base/signalthread.h
new file mode 100644
index 0000000..f5fcf2c
--- /dev/null
+++ b/webrtc/base/signalthread.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SIGNALTHREAD_H_
+#define WEBRTC_BASE_SIGNALTHREAD_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/signalthread.h"
+
+#endif // WEBRTC_BASE_SIGNALTHREAD_H_
diff --git a/webrtc/base/sigslot.h b/webrtc/base/sigslot.h
new file mode 100644
index 0000000..9d31441
--- /dev/null
+++ b/webrtc/base/sigslot.h
@@ -0,0 +1,104 @@
+// sigslot.h: Signal/Slot classes
+//
+// Written by Sarah Thompson (sarah@telergy.com) 2002.
+//
+// License: Public domain. You are free to use this code however you like, with
+// the proviso that the author takes on no responsibility or liability for any
+// use.
+//
+// QUICK DOCUMENTATION
+//
+// (see also the full documentation at http://sigslot.sourceforge.net/)
+//
+// #define switches
+// SIGSLOT_PURE_ISO:
+// Define this to force ISO C++ compliance. This also disables all of
+// the thread safety support on platforms where it is available.
+//
+// SIGSLOT_USE_POSIX_THREADS:
+// Force use of Posix threads when using a C++ compiler other than gcc
+// on a platform that supports Posix threads. (When using gcc, this is
+// the default - use SIGSLOT_PURE_ISO to disable this if necessary)
+//
+// SIGSLOT_DEFAULT_MT_POLICY:
+// Where thread support is enabled, this defaults to
+// multi_threaded_global. Otherwise, the default is single_threaded.
+// #define this yourself to override the default. In pure ISO mode,
+// anything other than single_threaded will cause a compiler error.
+//
+// PLATFORM NOTES
+//
+// Win32:
+// On Win32, the WEBRTC_WIN symbol must be #defined. Most mainstream
+// compilers do this by default, but you may need to define it yourself
+// if your build environment is less standard. This causes the Win32
+// thread support to be compiled in and used automatically.
+//
+// Unix/Linux/BSD, etc.:
+// If you're using gcc, it is assumed that you have Posix threads
+// available, so they are used automatically. You can override this (as
+// under Windows) with the SIGSLOT_PURE_ISO switch. If you're using
+// something other than gcc but still want to use Posix threads, you
+// need to #define SIGSLOT_USE_POSIX_THREADS.
+//
+// ISO C++:
+// If none of the supported platforms are detected, or if
+// SIGSLOT_PURE_ISO is defined, all multithreading support is turned
+// off, along with any code that might cause a pure ISO C++ environment
+// to complain. Before you ask, gcc -ansi -pedantic won't compile this
+// library, but gcc -ansi is fine. Pedantic mode seems to throw a lot of
+// errors that aren't really there. If you feel like investigating this,
+// please contact the author.
+//
+//
+// THREADING MODES
+//
+// single_threaded:
+// Your program is assumed to be single threaded from the point of view
+// of signal/slot usage (i.e. all objects using signals and slots are
+// created and destroyed from a single thread). Behaviour if objects are
+// destroyed concurrently is undefined (i.e. you'll get the occasional
+// segmentation fault/memory exception).
+//
+// multi_threaded_global:
+// Your program is assumed to be multi threaded. Objects using signals
+// and slots can be safely created and destroyed from any thread, even
+// when connections exist. In multi_threaded_global mode, this is
+// achieved by a single global mutex (actually a critical section on
+// Windows because they are faster). This option uses less OS resources,
+// but results in more opportunities for contention, possibly resulting
+// in more context switches than are strictly necessary.
+//
+// multi_threaded_local:
+// Behaviour in this mode is essentially the same as
+// multi_threaded_global, except that each signal, and each object that
+// inherits has_slots, all have their own mutex/critical section. In
+// practice, this means that mutex collisions (and hence context
+// switches) only happen if they are absolutely essential. However, on
+// some platforms, creating a lot of mutexes can slow down the whole OS,
+// so use this option with care.
+//
+// USING THE LIBRARY
+//
+// See the full documentation at http://sigslot.sourceforge.net/
+//
+// Libjingle specific:
+//
+// This file has been modified such that has_slots and signalx do not have to be
+// using the same threading requirements. E.g. it is possible to connect a
+// has_slots<single_threaded> and signal0<multi_threaded_local> or
+// has_slots<multi_threaded_local> and signal0<single_threaded>.
+// If has_slots is single threaded the user must ensure that it is not trying
+// to connect or disconnect to signalx concurrently or data race may occur.
+// If signalx is single threaded the user must ensure that disconnect, connect
+// or signal is not happening concurrently or data race may occur.
+
+#ifndef WEBRTC_BASE_SIGSLOT_H_
+#define WEBRTC_BASE_SIGSLOT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sigslot.h"
+
+#endif // WEBRTC_BASE_SIGSLOT_H_
diff --git a/webrtc/base/sigslottester.h b/webrtc/base/sigslottester.h
new file mode 100644
index 0000000..545bf9e
--- /dev/null
+++ b/webrtc/base/sigslottester.h
@@ -0,0 +1,23 @@
+// This file was GENERATED by command:
+// pump.py sigslottester.h.pump
+// DO NOT EDIT BY HAND!!!
+
+/*
+ * Copyright 2014 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SIGSLOTTESTER_H_
+#define WEBRTC_BASE_SIGSLOTTESTER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sigslottester.h"
+
+#endif // WEBRTC_BASE_SIGSLOTTESTER_H_
diff --git a/webrtc/base/socket.h b/webrtc/base/socket.h
new file mode 100644
index 0000000..19ea7a0
--- /dev/null
+++ b/webrtc/base/socket.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SOCKET_H_
+#define WEBRTC_BASE_SOCKET_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/socket.h"
+
+#endif // WEBRTC_BASE_SOCKET_H_
diff --git a/webrtc/base/socket_unittest.h b/webrtc/base/socket_unittest.h
new file mode 100644
index 0000000..f6769f9
--- /dev/null
+++ b/webrtc/base/socket_unittest.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2009 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SOCKET_UNITTEST_H_
+#define WEBRTC_BASE_SOCKET_UNITTEST_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/socket_unittest.h"
+
+#endif // WEBRTC_BASE_SOCKET_UNITTEST_H_
diff --git a/webrtc/base/socketadapters.h b/webrtc/base/socketadapters.h
new file mode 100644
index 0000000..7df0f3a
--- /dev/null
+++ b/webrtc/base/socketadapters.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SOCKETADAPTERS_H_
+#define WEBRTC_BASE_SOCKETADAPTERS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/socketadapters.h"
+
+#endif // WEBRTC_BASE_SOCKETADAPTERS_H_
diff --git a/webrtc/base/socketaddress.h b/webrtc/base/socketaddress.h
new file mode 100644
index 0000000..20199ad
--- /dev/null
+++ b/webrtc/base/socketaddress.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SOCKETADDRESS_H_
+#define WEBRTC_BASE_SOCKETADDRESS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/socketaddress.h"
+
+#endif // WEBRTC_BASE_SOCKETADDRESS_H_
diff --git a/webrtc/base/socketaddresspair.h b/webrtc/base/socketaddresspair.h
new file mode 100644
index 0000000..3f53f10
--- /dev/null
+++ b/webrtc/base/socketaddresspair.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SOCKETADDRESSPAIR_H_
+#define WEBRTC_BASE_SOCKETADDRESSPAIR_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/socketaddresspair.h"
+
+#endif // WEBRTC_BASE_SOCKETADDRESSPAIR_H_
diff --git a/webrtc/base/socketfactory.h b/webrtc/base/socketfactory.h
new file mode 100644
index 0000000..3a829ac
--- /dev/null
+++ b/webrtc/base/socketfactory.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SOCKETFACTORY_H_
+#define WEBRTC_BASE_SOCKETFACTORY_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/socketfactory.h"
+
+#endif // WEBRTC_BASE_SOCKETFACTORY_H_
diff --git a/webrtc/base/socketserver.h b/webrtc/base/socketserver.h
new file mode 100644
index 0000000..55b427d
--- /dev/null
+++ b/webrtc/base/socketserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SOCKETSERVER_H_
+#define WEBRTC_BASE_SOCKETSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/socketserver.h"
+
+#endif // WEBRTC_BASE_SOCKETSERVER_H_
diff --git a/webrtc/base/socketstream.h b/webrtc/base/socketstream.h
new file mode 100644
index 0000000..a76ffb3
--- /dev/null
+++ b/webrtc/base/socketstream.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2005 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SOCKETSTREAM_H_
+#define WEBRTC_BASE_SOCKETSTREAM_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/socketstream.h"
+
+#endif // WEBRTC_BASE_SOCKETSTREAM_H_
diff --git a/webrtc/base/ssladapter.h b/webrtc/base/ssladapter.h
new file mode 100644
index 0000000..3d432ec
--- /dev/null
+++ b/webrtc/base/ssladapter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SSLADAPTER_H_
+#define WEBRTC_BASE_SSLADAPTER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/ssladapter.h"
+
+#endif // WEBRTC_BASE_SSLADAPTER_H_
diff --git a/webrtc/base/sslfingerprint.h b/webrtc/base/sslfingerprint.h
new file mode 100644
index 0000000..6be82fd
--- /dev/null
+++ b/webrtc/base/sslfingerprint.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SSLFINGERPRINT_H_
+#define WEBRTC_BASE_SSLFINGERPRINT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sslfingerprint.h"
+
+#endif // WEBRTC_BASE_SSLFINGERPRINT_H_
diff --git a/webrtc/base/sslidentity.h b/webrtc/base/sslidentity.h
new file mode 100644
index 0000000..1cedfa0
--- /dev/null
+++ b/webrtc/base/sslidentity.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Handling of certificates and keypairs for SSLStreamAdapter's peer mode.
+
+#ifndef WEBRTC_BASE_SSLIDENTITY_H_
+#define WEBRTC_BASE_SSLIDENTITY_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sslidentity.h"
+
+#endif // WEBRTC_BASE_SSLIDENTITY_H_
diff --git a/webrtc/base/sslroots.h b/webrtc/base/sslroots.h
new file mode 100644
index 0000000..9fa706b
--- /dev/null
+++ b/webrtc/base/sslroots.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SSLROOTS_H_
+#define WEBRTC_BASE_SSLROOTS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sslroots.h"
+
+#endif // WEBRTC_BASE_SSLROOTS_H_
diff --git a/webrtc/base/sslstreamadapter.h b/webrtc/base/sslstreamadapter.h
new file mode 100644
index 0000000..d7c062e
--- /dev/null
+++ b/webrtc/base/sslstreamadapter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SSLSTREAMADAPTER_H_
+#define WEBRTC_BASE_SSLSTREAMADAPTER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/sslstreamadapter.h"
+
+#endif // WEBRTC_BASE_SSLSTREAMADAPTER_H_
diff --git a/webrtc/base/stream.h b/webrtc/base/stream.h
new file mode 100644
index 0000000..18dd865
--- /dev/null
+++ b/webrtc/base/stream.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_STREAM_H_
+#define WEBRTC_BASE_STREAM_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/stream.h"
+
+#endif // WEBRTC_BASE_STREAM_H_
diff --git a/webrtc/base/string_to_number.h b/webrtc/base/string_to_number.h
new file mode 100644
index 0000000..fa88ba4
--- /dev/null
+++ b/webrtc/base/string_to_number.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_STRING_TO_NUMBER_H_
+#define WEBRTC_BASE_STRING_TO_NUMBER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/string_to_number.h"
+
+#endif // WEBRTC_BASE_STRING_TO_NUMBER_H_
diff --git a/webrtc/base/stringencode.h b/webrtc/base/stringencode.h
new file mode 100644
index 0000000..27b810e
--- /dev/null
+++ b/webrtc/base/stringencode.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_STRINGENCODE_H_
+#define WEBRTC_BASE_STRINGENCODE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/stringencode.h"
+
+#endif // WEBRTC_BASE_STRINGENCODE_H__
diff --git a/webrtc/base/stringize_macros.h b/webrtc/base/stringize_macros.h
new file mode 100644
index 0000000..5f8a5b1
--- /dev/null
+++ b/webrtc/base/stringize_macros.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Modified from the Chromium original:
+// src/base/strings/stringize_macros.h
+
+// This file defines preprocessor macros for stringizing preprocessor
+// symbols (or their output) and manipulating preprocessor symbols
+// that define strings.
+
+#ifndef WEBRTC_BASE_STRINGIZE_MACROS_H_
+#define WEBRTC_BASE_STRINGIZE_MACROS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/stringize_macros.h"
+
+#endif // WEBRTC_BASE_STRINGIZE_MACROS_H_
diff --git a/webrtc/base/stringutils.h b/webrtc/base/stringutils.h
new file mode 100644
index 0000000..e3b5e07
--- /dev/null
+++ b/webrtc/base/stringutils.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_STRINGUTILS_H_
+#define WEBRTC_BASE_STRINGUTILS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/stringutils.h"
+
+#endif // WEBRTC_BASE_STRINGUTILS_H_
diff --git a/webrtc/base/swap_queue.h b/webrtc/base/swap_queue.h
new file mode 100644
index 0000000..7111147
--- /dev/null
+++ b/webrtc/base/swap_queue.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_SWAP_QUEUE_H_
+#define WEBRTC_BASE_SWAP_QUEUE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/swap_queue.h"
+
+#endif // WEBRTC_BASE_SWAP_QUEUE_H_
diff --git a/webrtc/base/task_queue.h b/webrtc/base/task_queue.h
new file mode 100644
index 0000000..12f5cbb
--- /dev/null
+++ b/webrtc/base/task_queue.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TASK_QUEUE_H_
+#define WEBRTC_BASE_TASK_QUEUE_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/task_queue.h"
+
+#endif // WEBRTC_BASE_TASK_QUEUE_H_
diff --git a/webrtc/base/task_queue_posix.h b/webrtc/base/task_queue_posix.h
new file mode 100644
index 0000000..6cb51a0
--- /dev/null
+++ b/webrtc/base/task_queue_posix.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TASK_QUEUE_POSIX_H_
+#define WEBRTC_BASE_TASK_QUEUE_POSIX_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/task_queue_posix.h"
+
+#endif // WEBRTC_BASE_TASK_QUEUE_POSIX_H_
diff --git a/webrtc/base/template_util.h b/webrtc/base/template_util.h
new file mode 100644
index 0000000..9a05643
--- /dev/null
+++ b/webrtc/base/template_util.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Borrowed from Chromium's src/base/template_util.h.
+
+#ifndef WEBRTC_BASE_TEMPLATE_UTIL_H_
+#define WEBRTC_BASE_TEMPLATE_UTIL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/template_util.h"
+
+#endif // WEBRTC_BASE_TEMPLATE_UTIL_H_
diff --git a/webrtc/base/testbase64.h b/webrtc/base/testbase64.h
new file mode 100644
index 0000000..fc9846f
--- /dev/null
+++ b/webrtc/base/testbase64.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TESTBASE64_H_
+#define WEBRTC_BASE_TESTBASE64_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/testbase64.h"
+
+#endif // WEBRTC_BASE_TESTBASE64_H_
diff --git a/webrtc/base/testclient.h b/webrtc/base/testclient.h
new file mode 100644
index 0000000..378e2b8
--- /dev/null
+++ b/webrtc/base/testclient.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TESTCLIENT_H_
+#define WEBRTC_BASE_TESTCLIENT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/testclient.h"
+
+#endif // WEBRTC_BASE_TESTCLIENT_H_
diff --git a/webrtc/base/testechoserver.h b/webrtc/base/testechoserver.h
new file mode 100644
index 0000000..21365e2
--- /dev/null
+++ b/webrtc/base/testechoserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TESTECHOSERVER_H_
+#define WEBRTC_BASE_TESTECHOSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/testechoserver.h"
+
+#endif // WEBRTC_BASE_TESTECHOSERVER_H_
diff --git a/webrtc/base/testutils.h b/webrtc/base/testutils.h
new file mode 100644
index 0000000..74f2160
--- /dev/null
+++ b/webrtc/base/testutils.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TESTUTILS_H_
+#define WEBRTC_BASE_TESTUTILS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/testutils.h"
+
+#endif // WEBRTC_BASE_TESTUTILS_H_
diff --git a/webrtc/base/thread.h b/webrtc/base/thread.h
new file mode 100644
index 0000000..6a6887a
--- /dev/null
+++ b/webrtc/base/thread.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_THREAD_H_
+#define WEBRTC_BASE_THREAD_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/thread.h"
+
+#endif // WEBRTC_BASE_THREAD_H_
diff --git a/webrtc/base/thread_annotations.h b/webrtc/base/thread_annotations.h
new file mode 100644
index 0000000..5b94ffe
--- /dev/null
+++ b/webrtc/base/thread_annotations.h
@@ -0,0 +1,27 @@
+//
+// Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS. All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+//
+// Borrowed from
+// https://code.google.com/p/gperftools/source/browse/src/base/thread_annotations.h
+// but adapted for clang attributes instead of the gcc.
+//
+// This header file contains the macro definitions for thread safety
+// annotations that allow the developers to document the locking policies
+// of their multi-threaded code. The annotations can also help program
+// analysis tools to identify potential thread safety issues.
+
+#ifndef WEBRTC_BASE_THREAD_ANNOTATIONS_H_
+#define WEBRTC_BASE_THREAD_ANNOTATIONS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/thread_annotations.h"
+
+#endif // WEBRTC_BASE_THREAD_ANNOTATIONS_H_
diff --git a/webrtc/base/thread_checker.h b/webrtc/base/thread_checker.h
new file mode 100644
index 0000000..ade5256
--- /dev/null
+++ b/webrtc/base/thread_checker.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Borrowed from Chromium's src/base/threading/thread_checker.h.
+
+#ifndef WEBRTC_BASE_THREAD_CHECKER_H_
+#define WEBRTC_BASE_THREAD_CHECKER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/thread_checker.h"
+
+#endif // WEBRTC_BASE_THREAD_CHECKER_H_
diff --git a/webrtc/base/thread_checker_impl.h b/webrtc/base/thread_checker_impl.h
new file mode 100644
index 0000000..3a0a6c7
--- /dev/null
+++ b/webrtc/base/thread_checker_impl.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Borrowed from Chromium's src/base/threading/thread_checker_impl.h.
+
+#ifndef WEBRTC_BASE_THREAD_CHECKER_IMPL_H_
+#define WEBRTC_BASE_THREAD_CHECKER_IMPL_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/thread_checker_impl.h"
+
+#endif // WEBRTC_BASE_THREAD_CHECKER_IMPL_H_
diff --git a/webrtc/base/timedelta.h b/webrtc/base/timedelta.h
new file mode 100644
index 0000000..f2e98a8
--- /dev/null
+++ b/webrtc/base/timedelta.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TIMEDELTA_H_
+#define WEBRTC_BASE_TIMEDELTA_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/timedelta.h"
+
+#endif // WEBRTC_BASE_TIMEDELTA_H_
diff --git a/webrtc/base/timestampaligner.h b/webrtc/base/timestampaligner.h
new file mode 100644
index 0000000..60c3631
--- /dev/null
+++ b/webrtc/base/timestampaligner.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TIMESTAMPALIGNER_H_
+#define WEBRTC_BASE_TIMESTAMPALIGNER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/timestampaligner.h"
+
+#endif // WEBRTC_BASE_TIMESTAMPALIGNER_H_
diff --git a/webrtc/base/timeutils.h b/webrtc/base/timeutils.h
new file mode 100644
index 0000000..1569b58
--- /dev/null
+++ b/webrtc/base/timeutils.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2005 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TIMEUTILS_H_
+#define WEBRTC_BASE_TIMEUTILS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/timeutils.h"
+
+#endif // WEBRTC_BASE_TIMEUTILS_H_
diff --git a/webrtc/base/trace_event.h b/webrtc/base/trace_event.h
new file mode 100644
index 0000000..1bea5f4
--- /dev/null
+++ b/webrtc/base/trace_event.h
@@ -0,0 +1,14 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file under third_party_mods/chromium or at:
+// http://src.chromium.org/svn/trunk/src/LICENSE
+
+#ifndef WEBRTC_BASE_TRACE_EVENT_H_
+#define WEBRTC_BASE_TRACE_EVENT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/trace_event.h"
+
+#endif // WEBRTC_BASE_TRACE_EVENT_H_
diff --git a/webrtc/base/transformadapter.h b/webrtc/base/transformadapter.h
new file mode 100644
index 0000000..3d9c86b
--- /dev/null
+++ b/webrtc/base/transformadapter.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TRANSFORMADAPTER_H_
+#define WEBRTC_BASE_TRANSFORMADAPTER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/transformadapter.h"
+
+#endif // WEBRTC_BASE_TRANSFORMADAPTER_H_
diff --git a/webrtc/base/type_traits.h b/webrtc/base/type_traits.h
new file mode 100644
index 0000000..6a4ac8d
--- /dev/null
+++ b/webrtc/base/type_traits.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_TYPE_TRAITS_H_
+#define WEBRTC_BASE_TYPE_TRAITS_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/type_traits.h"
+
+#endif // WEBRTC_BASE_TYPE_TRAITS_H_
diff --git a/webrtc/base/unixfilesystem.h b/webrtc/base/unixfilesystem.h
new file mode 100644
index 0000000..7a18205
--- /dev/null
+++ b/webrtc/base/unixfilesystem.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_UNIXFILESYSTEM_H_
+#define WEBRTC_BASE_UNIXFILESYSTEM_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/unixfilesystem.h"
+
+#endif // WEBRTC_BASE_UNIXFILESYSTEM_H_
diff --git a/webrtc/base/virtualsocketserver.h b/webrtc/base/virtualsocketserver.h
new file mode 100644
index 0000000..31ce96d
--- /dev/null
+++ b/webrtc/base/virtualsocketserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_VIRTUALSOCKETSERVER_H_
+#define WEBRTC_BASE_VIRTUALSOCKETSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/virtualsocketserver.h"
+
+#endif // WEBRTC_BASE_VIRTUALSOCKETSERVER_H_
diff --git a/webrtc/base/weak_ptr.h b/webrtc/base/weak_ptr.h
new file mode 100644
index 0000000..282a551
--- /dev/null
+++ b/webrtc/base/weak_ptr.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_WEAK_PTR_H_
+#define WEBRTC_BASE_WEAK_PTR_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/weak_ptr.h"
+
+#endif // WEBRTC_BASE_WEAK_PTR_H_
diff --git a/webrtc/base/win32.h b/webrtc/base/win32.h
new file mode 100644
index 0000000..413bd11
--- /dev/null
+++ b/webrtc/base/win32.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_WIN32_H_
+#define WEBRTC_BASE_WIN32_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/win32.h"
+
+#endif // WEBRTC_BASE_WIN32_H_
diff --git a/webrtc/base/win32filesystem.h b/webrtc/base/win32filesystem.h
new file mode 100644
index 0000000..d647c44
--- /dev/null
+++ b/webrtc/base/win32filesystem.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_WIN32FILESYSTEM_H_
+#define WEBRTC_BASE_WIN32FILESYSTEM_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/win32filesystem.h"
+
+#endif // WEBRTC_BASE_WIN32FILESYSTEM_H_
diff --git a/webrtc/base/win32socketinit.h b/webrtc/base/win32socketinit.h
new file mode 100644
index 0000000..d7017e1
--- /dev/null
+++ b/webrtc/base/win32socketinit.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2009 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_WIN32SOCKETINIT_H_
+#define WEBRTC_BASE_WIN32SOCKETINIT_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/win32socketinit.h"
+
+#endif // WEBRTC_BASE_WIN32SOCKETINIT_H_
diff --git a/webrtc/base/win32socketserver.h b/webrtc/base/win32socketserver.h
new file mode 100644
index 0000000..c143692
--- /dev/null
+++ b/webrtc/base/win32socketserver.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_WIN32SOCKETSERVER_H_
+#define WEBRTC_BASE_WIN32SOCKETSERVER_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/win32socketserver.h"
+
+#endif // WEBRTC_BASE_WIN32SOCKETSERVER_H_
diff --git a/webrtc/base/win32window.h b/webrtc/base/win32window.h
new file mode 100644
index 0000000..ffffdf9
--- /dev/null
+++ b/webrtc/base/win32window.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_WIN32WINDOW_H_
+#define WEBRTC_BASE_WIN32WINDOW_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/win32window.h"
+
+#endif // WEBRTC_BASE_WIN32WINDOW_H_
diff --git a/webrtc/base/window.h b/webrtc/base/window.h
new file mode 100644
index 0000000..d515f7c
--- /dev/null
+++ b/webrtc/base/window.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_BASE_WINDOW_H_
+#define WEBRTC_BASE_WINDOW_H_
+
+
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/window.h"
+
+#endif // WEBRTC_BASE_WINDOW_H_
diff --git a/webrtc/rtc_base/sslroots.h b/webrtc/rtc_base/sslroots.h
index b4e3390..9ddef0e 100644
--- a/webrtc/rtc_base/sslroots.h
+++ b/webrtc/rtc_base/sslroots.h
@@ -1,3 +1,13 @@
+/*
+ * Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
#ifndef WEBRTC_RTC_BASE_SSLROOTS_H_
#define WEBRTC_RTC_BASE_SSLROOTS_H_