diff --git a/examples/Basic/OpenGLWidget.h b/examples/Basic/OpenGLWidget.h
index 91027ece..199a33ed 100644
--- a/examples/Basic/OpenGLWidget.h
+++ b/examples/Basic/OpenGLWidget.h
@@ -24,7 +24,7 @@ distribution.
 #ifndef __BasicExample_OpenGLWidget_H__
 #define __BasicExample_OpenGLWidget_H__
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 #include "glew/glew.h"
 
diff --git a/examples/Basic/main.cpp b/examples/Basic/main.cpp
index 0e883216..5674948c 100644
--- a/examples/Basic/main.cpp
+++ b/examples/Basic/main.cpp
@@ -23,10 +23,10 @@ freely, subject to the following restrictions:
 
 #include "OpenGLWidget.h"
 
-#include "MaterialDensityPair.h"
-#include "CubicSurfaceExtractorWithNormals.h"
-#include "SurfaceMesh.h"
-#include "SimpleVolume.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/CubicSurfaceExtractorWithNormals.h"
+#include "PolyVoxCore/SurfaceMesh.h"
+#include "PolyVoxCore/SimpleVolume.h"
 
 #include <QApplication>
 
diff --git a/examples/OpenGL/OpenGLImmediateModeSupport.cpp b/examples/OpenGL/OpenGLImmediateModeSupport.cpp
index 165a068a..3e09b21b 100644
--- a/examples/OpenGL/OpenGLImmediateModeSupport.cpp
+++ b/examples/OpenGL/OpenGLImmediateModeSupport.cpp
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #include "OpenGLImmediateModeSupport.h"
 #include "OpenGLSupport.h"
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 using namespace PolyVox;
 using namespace std;
diff --git a/examples/OpenGL/OpenGLImmediateModeSupport.h b/examples/OpenGL/OpenGLImmediateModeSupport.h
index 9fdcc03f..f28baca0 100644
--- a/examples/OpenGL/OpenGLImmediateModeSupport.h
+++ b/examples/OpenGL/OpenGLImmediateModeSupport.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __OpenGLExample_OpenGLImmediateModeSupport_H__
 #define __OpenGLExample_OpenGLImmediateModeSupport_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include "glew/glew.h"
 
diff --git a/examples/OpenGL/OpenGLSupport.h b/examples/OpenGL/OpenGLSupport.h
index de74be6b..2d4d1185 100644
--- a/examples/OpenGL/OpenGLSupport.h
+++ b/examples/OpenGL/OpenGLSupport.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __OpenGLExample_OpenGLSupport_H__
 #define __OpenGLExample_OpenGLSupport_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include "glew/glew.h"
 
diff --git a/examples/OpenGL/OpenGLVertexBufferObjectSupport.cpp b/examples/OpenGL/OpenGLVertexBufferObjectSupport.cpp
index 50f464e7..a2f9d7e9 100644
--- a/examples/OpenGL/OpenGLVertexBufferObjectSupport.cpp
+++ b/examples/OpenGL/OpenGLVertexBufferObjectSupport.cpp
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #include "OpenGLSupport.h"
 #include "OpenGLVertexBufferObjectSupport.h"
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 using namespace PolyVox;
 using namespace std;
diff --git a/examples/OpenGL/OpenGLVertexBufferObjectSupport.h b/examples/OpenGL/OpenGLVertexBufferObjectSupport.h
index c8a03608..0bb91f72 100644
--- a/examples/OpenGL/OpenGLVertexBufferObjectSupport.h
+++ b/examples/OpenGL/OpenGLVertexBufferObjectSupport.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __OpenGLExample_OpenGLVertexBufferObjectSupport_H__
 #define __OpenGLExample_OpenGLVertexBufferObjectSupport_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include "glew/glew.h"
 
diff --git a/examples/OpenGL/OpenGLWidget.cpp b/examples/OpenGL/OpenGLWidget.cpp
index afc312ea..87afef58 100644
--- a/examples/OpenGL/OpenGLWidget.cpp
+++ b/examples/OpenGL/OpenGLWidget.cpp
@@ -25,10 +25,10 @@ freely, subject to the following restrictions:
 
 #include <QMouseEvent>
 
-#include "GradientEstimators.h"
-#include "MaterialDensityPair.h"
-#include "MeshDecimator.h"
-#include "SurfaceExtractor.h"
+#include "PolyVoxCore/GradientEstimators.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/MeshDecimator.h"
+#include "PolyVoxCore/SurfaceExtractor.h"
 
 //Some namespaces we need
 using namespace std;
diff --git a/examples/OpenGL/OpenGLWidget.h b/examples/OpenGL/OpenGLWidget.h
index 959bb506..fe2c5f6c 100644
--- a/examples/OpenGL/OpenGLWidget.h
+++ b/examples/OpenGL/OpenGLWidget.h
@@ -29,8 +29,8 @@ freely, subject to the following restrictions:
 #include <QGLWidget>
 #include <QTimer>
 
-#include "LargeVolume.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/Utility.h"
 
 #include "OpenGLImmediateModeSupport.h"
diff --git a/examples/OpenGL/Shapes.cpp b/examples/OpenGL/Shapes.cpp
index be2939e8..dab8a35f 100644
--- a/examples/OpenGL/Shapes.cpp
+++ b/examples/OpenGL/Shapes.cpp
@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "Shapes.h"
 
-#include "MaterialDensityPair.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
 
 using namespace PolyVox;
 
diff --git a/examples/OpenGL/Shapes.h b/examples/OpenGL/Shapes.h
index 000478ce..c25c5f8f 100644
--- a/examples/OpenGL/Shapes.h
+++ b/examples/OpenGL/Shapes.h
@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __OpenGLExample_Shapes_H__
 #define __OpenGLExample_Shapes_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 void createSphereInVolume(PolyVox::LargeVolume<PolyVox::MaterialDensityPair44>& volData, float fRadius, uint8_t uValue);
 void createCubeInVolume(PolyVox::LargeVolume<PolyVox::MaterialDensityPair44>& volData, PolyVox::Vector3DInt32 lowerCorner, PolyVox::Vector3DInt32 upperCorner, uint8_t uValue);
