diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in
index 8c1638c3..0a5cfed1 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in
@@ -5,4 +5,6 @@
 
 #cmakedefine HAS_CXX11_STATIC_ASSERT
 
+#cmakedefine HAS_CXX11_CSTDINT_H
+
 #endif
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
index e16b3b5a..0f9c832e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
@@ -77,20 +77,8 @@ freely, subject to the following restrictions:
 	#define polyvox_bind boost::bind
 	#define polyvox_placeholder_1 _1
 	#define polyvox_placeholder_2 _2
-
-
-	//As long as we're requiring boost, we'll use it to compensate
-	//for the missing cstdint header too.
-	#include <boost/cstdint.hpp>
-	using boost::int8_t;
-	using boost::int16_t;
-	using boost::int32_t;
-	using boost::uint8_t;
-	using boost::uint16_t;
-	using boost::uint32_t;
 #else
 	//We have a decent compiler - use real C++0x features
-	#include <cstdint>
 	#include <functional>
 	#include <memory>
 	#define polyvox_shared_ptr std::shared_ptr
@@ -115,4 +103,16 @@ freely, subject to the following restrictions:
 	#define static_assert BOOST_STATIC_ASSERT
 #endif
 
+#if defined(HAS_CXX11_CSTDINT_H)
+	#include <cstdint>
+#else
+	#include <boost/cstdint.hpp>
+	using boost::int8_t;
+	using boost::int16_t;
+	using boost::int32_t;
+	using boost::uint8_t;
+	using boost::uint16_t;
+	using boost::uint32_t;
+#endif
+
 #endif