diff --git a/talk/app/webrtc/objc/RTCDataChannel.mm b/talk/app/webrtc/objc/RTCDataChannel.mm
index ef45fbe77e..00d51b10ee 100644
--- a/talk/app/webrtc/objc/RTCDataChannel.mm
+++ b/talk/app/webrtc/objc/RTCDataChannel.mm
@@ -32,6 +32,7 @@
 #import "RTCDataChannel+Internal.h"
 
 #include "webrtc/api/datachannelinterface.h"
+#include "webrtc/base/scoped_ptr.h"
 
 namespace webrtc {
 
diff --git a/webrtc/api/objc/RTCDataChannel.mm b/webrtc/api/objc/RTCDataChannel.mm
index f7ca288f15..a1f484a1a2 100644
--- a/webrtc/api/objc/RTCDataChannel.mm
+++ b/webrtc/api/objc/RTCDataChannel.mm
@@ -13,6 +13,8 @@
 #import "webrtc/api/objc/RTCDataChannel+Private.h"
 #import "webrtc/base/objc/NSString+StdString.h"
 
+#include "webrtc/base/scoped_ptr.h"
+
 namespace webrtc {
 
 class DataChannelDelegateAdapter : public DataChannelObserver {
diff --git a/webrtc/base/buffer.h b/webrtc/base/buffer.h
index ff9bb73d3f..5c9380afee 100644
--- a/webrtc/base/buffer.h
+++ b/webrtc/base/buffer.h
@@ -14,10 +14,11 @@
 #include <algorithm>  // std::swap (pre-C++11)
 #include <cassert>
 #include <cstring>
+#include <memory>
 #include <utility>  // std::swap (C++11 and later)
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/deprecation.h"
-#include "webrtc/base/scoped_ptr.h"
 
 namespace rtc {
 
@@ -164,7 +165,7 @@ class Buffer {
     assert(IsConsistent());
     if (capacity <= capacity_)
       return;
-    scoped_ptr<uint8_t[]> new_data(new uint8_t[capacity]);
+    std::unique_ptr<uint8_t[]> new_data(new uint8_t[capacity]);
     std::memcpy(new_data.get(), data_.get(), size_);
     data_ = std::move(new_data);
     capacity_ = capacity;
@@ -222,7 +223,7 @@ class Buffer {
 
   size_t size_;
   size_t capacity_;
-  scoped_ptr<uint8_t[]> data_;
+  std::unique_ptr<uint8_t[]> data_;
 };
 
 }  // namespace rtc