diff --git a/examples/OpenGL/main.cpp b/examples/OpenGL/main.cpp
index f39af0f3..63861e4e 100644
--- a/examples/OpenGL/main.cpp
+++ b/examples/OpenGL/main.cpp
@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Filters.h"
-#include "Log.h"
-#include "MaterialDensityPair.h"
-#include "LargeVolume.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Filters.h"
+#include "PolyVoxCore/Log.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/Utility.h"
 
 #include "OpenGLImmediateModeSupport.h"
diff --git a/examples/Paging/OpenGLWidget.h b/examples/Paging/OpenGLWidget.h
index 91027ece..199a33ed 100644
--- a/examples/Paging/OpenGLWidget.h
+++ b/examples/Paging/OpenGLWidget.h
@@ -24,7 +24,7 @@ distribution.
 #ifndef __BasicExample_OpenGLWidget_H__
 #define __BasicExample_OpenGLWidget_H__
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 #include "glew/glew.h"
 
diff --git a/examples/Paging/main.cpp b/examples/Paging/main.cpp
index bef35756..69ee57ba 100644
--- a/examples/Paging/main.cpp
+++ b/examples/Paging/main.cpp
@@ -24,12 +24,12 @@ freely, subject to the following restrictions:
 #include "OpenGLWidget.h"
 #include "Perlin.h"
 
-#include "MaterialDensityPair.h"
-#include "CubicSurfaceExtractorWithNormals.h"
-#include "SurfaceExtractor.h"
-#include "SurfaceMesh.h"
-#include "LargeVolume.h"
-#include "Filters.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/CubicSurfaceExtractorWithNormals.h"
+#include "PolyVoxCore/SurfaceExtractor.h"
+#include "PolyVoxCore/SurfaceMesh.h"
+#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/Filters.h"
 
 #include <QApplication>
 
diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
index 65b380ab..b9d7c4f2 100644
--- a/library/PolyVoxCore/CMakeLists.txt
+++ b/library/PolyVoxCore/CMakeLists.txt
@@ -16,50 +16,50 @@ SET(CORE_SRC_FILES
 
 #Projects headers files
 SET(CORE_INC_FILES
-	include/AmbientOcclusionCalculator.h
-	include/AmbientOcclusionCalculator.inl
-	include/Array.h
-	include/Array.inl
-	include/ArraySizes.h
-	include/AStarPathfinder.h
-	include/AStarPathfinder.inl
-	include/ConstVolumeProxy.h
-	include/CubicSurfaceExtractor.h
-	include/CubicSurfaceExtractor.inl
-	include/CubicSurfaceExtractorWithNormals.h
-	include/CubicSurfaceExtractorWithNormals.inl
-	include/Density.h
-	include/Filters.h
-	include/Filters.inl
-	include/GradientEstimators.h
-	include/GradientEstimators.inl
-	include/ImprovedCubicSurfaceExtractor.h
-	include/ImprovedCubicSurfaceExtractor.inl
-	include/LargeVolume.h
-	include/LargeVolume.inl
-	include/LargeVolumeSampler.inl
-	include/Log.h
-	include/Material.h
-	include/MaterialDensityPair.h
-	include/MeshDecimator.h
-	include/MeshDecimator.inl
-	include/PolyVoxForwardDeclarations.h
-	include/Raycast.h
-	include/Raycast.inl
-	include/RaycastWithCallback.h
-	include/RaycastWithCallback.inl
-	include/Region.h
-	include/SimpleVolume.h
-	include/SimpleVolume.inl
-	include/SimpleVolumeSampler.inl
-	include/SurfaceExtractor.h
-	include/SurfaceExtractor.inl
-	include/SurfaceMesh.h
-	include/SurfaceMesh.inl
-	include/Vector.h
-	include/Vector.inl
-	include/VertexTypes.h
-	include/VoxelFilters.h
+	include/PolyVoxCore/AmbientOcclusionCalculator.h
+	include/PolyVoxCore/AmbientOcclusionCalculator.inl
+	include/PolyVoxCore/Array.h
+	include/PolyVoxCore/Array.inl
+	include/PolyVoxCore/ArraySizes.h
+	include/PolyVoxCore/AStarPathfinder.h
+	include/PolyVoxCore/AStarPathfinder.inl
+	include/PolyVoxCore/ConstVolumeProxy.h
+	include/PolyVoxCore/CubicSurfaceExtractor.h
+	include/PolyVoxCore/CubicSurfaceExtractor.inl
+	include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
+	include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
+	include/PolyVoxCore/Density.h
+	include/PolyVoxCore/Filters.h
+	include/PolyVoxCore/Filters.inl
+	include/PolyVoxCore/GradientEstimators.h
+	include/PolyVoxCore/GradientEstimators.inl
+	include/PolyVoxCore/ImprovedCubicSurfaceExtractor.h
+	include/PolyVoxCore/ImprovedCubicSurfaceExtractor.inl
+	include/PolyVoxCore/LargeVolume.h
+	include/PolyVoxCore/LargeVolume.inl
+	include/PolyVoxCore/LargeVolumeSampler.inl
+	include/PolyVoxCore/Log.h
+	include/PolyVoxCore/Material.h
+	include/PolyVoxCore/MaterialDensityPair.h
+	include/PolyVoxCore/MeshDecimator.h
+	include/PolyVoxCore/MeshDecimator.inl
+	include/PolyVoxCore/PolyVoxForwardDeclarations.h
+	include/PolyVoxCore/Raycast.h
+	include/PolyVoxCore/Raycast.inl
+	include/PolyVoxCore/RaycastWithCallback.h
+	include/PolyVoxCore/RaycastWithCallback.inl
+	include/PolyVoxCore/Region.h
+	include/PolyVoxCore/SimpleVolume.h
+	include/PolyVoxCore/SimpleVolume.inl
+	include/PolyVoxCore/SimpleVolumeSampler.inl
+	include/PolyVoxCore/SurfaceExtractor.h
+	include/PolyVoxCore/SurfaceExtractor.inl
+	include/PolyVoxCore/SurfaceMesh.h
+	include/PolyVoxCore/SurfaceMesh.inl
+	include/PolyVoxCore/Vector.h
+	include/PolyVoxCore/Vector.inl
+	include/PolyVoxCore/VertexTypes.h
+	include/PolyVoxCore/VoxelFilters.h
 )
 
 SET(IMPL_SRC_FILES
diff --git a/library/PolyVoxCore/include/AStarPathfinder.h b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
similarity index 96%
rename from library/PolyVoxCore/include/AStarPathfinder.h
rename to library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
index 33878b08..28f7a907 100644
--- a/library/PolyVoxCore/include/AStarPathfinder.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
@@ -24,10 +24,10 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_AStarPathfinder_H__
 #define __PolyVox_AStarPathfinder_H__
 
-#include "Array.h"
+#include "PolyVoxCore/Array.h"
 #include "PolyVoxImpl/AStarPathfinderImpl.h"
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -189,6 +189,6 @@ namespace PolyVox
 	};
 }
 
