diff --git a/xbmc/commons/Buffer.h b/xbmc/commons/Buffer.h
index f78a35e2fe80b..c406d6e04a5ca 100644
--- a/xbmc/commons/Buffer.h
+++ b/xbmc/commons/Buffer.h
@@ -20,7 +20,7 @@
  */
 #include <string.h>
 #include <string>
-#include <boost/shared_array.hpp>
+#include <memory>
 
 namespace XbmcCommons
 {
@@ -88,7 +88,7 @@ namespace XbmcCommons
    */
   class Buffer
   {
-    boost::shared_array<unsigned char> bufferRef;
+    std::shared_ptr<unsigned char> bufferRef;
     unsigned char* buffer;
     size_t mposition;
     size_t mcapacity;
@@ -132,7 +132,7 @@ namespace XbmcCommons
     inline Buffer(size_t bufferSize) : buffer(bufferSize ? new unsigned char[bufferSize] : NULL), mcapacity(bufferSize)
     { 
       clear(); 
-      bufferRef.reset(buffer);
+      bufferRef.reset(buffer, std::default_delete<unsigned char[]>());
     }
 
     /**
@@ -166,7 +166,7 @@ namespace XbmcCommons
     inline Buffer& allocate(size_t bufferSize)
     {
       buffer = bufferSize ? new unsigned char[bufferSize] : NULL;
-      bufferRef.reset(buffer);
+      bufferRef.reset(buffer, std::default_delete<unsigned char[]>());
       mcapacity = bufferSize;
       clear();
       return *this;
diff --git a/xbmc/threads/test/TestAtomics.cpp b/xbmc/threads/test/TestAtomics.cpp
index 26403039da20b..e7453d4516858 100644
--- a/xbmc/threads/test/TestAtomics.cpp
+++ b/xbmc/threads/test/TestAtomics.cpp
@@ -21,7 +21,7 @@
 #include "TestHelpers.h"
 #include "threads/Atomics.h"
 
-#include <boost/shared_array.hpp>
+#include <memory>
 #include <iostream>
 
 #define TESTNUM 100000l
@@ -85,8 +85,8 @@ class DoSubtract : public IRunnable
 TEST(TestMassAtomic, Increment)
 {
   long lNumber = 0;
-  boost::shared_array<thread> t;
-  t.reset(new thread[NUMTHREADS]);
+  std::shared_ptr<thread> t;
+  t.reset(new thread[NUMTHREADS], std::default_delete<thread[]>());
   DoIncrement di(&lNumber);
   for(size_t i=0; i<NUMTHREADS; i++)
     t[i] = thread(di);
@@ -100,8 +100,8 @@ TEST(TestMassAtomic, Increment)
 TEST(TestMassAtomic, Decrement)
 {
   long lNumber = (NUMTHREADS * TESTNUM);
-  boost::shared_array<thread> t;
-  t.reset(new thread[NUMTHREADS]);
+  std::shared_ptr<thread> t;
+  t.reset(new thread[NUMTHREADS], std::default_delete<thread[]>());
   DoDecrement dd(&lNumber);
   for(size_t i=0; i<NUMTHREADS; i++)
     t[i] = thread(dd);
@@ -116,8 +116,8 @@ TEST(TestMassAtomic, Add)
 {
   long lNumber = 0;
   long toAdd = 10;
-  boost::shared_array<thread> t;
-  t.reset(new thread[NUMTHREADS]);
+  std::shared_ptr<thread> t;
+  t.reset(new thread[NUMTHREADS], std::default_delete<thread[]>());
   DoAdd da(&lNumber,toAdd);
   for(size_t i=0; i<NUMTHREADS; i++)
     t[i] = thread(da);
@@ -132,8 +132,8 @@ TEST(TestMassAtomic, Subtract)
 {
   long toSubtract = 10;
   long lNumber = (NUMTHREADS * TESTNUM) * toSubtract;
-  boost::shared_array<thread> t;
-  t.reset(new thread[NUMTHREADS]);
+  std::shared_ptr<thread> t;
+  t.reset(new thread[NUMTHREADS], std::default_delete<thread[]>());
   DoSubtract ds(&lNumber,toSubtract);
   for(size_t i=0; i<NUMTHREADS; i++)
     t[i] = thread(ds);
diff --git a/xbmc/threads/test/TestEvent.cpp b/xbmc/threads/test/TestEvent.cpp
index b183156f98c22..7c2111f628002 100644
--- a/xbmc/threads/test/TestEvent.cpp
+++ b/xbmc/threads/test/TestEvent.cpp
@@ -23,7 +23,7 @@
 
 #include "threads/test/TestHelpers.h"
 
-#include <boost/shared_array.hpp>
+#include <memory>
 #include <stdio.h>
 
 using namespace XbmcThreads;
@@ -571,10 +571,10 @@ class poll_mass_waiter : public IRunnable
   }
 };
 
-template <class W> void RunMassEventTest(boost::shared_array<W>& m, bool canWaitOnEvent)
+template <class W> void RunMassEventTest(std::shared_ptr<W>& m, bool canWaitOnEvent)
 {
-  boost::shared_array<thread> t;
-  t.reset(new thread[NUMTHREADS]);
+  std::shared_ptr<thread> t;
+  t.reset(new thread[NUMTHREADS], std::default_delete<thread[]>());
   for(size_t i=0; i<NUMTHREADS; i++)
     t[i] = thread(m[i]);
 
@@ -610,8 +610,8 @@ TEST(TestMassEvent, General)
 {
   g_event = new CEvent();
 
-  boost::shared_array<mass_waiter> m;
-  m.reset(new mass_waiter[NUMTHREADS]);
+  std::shared_ptr<mass_waiter> m;
+  m.reset(new mass_waiter[NUMTHREADS], std::default_delete<mass_waiter[]>());
 
   RunMassEventTest(m,true);
   delete g_event;
@@ -621,8 +621,8 @@ TEST(TestMassEvent, Polling)
 {
   g_event = new CEvent(true); // polling needs to avoid the auto-reset
 
-  boost::shared_array<poll_mass_waiter> m;
-  m.reset(new poll_mass_waiter[NUMTHREADS]);
+  std::shared_ptr<poll_mass_waiter> m;
+  m.reset(new poll_mass_waiter[NUMTHREADS], std::default_delete<poll_mass_waiter[]>());
 
   RunMassEventTest(m,false);
   delete g_event;