diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76b5e66b..75ec8146 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,10 @@ IF(WIN32)
 	#SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 ENDIF(WIN32)
 
+IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW"
+	ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode
+ENDIF()
+
 ADD_SUBDIRECTORY(library)
 
 OPTION(ENABLE_EXAMPLES "Should the examples be built" ON)
diff --git a/library/PolyVoxCore/include/SurfaceMesh.h b/library/PolyVoxCore/include/SurfaceMesh.h
index 16bb0ddf..58f54887 100644
--- a/library/PolyVoxCore/include/SurfaceMesh.h
+++ b/library/PolyVoxCore/include/SurfaceMesh.h
@@ -28,6 +28,7 @@ freely, subject to the following restrictions:
 
 #include <vector>
 #include <set>
+#include <memory>
 
 #include "PolyVoxForwardDeclarations.h"
 #include "Region.h"
diff --git a/library/PolyVoxCore/include/Volume.h b/library/PolyVoxCore/include/Volume.h
index 5bf1f26f..35de2bf7 100644
--- a/library/PolyVoxCore/include/Volume.h
+++ b/library/PolyVoxCore/include/Volume.h
@@ -33,6 +33,7 @@ freely, subject to the following restrictions:
 #include <limits>
 #include <map>
 #include <vector>
+#include <memory>
 
 #pragma endregion