-#include "AStarPathfinder.inl"
+#include "PolyVoxCore/AStarPathfinder.inl"
 
 #endif //__PolyVox_AStarPathfinder_H__
diff --git a/library/PolyVoxCore/include/AStarPathfinder.inl b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl
similarity index 97%
rename from library/PolyVoxCore/include/AStarPathfinder.inl
rename to library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl
index 180d7271..1e1e07bc 100644
--- a/library/PolyVoxCore/include/AStarPathfinder.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl
@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include <Material.h>
+#include "PolyVoxCore/Material.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/AmbientOcclusionCalculator.h b/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h
similarity index 90%
rename from library/PolyVoxCore/include/AmbientOcclusionCalculator.h
rename to library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h
index f6ad0640..8b02d03b 100644
--- a/library/PolyVoxCore/include/AmbientOcclusionCalculator.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h
@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __AmbientOcclusionCalculator_H__
 #define __AmbientOcclusionCalculator_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 namespace PolyVox
 {
@@ -53,6 +53,6 @@ namespace PolyVox
 	};
 }
 
-#include "AmbientOcclusionCalculator.inl"
+#include "PolyVoxCore/AmbientOcclusionCalculator.inl"
 
 #endif //__AmbientOcclusionCalculator_H__
diff --git a/library/PolyVoxCore/include/AmbientOcclusionCalculator.inl b/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl
similarity index 96%
rename from library/PolyVoxCore/include/AmbientOcclusionCalculator.inl
rename to library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl
index 9f64b481..5434c8fb 100644
--- a/library/PolyVoxCore/include/AmbientOcclusionCalculator.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl
@@ -21,9 +21,9 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Array.h"
-#include "Raycast.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/Raycast.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/RandomUnitVectors.h"
 #include "PolyVoxImpl/RandomVectors.h"
diff --git a/library/PolyVoxCore/include/Array.h b/library/PolyVoxCore/include/PolyVoxCore/Array.h
similarity index 95%
rename from library/PolyVoxCore/include/Array.h
rename to library/PolyVoxCore/include/PolyVoxCore/Array.h
index d213a9a8..f4a701b8 100644
--- a/library/PolyVoxCore/include/Array.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Array.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Array_H__
 #define __PolyVox_Array_H__
 
-#include "ArraySizes.h" //Not strictly required, but convienient
+#include "PolyVoxCore/ArraySizes.h" //Not strictly required, but convienient
 
 #include "PolyVoxImpl/SubArray.h"
 
@@ -205,6 +205,6 @@ namespace PolyVox
 	typedef Array<3,uint32_t> Array3DUint32;
 }//namespace PolyVox
 
-#include "Array.inl"
+#include "PolyVoxCore/Array.inl"
 
 #endif
diff --git a/library/PolyVoxCore/include/Array.inl b/library/PolyVoxCore/include/PolyVoxCore/Array.inl
similarity index 100%
rename from library/PolyVoxCore/include/Array.inl
rename to library/PolyVoxCore/include/PolyVoxCore/Array.inl
diff --git a/library/PolyVoxCore/include/ArraySizes.h b/library/PolyVoxCore/include/PolyVoxCore/ArraySizes.h
similarity index 100%
rename from library/PolyVoxCore/include/ArraySizes.h
rename to library/PolyVoxCore/include/PolyVoxCore/ArraySizes.h
diff --git a/library/PolyVoxCore/include/ConstVolumeProxy.h b/library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h
similarity index 92%
rename from library/PolyVoxCore/include/ConstVolumeProxy.h
rename to library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h
index c1b64260..51861073 100644
--- a/library/PolyVoxCore/include/ConstVolumeProxy.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h
@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_ConstVolumeProxy_H__
 #define __PolyVox_ConstVolumeProxy_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/CubicSurfaceExtractor.h b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
similarity index 91%
rename from library/PolyVoxCore/include/CubicSurfaceExtractor.h
rename to library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
index d0a63e15..7722de8e 100644
--- a/library/PolyVoxCore/include/CubicSurfaceExtractor.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
@@ -24,9 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_CubicSurfaceExtractor_H__
 #define __PolyVox_CubicSurfaceExtractor_H__
 
-#include "Array.h"
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -70,6 +70,6 @@ namespace PolyVox
 	};
 }
 
-#include "CubicSurfaceExtractor.inl"
+#include "PolyVoxCore/CubicSurfaceExtractor.inl"
 
 #endif
diff --git a/library/PolyVoxCore/include/CubicSurfaceExtractor.inl b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
similarity index 96%
rename from library/PolyVoxCore/include/CubicSurfaceExtractor.inl
rename to library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
index 9dcdce90..89615384 100644
--- a/library/PolyVoxCore/include/CubicSurfaceExtractor.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "Array.h"
-#include "MaterialDensityPair.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.h b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
similarity index 89%
rename from library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.h
rename to library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
index 0097b5e8..0f8f6c62 100644
--- a/library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_CubicSurfaceExtractorWithNormals_H__
 #define __PolyVox_CubicSurfaceExtractorWithNormals_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -52,6 +52,6 @@ namespace PolyVox
 	};
 }
 
-#include "CubicSurfaceExtractorWithNormals.inl"
+#include "PolyVoxCore/CubicSurfaceExtractorWithNormals.inl"
 
 #endif
