diff --git a/cmake/Modules/CheckCXX11Features.cmake b/cmake/Modules/CheckCXX11Features.cmake
index 0699f48e..5373ba6a 100644
--- a/cmake/Modules/CheckCXX11Features.cmake
+++ b/cmake/Modules/CheckCXX11Features.cmake
@@ -130,3 +130,4 @@ cxx11_check_feature("rvalue-references" HAS_CXX11_RVALUE_REFERENCES)
 cxx11_check_feature("sizeof_member" HAS_CXX11_SIZEOF_MEMBER)
 cxx11_check_feature("static_assert" HAS_CXX11_STATIC_ASSERT)
 cxx11_check_feature("variadic_templates" HAS_CXX11_VARIADIC_TEMPLATES)
+cxx11_check_feature("shared_ptr" HAS_CXX11_SHARED_PTR)
diff --git a/cmake/Modules/CheckCXX11Features/cxx11-test-shared_ptr.cpp b/cmake/Modules/CheckCXX11Features/cxx11-test-shared_ptr.cpp
new file mode 100644
index 00000000..2d9c6bd1
--- /dev/null
+++ b/cmake/Modules/CheckCXX11Features/cxx11-test-shared_ptr.cpp
@@ -0,0 +1,7 @@
+#include <memory>
+
+int main()
+{
+	std::shared_ptr<int> test;
+	return 0;
+}
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in
index 0a5cfed1..5518dfb2 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in
@@ -7,4 +7,6 @@
 
 #cmakedefine HAS_CXX11_CSTDINT_H
 
+#cmakedefine HAS_CXX11_SHARED_PTR
+
 #endif
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
index 0f9c832e..996414ca 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
@@ -67,9 +67,6 @@ freely, subject to the following restrictions:
 	//To support old (pre-vc2010) Microsoft compilers we use boost to replace the
 	//std::shared_ptr and potentially other C++0x features. To use this capability you
 	//will need to make sure you have boost installed on your system.
-	#include <boost/smart_ptr.hpp>
-	#define polyvox_shared_ptr boost::shared_ptr
-
 	#include <boost/function.hpp>
 	#define polyvox_function boost::function
 
@@ -80,8 +77,6 @@ freely, subject to the following restrictions:
 #else
 	//We have a decent compiler - use real C++0x features
 	#include <functional>
-	#include <memory>
-	#define polyvox_shared_ptr std::shared_ptr
 	#define polyvox_function std::function
 	#define polyvox_bind std::bind
 	#define polyvox_placeholder_1 std::placeholders::_1
@@ -115,4 +110,12 @@ freely, subject to the following restrictions:
 	using boost::uint32_t;
 #endif
 
+#if defined(HAS_CXX11_SHARED_PTR)
+	#include <memory>
+	#define polyvox_shared_ptr std::shared_ptr
+#else
+	#include <boost/smart_ptr.hpp>
+	#define polyvox_shared_ptr boost::shared_ptr
+#endif
+
 #endif