diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 9f05e7d5..7107d414 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -26,7 +26,6 @@ SET(CORE_INC_FILES
 	include/PolyVoxCore/IndexedSurfacePatch.h
 	include/PolyVoxCore/MarchingCubesTables.h
 	include/PolyVoxCore/PolyVoxForwardDeclarations.h
-	include/PolyVoxCore/PolyVoxCStdInt.h
 	include/PolyVoxCore/Region.h
 	include/PolyVoxCore/SurfaceAdjusters.h
 	include/PolyVoxCore/SurfaceExtractors.h
diff --git a/library/include/PolyVoxCore/BlockData.h b/library/include/PolyVoxCore/BlockData.h
index 90934b41..8eaf9abc 100644
--- a/library/include/PolyVoxCore/BlockData.h
+++ b/library/include/PolyVoxCore/BlockData.h
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #pragma region Headers
 #include "PolyVoxForwardDeclarations.h"
 
-#include "PolyVoxCStdInt.h"
+#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
 #pragma endregion
 
 namespace PolyVox
diff --git a/library/include/PolyVoxCore/IndexedSurfacePatch.h b/library/include/PolyVoxCore/IndexedSurfacePatch.h
index 359ae690..3d45c83a 100644
--- a/library/include/PolyVoxCore/IndexedSurfacePatch.h
+++ b/library/include/PolyVoxCore/IndexedSurfacePatch.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <vector>
 
-#include "PolyVoxCStdInt.h"
+#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
 
 #include "Constants.h"
 #include "PolyVoxForwardDeclarations.h"
diff --git a/library/include/PolyVoxCore/PolyVoxCStdInt.h b/library/include/PolyVoxCore/PolyVoxCStdInt.h
deleted file mode 100644
index 1714c7e9..00000000
--- a/library/include/PolyVoxCore/PolyVoxCStdInt.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma region License
-/******************************************************************************
-This file is part of the PolyVox library
-Copyright (C) 2006  David Williams
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-******************************************************************************/
-#pragma endregion
-
-#ifndef __PolyVox_CStdInt_H__
-#define __PolyVox_CStdInt_H__
-
-//Adding things to the std namespace in not actually allowed, but Microsoft
-//have still not added <cstdint> to thier standard library. 
-namespace PolyVox
-{
-	typedef char int8;
-	typedef short int16;
-	typedef long int32;
-	typedef unsigned char uint8;
-	typedef unsigned short uint16;
-	typedef unsigned long uint32;
-}
-
-
-#endif
\ No newline at end of file
diff --git a/library/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/library/include/PolyVoxCore/PolyVoxForwardDeclarations.h
index ac376f88..3f8ff913 100644
--- a/library/include/PolyVoxCore/PolyVoxForwardDeclarations.h
+++ b/library/include/PolyVoxCore/PolyVoxForwardDeclarations.h
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define __PolyVox_ForwardDeclarations_H__
 
 #include "Enums.h"
-#include "PolyVoxCStdInt.h"
+#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
 
 namespace PolyVox
 {
diff --git a/library/include/PolyVoxCore/PolyVoxImpl/CPlusPlusZeroXSupport.h b/library/include/PolyVoxCore/PolyVoxImpl/CPlusPlusZeroXSupport.h
index 3749fd14..d3477e33 100644
--- a/library/include/PolyVoxCore/PolyVoxImpl/CPlusPlusZeroXSupport.h
+++ b/library/include/PolyVoxCore/PolyVoxImpl/CPlusPlusZeroXSupport.h
@@ -4,13 +4,27 @@
 #ifdef C_PLUS_PLUS_ZERO_X_SUPPORTED
 	#include <shared_ptr> //Just a guess at what the standard name will be.
 	#include <weak_ptr> //These includes may need changing
+
+	#define POLYVOX_STD_NAMESPACE std
 	#define POLYVOX_SHARED_PTR std::shared_ptr
 	#define POLYVOX_WEAK_PTR std::weak_ptr
 #else
 	#include "boost/shared_ptr.hpp"
 	#include "boost/weak_ptr.hpp"
+
+	#define POLYVOX_STD_NAMESPACE boost
 	#define POLYVOX_SHARED_PTR boost::shared_ptr
 	#define POLYVOX_WEAK_PTR boost::weak_ptr
 #endif
 
+namespace PolyVox
+{
+	typedef char int8;
+	typedef short int16;
+	typedef long int32;
+	typedef unsigned char uint8;
+	typedef unsigned short uint16;
+	typedef unsigned long uint32;
+}
+
 #endif
\ No newline at end of file
diff --git a/library/include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h b/library/include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h
index 5a7e0e27..5fe9fc64 100644
--- a/library/include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h
+++ b/library/include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxCore/TypeDef.h"
 
-#include "PolyVoxCore/PolyVoxCStdInt.h"
+#include "CPlusPlusZeroXSupport.h"
 #pragma endregion
 
 namespace PolyVox
diff --git a/library/include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h b/library/include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h
index a01430fc..e4c76b51 100644
--- a/library/include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h
+++ b/library/include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxCore/TypeDef.h"
 
-#include "PolyVoxCore/PolyVoxCStdInt.h"
+#include "CPlusPlusZeroXSupport.h"
 #pragma endregion
 
 namespace PolyVox
diff --git a/library/include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h b/library/include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h
index 79f28be9..b8fa7ed9 100644
--- a/library/include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h
+++ b/library/include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxCore/TypeDef.h"
 
-#include "PolyVoxCore/PolyVoxCStdInt.h"
+#include "CPlusPlusZeroXSupport.h"
 #pragma endregion
 
 #include <vector>
diff --git a/library/include/PolyVoxCore/SurfaceAdjusters.h b/library/include/PolyVoxCore/SurfaceAdjusters.h
index 14dee71c..86a752f1 100644
--- a/library/include/PolyVoxCore/SurfaceAdjusters.h
+++ b/library/include/PolyVoxCore/SurfaceAdjusters.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "PolyVoxForwardDeclarations.h"
 #include "TypeDef.h"
 
-#include "PolyVoxCStdInt.h"
+#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
 #pragma endregion
 
 namespace PolyVox
diff --git a/library/include/PolyVoxCore/SurfaceExtractors.h b/library/include/PolyVoxCore/SurfaceExtractors.h
index 2a083849..d1f8cf64 100644
--- a/library/include/PolyVoxCore/SurfaceExtractors.h
+++ b/library/include/PolyVoxCore/SurfaceExtractors.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "PolyVoxForwardDeclarations.h"
 #include "TypeDef.h"
 
-#include "PolyVoxCStdInt.h"
+#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
 
 #include <list>
 #pragma endregion
diff --git a/library/include/PolyVoxCore/Volume.h b/library/include/PolyVoxCore/Volume.h
index 0cd0b2c3..5bbd81a0 100644
--- a/library/include/PolyVoxCore/Volume.h
+++ b/library/include/PolyVoxCore/Volume.h
@@ -25,8 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #pragma region Headers
 #include "PolyVoxForwardDeclarations.h"
 
-#include "PolyVoxCStdInt.h"
-
 #include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
 
 #include <map>
diff --git a/library/include/PolyVoxCore/VolumeIterator.h b/library/include/PolyVoxCore/VolumeIterator.h
index 4b69527e..5685fd40 100644
--- a/library/include/PolyVoxCore/VolumeIterator.h
+++ b/library/include/PolyVoxCore/VolumeIterator.h
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #pragma region Headers
 #include "PolyVoxForwardDeclarations.h"
 
-#include "PolyVoxCStdInt.h"
+#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
 #pragma endregion
 
 namespace PolyVox
diff --git a/library/source/PolyVoxCore/GradientEstimators.cpp b/library/source/PolyVoxCore/GradientEstimators.cpp
index ec971bf8..8e927317 100644
--- a/library/source/PolyVoxCore/GradientEstimators.cpp
+++ b/library/source/PolyVoxCore/GradientEstimators.cpp
@@ -2,8 +2,6 @@
 #include "PolyVoxCore/IndexedSurfacePatch.h"
 #include "PolyVoxCore/SurfaceVertex.h"
 
-#include "PolyVoxCore/PolyVoxCStdInt.h"
-
 using namespace std;
 
 namespace PolyVox