diff --git a/library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.inl b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
similarity index 96%
rename from library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.inl
rename to library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
index ba9e7d59..f0fff385 100644
--- a/library/PolyVoxCore/include/CubicSurfaceExtractorWithNormals.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Array.h"
-#include "MaterialDensityPair.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/Density.h b/library/PolyVoxCore/include/PolyVoxCore/Density.h
similarity index 95%
rename from library/PolyVoxCore/include/Density.h
rename to library/PolyVoxCore/include/PolyVoxCore/Density.h
index 3a40708a..a2084c3e 100644
--- a/library/PolyVoxCore/include/Density.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Density.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Density_H__
 #define __PolyVox_Density_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/Filters.h b/library/PolyVoxCore/include/PolyVoxCore/Filters.h
similarity index 90%
rename from library/PolyVoxCore/include/Filters.h
rename to library/PolyVoxCore/include/PolyVoxCore/Filters.h
index 308dc367..5fd543d6 100644
--- a/library/PolyVoxCore/include/Filters.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Filters.h
@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Filters_H__
 #define __PolyVox_Filters_H__
 
-#include "Array.h"
-#include "Region.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/Region.h"
 
 namespace PolyVox
 {
@@ -33,6 +33,6 @@ namespace PolyVox
 	void smoothRegion(VolumeType<VoxelType>& volData, const Region& regionToSmooth);
 }//namespace PolyVox
 
-#include "Filters.inl"
+#include "PolyVoxCore/Filters.inl"
 
 #endif
\ No newline at end of file
diff --git a/library/PolyVoxCore/include/Filters.inl b/library/PolyVoxCore/include/PolyVoxCore/Filters.inl
similarity index 96%
rename from library/PolyVoxCore/include/Filters.inl
rename to library/PolyVoxCore/include/PolyVoxCore/Filters.inl
index 9aca992d..8e5c016e 100644
--- a/library/PolyVoxCore/include/Filters.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/Filters.inl
@@ -1,4 +1,4 @@
-#include "MaterialDensityPair.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/GradientEstimators.h b/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
similarity index 94%
rename from library/PolyVoxCore/include/GradientEstimators.h
rename to library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
index e341c72a..17c1431a 100644
--- a/library/PolyVoxCore/include/GradientEstimators.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
@@ -28,7 +28,7 @@ freely, subject to the following restrictions:
 
 #include <vector>
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {
@@ -60,6 +60,6 @@ namespace PolyVox
 	//POLYVOX_API Vector3DFloat computeNormal(VolumeType<uint8_t>* volumeData, const Vector3DFloat& v3dPos, NormalGenerationMethod normalGenerationMethod);
 }
 
-#include "GradientEstimators.inl"
+#include "PolyVoxCore/GradientEstimators.inl"
 
 #endif //__PolyVox_GradientEstimators_H__
diff --git a/library/PolyVoxCore/include/GradientEstimators.inl b/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl
similarity index 97%
rename from library/PolyVoxCore/include/GradientEstimators.inl
rename to library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl
index 5ff36aa4..f3b7116c 100644
--- a/library/PolyVoxCore/include/GradientEstimators.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl
@@ -21,9 +21,9 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "VoxelFilters.h"
+#include "PolyVoxCore/VoxelFilters.h"
 
-#include "LargeVolume.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/ImprovedCubicSurfaceExtractor.h b/library/PolyVoxCore/include/PolyVoxCore/ImprovedCubicSurfaceExtractor.h
similarity index 92%
rename from library/PolyVoxCore/include/ImprovedCubicSurfaceExtractor.h
rename to library/PolyVoxCore/include/PolyVoxCore/ImprovedCubicSurfaceExtractor.h
index 165d6c5a..6c60a317 100644
--- a/library/PolyVoxCore/include/ImprovedCubicSurfaceExtractor.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/ImprovedCubicSurfaceExtractor.h
@@ -24,9 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_ImprovedCubicSurfaceExtractor_H__
 #define __PolyVox_ImprovedCubicSurfaceExtractor_H__
 
-#include "Array.h"
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -95,6 +95,6 @@ namespace PolyVox
 	};
 }
 
-#include "ImprovedCubicSurfaceExtractor.inl"
+#include "PolyVoxCore/ImprovedCubicSurfaceExtractor.inl"
 
 #endif
diff --git a/library/PolyVoxCore/include/ImprovedCubicSurfaceExtractor.inl b/library/PolyVoxCore/include/PolyVoxCore/ImprovedCubicSurfaceExtractor.inl
similarity index 96%
rename from library/PolyVoxCore/include/ImprovedCubicSurfaceExtractor.inl
rename to library/PolyVoxCore/include/PolyVoxCore/ImprovedCubicSurfaceExtractor.inl
index 80e6f067..80cd8fa5 100644
--- a/library/PolyVoxCore/include/ImprovedCubicSurfaceExtractor.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/ImprovedCubicSurfaceExtractor.inl
@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "Array.h"
-#include "MaterialDensityPair.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/LargeVolume.h b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
similarity index 97%
rename from library/PolyVoxCore/include/LargeVolume.h
rename to library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
index dd6fa0fb..e9355b0e 100644
--- a/library/PolyVoxCore/include/LargeVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
@@ -25,8 +25,8 @@ freely, subject to the following restrictions:
 #define __PolyVox_Volume_H__
 
 #include "PolyVoxImpl/Block.h"
-#include "Region.h"
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include <limits>
 #include <map>
@@ -359,7 +359,7 @@ private:
 	};
 }
 
-#include "LargeVolume.inl"
-#include "LargeVolumeSampler.inl"
+#include "PolyVoxCore/LargeVolume.inl"
+#include "PolyVoxCore/LargeVolumeSampler.inl"
 
 #endif
diff --git a/library/PolyVoxCore/include/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
similarity index 97%
rename from library/PolyVoxCore/include/LargeVolume.inl
rename to library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
index 0c4e450d..0c1b7678 100644
--- a/library/PolyVoxCore/include/LargeVolume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "ConstVolumeProxy.h"
+#include "PolyVoxCore/ConstVolumeProxy.h"
 #include "PolyVoxImpl/Block.h"
-#include "Log.h"
-#include "Region.h"
-#include "Vector.h"
+#include "PolyVoxCore/Log.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <limits>
 #include <cassert>
