diff --git a/library/PolyVoxCore/include/PolyVoxCore/Mesh.h b/library/PolyVoxCore/include/PolyVoxCore/Mesh.h
index 34dc50b4..ee79ecca 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Mesh.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Mesh.h
@@ -26,6 +26,7 @@ freely, subject to the following restrictions:
 
 #include "Impl/TypeDef.h"
 
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxCore/Region.h"
 #include "PolyVoxCore/Vertex.h" //Should probably do away with this on in the future...
 
@@ -38,7 +39,7 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
-	template <typename VertexType, typename IndexType = uint32_t>
+	template <typename VertexType, typename IndexType>
 	class Mesh
 	{
 	public:
diff --git a/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
index 16151e4c..f72d5d37 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
@@ -142,7 +142,7 @@ namespace PolyVox
 	////////////////////////////////////////////////////////////////////////////////
 	// Mesh
 	////////////////////////////////////////////////////////////////////////////////
-	template <typename VertexType, typename IndexType> class Mesh;
+	template <typename VertexType, typename IndexType = uint32_t> class Mesh;
 
 	////////////////////////////////////////////////////////////////////////////////
 	// Pager