diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
index f44550ab..27dbaa31 100644
--- a/library/PolyVoxCore/CMakeLists.txt
+++ b/library/PolyVoxCore/CMakeLists.txt
@@ -24,7 +24,7 @@ PROJECT(PolyVoxCore)
 
 #Projects source files
 SET(CORE_SRC_FILES
-	source/AStarPathfinder.cpp
+	#source/AStarPathfinder.cpp
 )
 
 #Projects headers files
diff --git a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
index dce2aaf7..0c9d7a89 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
@@ -37,9 +37,43 @@ namespace PolyVox
 	const float sqrt_2 = 1.4143f;
 	const float sqrt_3 = 1.7321f;
 
-	extern const POLYVOX_API Vector3DInt32 arrayPathfinderFaces[6];
-	extern const POLYVOX_API Vector3DInt32 arrayPathfinderEdges[12];
-	extern const POLYVOX_API Vector3DInt32 arrayPathfinderCorners[8];
+	const Vector3DInt32 arrayPathfinderFaces[6] =
+	{
+		Vector3DInt32(0, 0, -1),
+		Vector3DInt32(0, 0, +1),
+		Vector3DInt32(0, -1, 0),
+		Vector3DInt32(0, +1, 0),
+		Vector3DInt32(-1, 0, 0),
+		Vector3DInt32(+1, 0, 0)
+	};
+
+	const Vector3DInt32 arrayPathfinderEdges[12] =
+	{
+		Vector3DInt32(0, -1, -1),
+		Vector3DInt32(0, -1, +1),
+		Vector3DInt32(0, +1, -1),
+		Vector3DInt32(0, +1, +1),
+		Vector3DInt32(-1, 0, -1),
+		Vector3DInt32(-1, 0, +1),
+		Vector3DInt32(+1, 0, -1),
+		Vector3DInt32(+1, 0, +1),
+		Vector3DInt32(-1, -1, 0),
+		Vector3DInt32(-1, +1, 0),
+		Vector3DInt32(+1, -1, 0),
+		Vector3DInt32(+1, +1, 0)
+	};
+
+	const Vector3DInt32 arrayPathfinderCorners[8] =
+	{
+		Vector3DInt32(-1, -1, -1),
+		Vector3DInt32(-1, -1, +1),
+		Vector3DInt32(-1, +1, -1),
+		Vector3DInt32(-1, +1, +1),
+		Vector3DInt32(+1, -1, -1),
+		Vector3DInt32(+1, -1, +1),
+		Vector3DInt32(+1, +1, -1),
+		Vector3DInt32(+1, +1, +1)
+	};
 
 	/// This function provides the default method for checking whether a given voxel
 	/// is valid for the path computed by the AStarPathfinder.
diff --git a/library/PolyVoxCore/source/AStarPathfinder.cpp b/library/PolyVoxCore/source/AStarPathfinder.cpp
deleted file mode 100644
index 83d42db1..00000000
--- a/library/PolyVoxCore/source/AStarPathfinder.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
-Copyright (c) 2005-2009 David Williams
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source
-    distribution. 	
-*******************************************************************************/
-
-#include "PolyVoxCore/AStarPathfinder.h"
-
-using namespace PolyVox;
-
-namespace PolyVox
-{
-	const Vector3DInt32 arrayPathfinderFaces[6] =
-	{
-		Vector3DInt32(0, 0, -1),
-		Vector3DInt32(0, 0, +1),
-		Vector3DInt32(0, -1, 0),
-		Vector3DInt32(0, +1, 0),
-		Vector3DInt32(-1, 0, 0),
-		Vector3DInt32(+1, 0, 0)
-	};
-
-	const Vector3DInt32 arrayPathfinderEdges[12] =
-	{
-		Vector3DInt32(0, -1, -1),
-		Vector3DInt32(0, -1, +1),
-		Vector3DInt32(0, +1, -1),
-		Vector3DInt32(0, +1, +1),
-		Vector3DInt32(-1, 0, -1),
-		Vector3DInt32(-1, 0, +1),
-		Vector3DInt32(+1, 0, -1),
-		Vector3DInt32(+1, 0, +1),
-		Vector3DInt32(-1, -1, 0),
-		Vector3DInt32(-1, +1, 0),
-		Vector3DInt32(+1, -1, 0),
-		Vector3DInt32(+1, +1, 0)
-	};
-
-	const Vector3DInt32 arrayPathfinderCorners[8] =
-	{
-		Vector3DInt32(-1, -1, -1),
-		Vector3DInt32(-1, -1, +1),
-		Vector3DInt32(-1, +1, -1),
-		Vector3DInt32(-1, +1, +1),
-		Vector3DInt32(+1, -1, -1),
-		Vector3DInt32(+1, -1, +1),
-		Vector3DInt32(+1, +1, -1),
-		Vector3DInt32(+1, +1, +1)
-	};
-}