diff --git a/library/PolyVoxCore/include/LargeVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl
similarity index 96%
rename from library/PolyVoxCore/include/LargeVolumeSampler.inl
rename to library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl
index 44bc124e..2b7e5371 100644
--- a/library/PolyVoxCore/include/LargeVolumeSampler.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl
@@ -22,9 +22,9 @@ freely, subject to the following restrictions:
 *******************************************************************************/
 
 #include "PolyVoxImpl/Block.h"
-#include "LargeVolume.h"
-#include "Vector.h"
-#include "Region.h"
+#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/Region.h"
 
 #define BORDER_LOW(x) ((( x >> mVolume->m_uBlockSideLengthPower) << mVolume->m_uBlockSideLengthPower) != x)
 #define BORDER_HIGH(x) ((( (x+1) >> mVolume->m_uBlockSideLengthPower) << mVolume->m_uBlockSideLengthPower) != (x+1))
diff --git a/library/PolyVoxCore/include/Log.h b/library/PolyVoxCore/include/PolyVoxCore/Log.h
similarity index 100%
rename from library/PolyVoxCore/include/Log.h
rename to library/PolyVoxCore/include/PolyVoxCore/Log.h
diff --git a/library/PolyVoxCore/include/Material.h b/library/PolyVoxCore/include/PolyVoxCore/Material.h
similarity index 95%
rename from library/PolyVoxCore/include/Material.h
rename to library/PolyVoxCore/include/PolyVoxCore/Material.h
index 9e5131ef..53d78c08 100644
--- a/library/PolyVoxCore/include/Material.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Material.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Material_H__
 #define __PolyVox_Material_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 #include <cassert>
diff --git a/library/PolyVoxCore/include/MaterialDensityPair.h b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
similarity index 96%
rename from library/PolyVoxCore/include/MaterialDensityPair.h
rename to library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
index ff6adc03..4ca6d5ba 100644
--- a/library/PolyVoxCore/include/MaterialDensityPair.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MaterialDensityPair_H__
 #define __PolyVox_MaterialDensityPair_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/MeshDecimator.h b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h
similarity index 95%
rename from library/PolyVoxCore/include/MeshDecimator.h
rename to library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h
index 9bd79fea..dbfe89ce 100644
--- a/library/PolyVoxCore/include/MeshDecimator.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MeshDecimator_H__
 #define __PolyVox_MeshDecimator_H__
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <bitset>
 #include <vector>
@@ -178,6 +178,6 @@ namespace PolyVox
 	};
 }
 
-#include "MeshDecimator.inl"
+#include "PolyVoxCore/MeshDecimator.inl"
 
 #endif //__PolyVox_MeshDecimator_H__
diff --git a/library/PolyVoxCore/include/MeshDecimator.inl b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl
similarity index 96%
rename from library/PolyVoxCore/include/MeshDecimator.inl
rename to library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl
index 248edfc5..8e2cb9db 100644
--- a/library/PolyVoxCore/include/MeshDecimator.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl
@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxForwardDeclarations.h b/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
similarity index 100%
rename from library/PolyVoxCore/include/PolyVoxForwardDeclarations.h
rename to library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
diff --git a/library/PolyVoxCore/include/Raycast.h b/library/PolyVoxCore/include/PolyVoxCore/Raycast.h
similarity index 96%
rename from library/PolyVoxCore/include/Raycast.h
rename to library/PolyVoxCore/include/PolyVoxCore/Raycast.h
index d43a6ff9..9282b26b 100644
--- a/library/PolyVoxCore/include/Raycast.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Raycast.h
@@ -109,6 +109,6 @@ namespace PolyVox
 	};
 }
 
-#include "Raycast.inl"
+#include "PolyVoxCore/Raycast.inl"
 
 #endif //__PolyVox_Raycast_H__
\ No newline at end of file
diff --git a/library/PolyVoxCore/include/Raycast.inl b/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl
similarity index 100%
rename from library/PolyVoxCore/include/Raycast.inl
rename to library/PolyVoxCore/include/PolyVoxCore/Raycast.inl
diff --git a/library/PolyVoxCore/include/RaycastWithCallback.h b/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.h
similarity index 93%
rename from library/PolyVoxCore/include/RaycastWithCallback.h
rename to library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.h
index 53a61640..fdf8746d 100644
--- a/library/PolyVoxCore/include/RaycastWithCallback.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.h
@@ -55,6 +55,6 @@ namespace PolyVox
 	};
 }
 
-#include "RaycastWithCallback.inl"
+#include "PolyVoxCore/RaycastWithCallback.inl"
 
 #endif //__PolyVox_RaycastWithCallback_H__
\ No newline at end of file
diff --git a/library/PolyVoxCore/include/RaycastWithCallback.inl b/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.inl
similarity index 100%
rename from library/PolyVoxCore/include/RaycastWithCallback.inl
rename to library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.inl
diff --git a/library/PolyVoxCore/include/Region.h b/library/PolyVoxCore/include/PolyVoxCore/Region.h
similarity index 95%
rename from library/PolyVoxCore/include/Region.h
rename to library/PolyVoxCore/include/PolyVoxCore/Region.h
index abc1e32b..436d6e7c 100644
--- a/library/PolyVoxCore/include/Region.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Region.h
@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_Region_H__
 
 #include "PolyVoxImpl/TypeDef.h"
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/SimpleVolume.h b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
similarity index 94%
rename from library/PolyVoxCore/include/SimpleVolume.h
rename to library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
index ab34249b..aa97f87f 100644
--- a/library/PolyVoxCore/include/SimpleVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_SimpleVolume_H__
 #define __PolyVox_SimpleVolume_H__
 
-#include "Region.h"
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include <limits>
 #include <memory>
@@ -212,8 +212,8 @@ private:
 	};
 }
 
-#include "SimpleVolumeBlock.inl"
-#include "SimpleVolume.inl"
-#include "SimpleVolumeSampler.inl"
+#include "PolyVoxCore/SimpleVolumeBlock.inl"
+#include "PolyVoxCore/SimpleVolume.inl"
+#include "PolyVoxCore/SimpleVolumeSampler.inl"
 
 #endif //__PolyVox_SimpleVolume_H__
