Index: code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.cc	(revision 10769)
+++ code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.cc	(revision 10771)
@@ -92,5 +92,5 @@
         {
             const std::string& path = "ambient/" + mood + '/' + this->ambientSource_;
-            shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
+            std::shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
             if (fileInfo != nullptr)
             {
Index: code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h	(revision 10769)
+++ code/branches/cpp11_v2/src/orxonox/sound/BaseSound.h	(revision 10771)
@@ -33,5 +33,5 @@
 
 #include <string>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <OgreDataStream.h>
 #include "core/object/Listable.h"
@@ -107,5 +107,5 @@
         ALuint          audioSource_;
         bool            bPooling_;
-        shared_ptr<SoundBuffer> soundBuffer_;
+        std::shared_ptr<SoundBuffer> soundBuffer_;
         std::string     source_;
         float           volume_;
Index: code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc	(revision 10769)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc	(revision 10771)
@@ -39,5 +39,5 @@
 namespace orxonox
 {
-    SoundBuffer::SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer>>::iterator poolIterator)
+    SoundBuffer::SoundBuffer(const std::string& filename, std::list<std::shared_ptr<SoundBuffer>>::iterator poolIterator)
         : filename_(filename)
         , audioBuffer_(AL_NONE)
@@ -48,5 +48,5 @@
 
         // Get resource info
-        shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(filename);
+        std::shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(filename);
         if (fileInfo == nullptr)
         {
@@ -83,5 +83,5 @@
     }
 
-    void SoundBuffer::loadStandard(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
+    void SoundBuffer::loadStandard(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
     {
         // Read everything into a temporary buffer
@@ -127,5 +127,5 @@
     }
 
-    void SoundBuffer::loadOgg(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
+    void SoundBuffer::loadOgg(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
     {
         char inbuffer[256*1024];
Index: code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h	(revision 10769)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.h	(revision 10771)
@@ -33,5 +33,5 @@
 
 #include <list>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include "core/Resource.h"
 
@@ -45,14 +45,7 @@
     {
         friend class SoundManager;
-#if !defined(_MSC_VER) || _MSC_VER >= 1500
-        // Make sure nobody deletes an instance (using strong pointers)
-        template <class T>
-        friend void boost::checked_delete(T*);
-#endif
 
     public:
-#if defined(_MSC_VER) && _MSC_VER < 1500
         ~SoundBuffer();
-#endif
         inline ALuint getBuffer()
             { return this->audioBuffer_; }
@@ -64,14 +57,11 @@
 
     private:
-        SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer>>::iterator poolIterator);
-#if !defined(_MSC_VER) || _MSC_VER >= 1500
-        ~SoundBuffer();
-#endif
-        void loadStandard(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
-        void loadOgg(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
+        SoundBuffer(const std::string& filename, std::list<std::shared_ptr<SoundBuffer>>::iterator poolIterator);
+        void loadStandard(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
+        void loadOgg(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
 
         std::string filename_;
         ALuint audioBuffer_;
-        std::list<shared_ptr<SoundBuffer>>::iterator poolIterator_;
+        std::list<std::shared_ptr<SoundBuffer>>::iterator poolIterator_;
     };
 }
Index: code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc	(revision 10769)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundManager.cc	(revision 10771)
@@ -505,7 +505,7 @@
     }
 
-    shared_ptr<SoundBuffer> SoundManager::getSoundBuffer(const std::string& filename)
-    {
-        shared_ptr<SoundBuffer> buffer;
+    std::shared_ptr<SoundBuffer> SoundManager::getSoundBuffer(const std::string& filename)
+    {
+        std::shared_ptr<SoundBuffer> buffer;
         // Check active or pooled buffers
         SoundBufferMap::const_iterator it = this->soundBuffers_.find(filename);
@@ -538,5 +538,5 @@
     }
 
-    void SoundManager::releaseSoundBuffer(const shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer)
+    void SoundManager::releaseSoundBuffer(const std::shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer)
     {
         // Check if others are still using the buffer
@@ -551,5 +551,5 @@
                 while (this->effectsPoolSize_ + it->second->getSize() > this->maxEffectsPoolSize_s && !this->effectsPool_.empty())
                 {
-                    shared_ptr<SoundBuffer> bufferDel = this->effectsPool_.back();
+                    std::shared_ptr<SoundBuffer> bufferDel = this->effectsPool_.back();
                     this->effectsPoolSize_ -= bufferDel->getSize();
                     bufferDel->poolIterator_ = this->effectsPool_.end();
Index: code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h	(revision 10769)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h	(revision 10771)
@@ -36,5 +36,5 @@
 #include <map>
 #include <string>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include "util/Singleton.h"
@@ -96,6 +96,6 @@
         // tolua_end
 
-        shared_ptr<SoundBuffer> getSoundBuffer(const std::string& filename);
-        void releaseSoundBuffer(const shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer);
+        std::shared_ptr<SoundBuffer> getSoundBuffer(const std::string& filename);
+        void releaseSoundBuffer(const std::shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer);
 
         ALuint getSoundSource(BaseSound* object);
@@ -139,7 +139,7 @@
         static const unsigned int maxEffectsPoolSize_s = 40 * 1024 * 1024;
         unsigned int effectsPoolSize_;
-        typedef std::list<shared_ptr<SoundBuffer>> EffectsPoolList;
+        typedef std::list<std::shared_ptr<SoundBuffer>> EffectsPoolList;
         EffectsPoolList effectsPool_;
-        typedef std::map<std::string, shared_ptr<SoundBuffer>> SoundBufferMap;
+        typedef std::map<std::string, std::shared_ptr<SoundBuffer>> SoundBufferMap;
         SoundBufferMap soundBuffers_;
 
