diff --git a/starboard/elf_loader/elf_loader_test.cc b/starboard/elf_loader/elf_loader_test.cc
index af58b3c9cc5e..d04883c7e66a 100644
--- a/starboard/elf_loader/elf_loader_test.cc
+++ b/starboard/elf_loader/elf_loader_test.cc
@@ -14,7 +14,6 @@
 
 #include "starboard/elf_loader/elf_loader_impl.h"
 
-#include "starboard/common/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if SB_CAN(MAP_EXECUTABLE_MEMORY)
diff --git a/starboard/elf_loader/program_table_test.cc b/starboard/elf_loader/program_table_test.cc
index b8c5c1be3d1b..d82cce55aa6e 100644
--- a/starboard/elf_loader/program_table_test.cc
+++ b/starboard/elf_loader/program_table_test.cc
@@ -17,7 +17,6 @@
 #include <string>
 #include <vector>
 
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/elf_loader/file.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/starboard/elf_loader/relocations_test.cc b/starboard/elf_loader/relocations_test.cc
index ef68406f0ef2..21f0ba20510c 100644
--- a/starboard/elf_loader/relocations_test.cc
+++ b/starboard/elf_loader/relocations_test.cc
@@ -14,7 +14,6 @@
 
 #include "starboard/elf_loader/relocations.h"
 
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/elf_loader/elf.h"
 #include "starboard/elf_loader/file_impl.h"
 #include "starboard/string.h"