diff --git a/library/PolyVoxCore/include/SimpleVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl
similarity index 97%
rename from library/PolyVoxCore/include/SimpleVolume.inl
rename to library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl
index b21c7d7d..3554c687 100644
--- a/library/PolyVoxCore/include/SimpleVolume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl
@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "ConstVolumeProxy.h"
+#include "PolyVoxCore/ConstVolumeProxy.h"
 #include "PolyVoxImpl/Block.h"
-#include "Log.h"
-#include "Region.h"
-#include "Vector.h"
+#include "PolyVoxCore/Log.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <limits>
 #include <cassert>
diff --git a/library/PolyVoxCore/include/SimpleVolumeBlock.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeBlock.inl
similarity index 100%
rename from library/PolyVoxCore/include/SimpleVolumeBlock.inl
rename to library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeBlock.inl
diff --git a/library/PolyVoxCore/include/SimpleVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
similarity index 96%
rename from library/PolyVoxCore/include/SimpleVolumeSampler.inl
rename to library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
index 2f479a91..bc7dcc7c 100644
--- a/library/PolyVoxCore/include/SimpleVolumeSampler.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
@@ -22,9 +22,9 @@ freely, subject to the following restrictions:
 *******************************************************************************/
 
 #include "PolyVoxImpl/Block.h"
-#include "SimpleVolume.h"
-#include "Vector.h"
-#include "Region.h"
+#include "PolyVoxCore/SimpleVolume.h"
+#include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/Region.h"
 
 #define BORDER_LOW(x) ((( x >> mVolume->m_uBlockSideLengthPower) << mVolume->m_uBlockSideLengthPower) != x)
 #define BORDER_HIGH(x) ((( (x+1) >> mVolume->m_uBlockSideLengthPower) << mVolume->m_uBlockSideLengthPower) != (x+1))
diff --git a/library/PolyVoxCore/include/SurfaceEdge.h b/library/PolyVoxCore/include/PolyVoxCore/SurfaceEdge.h
similarity index 100%
rename from library/PolyVoxCore/include/SurfaceEdge.h
rename to library/PolyVoxCore/include/PolyVoxCore/SurfaceEdge.h
diff --git a/library/PolyVoxCore/include/SurfaceExtractor.h b/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h
similarity index 96%
rename from library/PolyVoxCore/include/SurfaceExtractor.h
rename to library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h
index a1fd91a4..7036e090 100644
--- a/library/PolyVoxCore/include/SurfaceExtractor.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h
@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_SurfaceExtractor_H__
 #define __PolyVox_SurfaceExtractor_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include "PolyVoxImpl/TypeDef.h"
 
@@ -202,6 +202,6 @@ namespace PolyVox
 	};
 }
 
-#include "SurfaceExtractor.inl"
+#include "PolyVoxCore/SurfaceExtractor.inl"
 
 #endif
diff --git a/library/PolyVoxCore/include/SurfaceExtractor.inl b/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl
similarity index 97%
rename from library/PolyVoxCore/include/SurfaceExtractor.inl
rename to library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl
index 3f52e3c7..e2cad798 100644
--- a/library/PolyVoxCore/include/SurfaceExtractor.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl
@@ -21,11 +21,11 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Array.h"
-#include "MaterialDensityPair.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/SurfaceMesh.h b/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h
similarity index 93%
rename from library/PolyVoxCore/include/SurfaceMesh.h
rename to library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h
index 82b1c1b7..73b6ede5 100644
--- a/library/PolyVoxCore/include/SurfaceMesh.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h
@@ -28,9 +28,9 @@ freely, subject to the following restrictions:
 #include <set>
 #include <memory>
 
-#include "PolyVoxForwardDeclarations.h"
-#include "Region.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/VertexTypes.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
@@ -98,6 +98,6 @@ namespace PolyVox
 	polyvox_shared_ptr< SurfaceMesh<VertexType> > extractSubset(SurfaceMesh<VertexType>& inputMesh, std::set<uint8_t> setMaterials);
 }
 
-#include "SurfaceMesh.inl"
+#include "PolyVoxCore/SurfaceMesh.inl"
 
 #endif /* __SurfaceMesh_H__ */
diff --git a/library/PolyVoxCore/include/SurfaceMesh.inl b/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl
similarity index 100%
rename from library/PolyVoxCore/include/SurfaceMesh.inl
rename to library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl
diff --git a/library/PolyVoxCore/include/SurfaceTypes.h b/library/PolyVoxCore/include/PolyVoxCore/SurfaceTypes.h
similarity index 100%
rename from library/PolyVoxCore/include/SurfaceTypes.h
rename to library/PolyVoxCore/include/PolyVoxCore/SurfaceTypes.h
diff --git a/library/PolyVoxCore/include/Vector.h b/library/PolyVoxCore/include/PolyVoxCore/Vector.h
similarity index 96%
rename from library/PolyVoxCore/include/Vector.h
rename to library/PolyVoxCore/include/PolyVoxCore/Vector.h
index 16ba4e3a..82c2fdbf 100644
--- a/library/PolyVoxCore/include/Vector.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Vector.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Vector_H__
 #define __PolyVox_Vector_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 
 #include <iostream>
 
@@ -184,7 +184,7 @@ namespace PolyVox
 
 }//namespace PolyVox
 
-#include "Vector.inl"
+#include "PolyVoxCore/Vector.inl"
 
 #endif
 
diff --git a/library/PolyVoxCore/include/Vector.inl b/library/PolyVoxCore/include/PolyVoxCore/Vector.inl
similarity index 100%
rename from library/PolyVoxCore/include/Vector.inl
rename to library/PolyVoxCore/include/PolyVoxCore/Vector.inl
diff --git a/library/PolyVoxCore/include/VertexTypes.h b/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h
similarity index 95%
rename from library/PolyVoxCore/include/VertexTypes.h
rename to library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h
index 271f8adb..3c2fd6ad 100644
--- a/library/PolyVoxCore/include/VertexTypes.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h
@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_SurfaceVertex_H__
 
 #include "PolyVoxImpl/TypeDef.h"
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <bitset>
 #include <vector>
