--- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
+++ polyvox/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
@@ -1,4 +1,3 @@
-#pragma region License
 /*******************************************************************************
 Copyright (c) 2005-2009 David Williams
 
@@ -21,7 +20,6 @@ freely, subject to the following restric
     3. This notice may not be removed or altered from any source
     distribution. 	
 *******************************************************************************/
-#pragma endregion
 
 #ifndef __PolyVox_GradientEstimators_H__
 #define __PolyVox_GradientEstimators_H__
--- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h
+++ polyvox/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h
@@ -61,7 +61,7 @@ namespace PolyVox
 	   void addTriangleCubic(uint32_t index0, uint32_t index1, uint32_t index2);
 	   uint32_t addVertex(const VertexType& vertex);
 	   void clear(void);
-	   const bool isEmpty(void) const;
+	   bool isEmpty(void) const;
 
 	   //THESE FUNCTIONS TO BE REMOVED IN THE FUTURE. OR AT LEAST MOVED OUT OF THIS CLASS INTO FREE FUNCTIONS.
 	   //THEY ARE CAUSING PROBLEMS WITH THE SWIG BINDINGS. THE FUNCTIONS REGARDING NORMALS MAKE NO SENSE WHEN
--- polyvox.orig/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl
+++ polyvox/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl
@@ -141,7 +141,7 @@ namespace PolyVox
 	}
 
 	template <typename VertexType>
-	const bool SurfaceMesh<VertexType>::isEmpty(void) const
+	bool SurfaceMesh<VertexType>::isEmpty(void) const
 	{
 		return (getNoOfVertices() == 0) || (getNoOfIndices() == 0);
 	}
--- polyvox.orig/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
+++ polyvox/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
@@ -85,9 +85,9 @@ namespace PolyVox
 		}
 
 		PolyVox::Vector3DInt32 position;
-		Node* parent;
 		float gVal;
 		float hVal;
+		Node* parent;
 
 		float f(void) const
 		{