diff --git a/starboard/nplb/align_test.cc b/starboard/nplb/align_test.cc
index 71c51ab3b838..0f122bc390ec 100644
--- a/starboard/nplb/align_test.cc
+++ b/starboard/nplb/align_test.cc
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/configuration.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -20,11 +19,11 @@ namespace starboard {
 namespace nplb {
 namespace {
 
-bool IsAligned(void *pointer, size_t alignment) {
+bool IsAligned(void* pointer, size_t alignment) {
   return (reinterpret_cast<uintptr_t>(pointer) % alignment) == 0;
 }
 
-size_t GetAlignment(void *pointer) {
+size_t GetAlignment(void* pointer) {
   for (size_t alignment = static_cast<size_t>(1) << ((sizeof(size_t) * 8) - 1);
        alignment != 0; alignment /= 2) {
     if (IsAligned(pointer, alignment)) {
diff --git a/starboard/nplb/player_test_fixture.h b/starboard/nplb/player_test_fixture.h
index 72b069b939eb..986a8adbaabe 100644
--- a/starboard/nplb/player_test_fixture.h
+++ b/starboard/nplb/player_test_fixture.h
@@ -22,7 +22,6 @@
 #include <vector>
 
 #include "starboard/common/queue.h"
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/drm.h"
 #include "starboard/nplb/player_test_util.h"
 #include "starboard/player.h"
diff --git a/starboard/shared/starboard/player/filter/testing/adaptive_audio_decoder_test.cc b/starboard/shared/starboard/player/filter/testing/adaptive_audio_decoder_test.cc
index 7a2b8fe7de10..e5877df889b1 100644
--- a/starboard/shared/starboard/player/filter/testing/adaptive_audio_decoder_test.cc
+++ b/starboard/shared/starboard/player/filter/testing/adaptive_audio_decoder_test.cc
@@ -22,7 +22,6 @@
 #include <string>
 
 #include "starboard/common/mutex.h"
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/configuration_constants.h"
 #include "starboard/shared/starboard/media/media_support_internal.h"
 #include "starboard/shared/starboard/player/filter/audio_decoder_internal.h"
diff --git a/starboard/shared/starboard/player/filter/testing/audio_channel_layout_mixer_test.cc b/starboard/shared/starboard/player/filter/testing/audio_channel_layout_mixer_test.cc
index 16c953787b72..05ecefd079cd 100644
--- a/starboard/shared/starboard/player/filter/testing/audio_channel_layout_mixer_test.cc
+++ b/starboard/shared/starboard/player/filter/testing/audio_channel_layout_mixer_test.cc
@@ -20,7 +20,6 @@
 #include <string>
 
 #include "starboard/common/ref_counted.h"
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/shared/starboard/player/decoded_audio_internal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/starboard/shared/starboard/player/filter/testing/audio_decoder_test.cc b/starboard/shared/starboard/player/filter/testing/audio_decoder_test.cc
index 43fbff53e0c1..32b955e36bf5 100644
--- a/starboard/shared/starboard/player/filter/testing/audio_decoder_test.cc
+++ b/starboard/shared/starboard/player/filter/testing/audio_decoder_test.cc
@@ -26,7 +26,6 @@
 #include "starboard/common/media.h"
 #include "starboard/common/mutex.h"
 #include "starboard/common/ref_counted.h"
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/configuration_constants.h"
 #include "starboard/media.h"
 #include "starboard/memory.h"
diff --git a/starboard/shared/starboard/player/filter/testing/audio_renderer_internal_test.cc b/starboard/shared/starboard/player/filter/testing/audio_renderer_internal_test.cc
index 14295ba802ca..625e60260c50 100644
--- a/starboard/shared/starboard/player/filter/testing/audio_renderer_internal_test.cc
+++ b/starboard/shared/starboard/player/filter/testing/audio_renderer_internal_test.cc
@@ -18,7 +18,6 @@
 #include <set>
 
 #include "starboard/common/log.h"
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/media.h"
 #include "starboard/memory.h"
 #include "starboard/shared/starboard/media/media_util.h"
@@ -115,8 +114,8 @@ class AudioRendererTest : public ::testing::Test {
     const int kMaxCachedFrames = 256 * 1024;
     const int kMaxFramesPerAppend = 16384;
     audio_renderer_.reset(new AudioRendererPcm(
-        make_scoped_ptr<AudioDecoder>(audio_decoder_),
-        make_scoped_ptr<AudioRendererSink>(audio_renderer_sink_),
+        std::make_unique<AudioDecoder>(audio_decoder_),
+        std::make_unique<AudioRendererSink>(audio_renderer_sink_),
         GetDefaultAudioStreamInfo(), kMaxCachedFrames, kMaxFramesPerAppend));
     audio_renderer_->Initialize(
         std::bind(&AudioRendererTest::OnError, this),
diff --git a/starboard/shared/starboard/player/filter/testing/media_time_provider_impl_test.cc b/starboard/shared/starboard/player/filter/testing/media_time_provider_impl_test.cc
index d2aec8c102b9..0fa28a612b4e 100644
--- a/starboard/shared/starboard/player/filter/testing/media_time_provider_impl_test.cc
+++ b/starboard/shared/starboard/player/filter/testing/media_time_provider_impl_test.cc
@@ -83,7 +83,7 @@ class MediaTimeProviderImplTest : public ::testing::Test {
         // is passed to and owned by |media_time_provider_impl_|, so the tests
         // can adjust expectation on it.  This is safe in the context of the
         // tests.
-        media_time_provider_impl_(make_scoped_ptr<MonotonicSystemTimeProvider>(
+        media_time_provider_impl_(std::make_unique<MonotonicSystemTimeProvider>(
             system_time_provider_)) {
     media_time_provider_impl_.SetPlaybackRate(1.0);
   }
diff --git a/starboard/shared/starboard/player/filter/testing/player_components_test.cc b/starboard/shared/starboard/player/filter/testing/player_components_test.cc
index 0e3b3ad0306c..240cd378c992 100644
--- a/starboard/shared/starboard/player/filter/testing/player_components_test.cc
+++ b/starboard/shared/starboard/player/filter/testing/player_components_test.cc
@@ -19,7 +19,6 @@
 #include <string>
 #include <vector>
 
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/common/string.h"
 #include "starboard/media.h"
 #include "starboard/player.h"
diff --git a/starboard/shared/starboard/player/filter/testing/video_decoder_test.cc b/starboard/shared/starboard/player/filter/testing/video_decoder_test.cc
index 02013b6646c8..786b38391c0d 100644
--- a/starboard/shared/starboard/player/filter/testing/video_decoder_test.cc
+++ b/starboard/shared/starboard/player/filter/testing/video_decoder_test.cc
@@ -22,7 +22,6 @@
 
 #include "starboard/common/condition_variable.h"
 #include "starboard/common/mutex.h"
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/common/string.h"
 #include "starboard/configuration_constants.h"
 #include "starboard/drm.h"
diff --git a/starboard/shared/starboard/player/filter/testing/video_decoder_test_fixture.cc b/starboard/shared/starboard/player/filter/testing/video_decoder_test_fixture.cc
index 0d73ff0d6b95..7bc00127ef35 100644
--- a/starboard/shared/starboard/player/filter/testing/video_decoder_test_fixture.cc
+++ b/starboard/shared/starboard/player/filter/testing/video_decoder_test_fixture.cc
@@ -25,7 +25,6 @@
 
 #include "starboard/common/condition_variable.h"
 #include "starboard/common/mutex.h"
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/common/string.h"
 #include "starboard/configuration_constants.h"
 #include "starboard/drm.h"
diff --git a/starboard/shared/starboard/player/filter/testing/video_decoder_test_fixture.h b/starboard/shared/starboard/player/filter/testing/video_decoder_test_fixture.h
index 4376bf242e9b..5b45e0902bf5 100644
--- a/starboard/shared/starboard/player/filter/testing/video_decoder_test_fixture.h
+++ b/starboard/shared/starboard/player/filter/testing/video_decoder_test_fixture.h
@@ -23,7 +23,6 @@
 
 #include "starboard/common/condition_variable.h"
 #include "starboard/common/mutex.h"
-#include "starboard/common/scoped_ptr.h"
 #include "starboard/common/string.h"
 #include "starboard/configuration_constants.h"
 #include "starboard/drm.h"