diff --git a/library/PolyVoxCore/include/VoxelFilters.h b/library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h
similarity index 90%
rename from library/PolyVoxCore/include/VoxelFilters.h
rename to library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h
index 70d9a943..f680a875 100644
--- a/library/PolyVoxCore/include/VoxelFilters.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h
@@ -24,10 +24,10 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_VoxelFilters_H__
 #define __PolyVox_VoxelFilters_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
-#include "LargeVolume.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h b/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
index b347ed99..abb01c06 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_AStarPathfinderImpl_H__
 #define __PolyVox_AStarPathfinderImpl_H__
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 #include <limits> //For numeric_limits
 #include <set>
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.h b/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.h
index 675c52ab..884cdf6a 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.h
@@ -24,7 +24,7 @@ distribution.
 #ifndef __PolyVox_ArraySizesImpl_H__
 #define __PolyVox_ArraySizesImpl_H__
 
-#include "TypeDef.h"
+#include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
 {
@@ -56,6 +56,6 @@ namespace PolyVox
 	};
 }//namespace PolyVox
 
-#include "ArraySizesImpl.inl"
+#include "PolyVoxImpl/ArraySizesImpl.inl"
 
 #endif //__PolyVox_ArraySizesImpl_H__
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/Block.h b/library/PolyVoxCore/include/PolyVoxImpl/Block.h
index 0a9a013f..34f0a6d9 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/Block.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/Block.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Block_H__
 #define __PolyVox_Block_H__
 
-#include "PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include <limits>
 #include <vector>
 
@@ -73,6 +73,6 @@ namespace PolyVox
 	};
 }
 
-#include "Block.inl"
+#include "PolyVoxImpl/Block.inl"
 
 #endif
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/Block.inl b/library/PolyVoxCore/include/PolyVoxImpl/Block.inl
index 9c0e9f79..1d389c68 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/Block.inl
+++ b/library/PolyVoxCore/include/PolyVoxImpl/Block.inl
@@ -22,8 +22,8 @@ freely, subject to the following restrictions:
 *******************************************************************************/
 
 #include "PolyVoxImpl/Utility.h"
-#include "Vector.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 #include <cassert>
 #include <cstring> //For memcpy
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h b/library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h
index 00aec142..59745a82 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MarchingCubeTables_H__
 #define __PolyVox_MarchingCubeTables_H__
 
-#include "TypeDef.h"
+#include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/RandomUnitVectors.h b/library/PolyVoxCore/include/PolyVoxImpl/RandomUnitVectors.h
index 8f0be653..8702f865 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/RandomUnitVectors.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/RandomUnitVectors.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_RandomUnitVectors_H__
 #define __PolyVox_RandomUnitVectors_H__
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {	
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/RandomVectors.h b/library/PolyVoxCore/include/PolyVoxImpl/RandomVectors.h
index 351b47b8..2544d97d 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/RandomVectors.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/RandomVectors.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_RandomVectors_H__
 #define __PolyVox_RandomVectors_H__
 
-#include "Vector.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {	
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h
index 52b71283..2b30eefd 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h
@@ -81,6 +81,6 @@ namespace PolyVox
 	};
 }//namespace PolyVox
 
-#include "SubArray.inl"
+#include "PolyVoxImpl/SubArray.inl"
 
 #endif //__PolyVox_SubArray_H__
\ No newline at end of file
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/Utility.h b/library/PolyVoxCore/include/PolyVoxImpl/Utility.h
index 7d049c1c..75f755fe 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/Utility.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/Utility.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Utility_H__
 #define __PolyVox_Utility_H__
 
-#include "TypeDef.h"
+#include "PolyVoxImpl/TypeDef.h"
 
 #include <cassert>
 
diff --git a/library/PolyVoxCore/source/AStarPathfinder.cpp b/library/PolyVoxCore/source/AStarPathfinder.cpp
index 3b387214..848245ce 100644
--- a/library/PolyVoxCore/source/AStarPathfinder.cpp
+++ b/library/PolyVoxCore/source/AStarPathfinder.cpp
@@ -21,9 +21,9 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "AStarPathfinder.h"
+#include "PolyVoxCore/AStarPathfinder.h"
 
-#include "Material.h"
+#include "PolyVoxCore/Material.h"
 
 using namespace PolyVox;
 
diff --git a/library/PolyVoxCore/source/ArraySizes.cpp b/library/PolyVoxCore/source/ArraySizes.cpp
index cd2b5410..f6b7370f 100644
--- a/library/PolyVoxCore/source/ArraySizes.cpp
+++ b/library/PolyVoxCore/source/ArraySizes.cpp
@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "ArraySizes.h"
+#include "PolyVoxCore/ArraySizes.h"
 
 namespace PolyVox
 {	
diff --git a/library/PolyVoxCore/source/GradientEstimators.cpp b/library/PolyVoxCore/source/GradientEstimators.cpp
index eef1244e..0ee44a5f 100644
--- a/library/PolyVoxCore/source/GradientEstimators.cpp
+++ b/library/PolyVoxCore/source/GradientEstimators.cpp
@@ -21,12 +21,12 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "GradientEstimators.h"
-#include "SurfaceMesh.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/GradientEstimators.h"
+#include "PolyVoxCore/SurfaceMesh.h"
+#include "PolyVoxCore/VertexTypes.h"
 #include "PolyVoxImpl/TypeDef.h"
 
-#include "LargeVolume.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 using namespace std;
 
diff --git a/library/PolyVoxCore/source/Log.cpp b/library/PolyVoxCore/source/Log.cpp
index 336da13b..37c91f12 100644
--- a/library/PolyVoxCore/source/Log.cpp
+++ b/library/PolyVoxCore/source/Log.cpp
@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Log.h"
+#include "PolyVoxCore/Log.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/source/MeshDecimator.cpp b/library/PolyVoxCore/source/MeshDecimator.cpp
index f24fd3a4..c1498828 100644
--- a/library/PolyVoxCore/source/MeshDecimator.cpp
+++ b/library/PolyVoxCore/source/MeshDecimator.cpp
@@ -1,6 +1,6 @@
-#include "MeshDecimator.h"
+#include "PolyVoxCore/MeshDecimator.h"
 
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/source/Region.cpp b/library/PolyVoxCore/source/Region.cpp
index 86925dd8..e0eaa1c1 100644
--- a/library/PolyVoxCore/source/Region.cpp
+++ b/library/PolyVoxCore/source/Region.cpp
@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "Region.h"
+#include "PolyVoxCore/Region.h"
 
 #include <limits>
 
diff --git a/library/PolyVoxCore/source/VertexTypes.cpp b/library/PolyVoxCore/source/VertexTypes.cpp
index 88473e1d..d966fc9f 100644
--- a/library/PolyVoxCore/source/VertexTypes.cpp
+++ b/library/PolyVoxCore/source/VertexTypes.cpp
@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include <sstream>
 
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/source/VoxelFilters.cpp b/library/PolyVoxCore/source/VoxelFilters.cpp
index 844f7377..e97f1fa6 100644
--- a/library/PolyVoxCore/source/VoxelFilters.cpp
+++ b/library/PolyVoxCore/source/VoxelFilters.cpp
@@ -21,7 +21,7 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "VoxelFilters.h"
+#include "PolyVoxCore/VoxelFilters.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt
index 761a0ef7..52d1efc7 100644
--- a/library/PolyVoxUtil/CMakeLists.txt
+++ b/library/PolyVoxUtil/CMakeLists.txt
@@ -9,10 +9,10 @@ SET(UTIL_SRC_FILES
 
 #Projects headers files
 SET(UTIL_INC_FILES
-	include/Serialization.h
-	include/Serialization.inl
-	include/VolumeChangeTracker.h	
-	include/VolumeChangeTracker.inl
+	include/PolyVoxUtil/Serialization.h
+	include/PolyVoxUtil/Serialization.inl
+	include/PolyVoxUtil/VolumeChangeTracker.h	
+	include/PolyVoxUtil/VolumeChangeTracker.inl
 )
 
 ADD_DEFINITIONS(-DPOLYVOX_SHARED_EXPORTS) #Export symbols in the .dll
diff --git a/library/PolyVoxUtil/include/Serialization.h b/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h
similarity index 94%
rename from library/PolyVoxUtil/include/Serialization.h
rename to library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h
index f321bcbf..17241db1 100644
--- a/library/PolyVoxUtil/include/Serialization.h
+++ b/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h
@@ -24,8 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Serialization_H__
 #define __PolyVox_Serialization_H__
 
-#include "PolyVoxForwardDeclarations.h"
-#include "Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
 
 #include <iostream>
 #include <memory>
@@ -66,6 +66,6 @@ namespace PolyVox
 	bool saveVersion0(std::ostream& stream, VolumeType<VoxelType>& volume, VolumeSerializationProgressListener* progressListener = 0);
 }
 
-#include "Serialization.inl"
+#include "PolyVoxUtil/Serialization.inl"
 
 #endif
diff --git a/library/PolyVoxUtil/include/Serialization.inl b/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.inl
similarity index 100%
rename from library/PolyVoxUtil/include/Serialization.inl
rename to library/PolyVoxUtil/include/PolyVoxUtil/Serialization.inl
diff --git a/library/PolyVoxUtil/include/VolumeChangeTracker.h b/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.h
similarity index 92%
rename from library/PolyVoxUtil/include/VolumeChangeTracker.h
rename to library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.h
index d127ea84..98aca8af 100644
--- a/library/PolyVoxUtil/include/VolumeChangeTracker.h
+++ b/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.h
@@ -26,8 +26,8 @@ freely, subject to the following restrictions:
 
 #include <list>
 
-#include "PolyVoxForwardDeclarations.h"
-#include "Region.h"
+#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Region.h"
 
 namespace PolyVox
 {	
@@ -76,6 +76,6 @@ namespace PolyVox
 	};
 }
 
-#include "VolumeChangeTracker.inl"
+#include "PolyVoxUtil/VolumeChangeTracker.inl"
 
 #endif
diff --git a/library/PolyVoxUtil/include/VolumeChangeTracker.inl b/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.inl
similarity index 94%
rename from library/PolyVoxUtil/include/VolumeChangeTracker.inl
rename to library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.inl
index f5949bb0..1f9eff8d 100644
--- a/library/PolyVoxUtil/include/VolumeChangeTracker.inl
+++ b/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.inl
@@ -21,15 +21,13 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "VolumeChangeTracker.h"
-
-#include "GradientEstimators.h"
-#include "SurfaceMesh.h"
+#include "PolyVoxCore/GradientEstimators.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxImpl/MarchingCubesTables.h"
-#include "VertexTypes.h"
+#include "PolyVoxCore/VertexTypes.h"
 #include "PolyVoxImpl/Utility.h"
-#include "Vector.h"
-#include "LargeVolume.h"
+#include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/LargeVolume.h"
 
 namespace PolyVox
 {
diff --git a/tests/TestArray.cpp b/tests/TestArray.cpp
index 45550c13..f889ecd4 100644
--- a/tests/TestArray.cpp
+++ b/tests/TestArray.cpp
@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "TestArray.h"
 
-#include <Array.h>
+#include "PolyVoxCore/Array.h"
 
 #include <QtTest>
 
diff --git a/tests/testmaterial.cpp b/tests/testmaterial.cpp
index efd470b2..a4662e34 100644
--- a/tests/testmaterial.cpp
+++ b/tests/testmaterial.cpp
@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "testmaterial.h"
 
-#include <Material.h>
+#include "PolyVoxCore/Material.h"
 
 #include <QtTest>
 
diff --git a/tests/testvector.cpp b/tests/testvector.cpp
index 8054a0bb..4f75bff6 100644
--- a/tests/testvector.cpp
+++ b/tests/testvector.cpp
@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "testvector.h"
 
-#include <Vector.h>
+#include "PolyVoxCore/Vector.h"
 
 #include <QtTest>
 
diff --git a/tests/testvolume.cpp b/tests/testvolume.cpp
index 5c2f2758..3ea20c23 100644
--- a/tests/testvolume.cpp
+++ b/tests/testvolume.cpp
@@ -23,7 +23,7 @@ freely, subject to the following restrictions:
 
 #include "testvolume.h"
 
-#include <LargeVolume.h>
+#include "PolyVoxCore/LargeVolume.h"
 
 #include <QtTest>