diff --git a/examples/OpenGL/Shapes.h b/examples/OpenGL/Shapes.h
index c25c5f8f..93f047fd 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 "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/MaterialDensityPair.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/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
index 1518c18e..24499451 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
@@ -24,13 +24,13 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_AStarPathfinder_H__
 #define __PolyVox_AStarPathfinder_H__
 
-#include "PolyVoxCore/Array.h"
 #include "PolyVoxImpl/AStarPathfinderImpl.h"
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
-#include "PolyVoxCore/LargeVolume.h"
-
 #include "PolyVoxImpl/TypeDef.h"
 
+#include "PolyVoxCore/Array.h"
+
+#include <list>
+
 namespace PolyVox
 {
 	const float sqrt_1 = 1.0f;
diff --git a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl
index 9159b02f..54a5a826 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl
@@ -21,8 +21,6 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "PolyVoxCore/Material.h"
-
 namespace PolyVox
 {
 	////////////////////////////////////////////////////////////////////////////////
diff --git a/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h b/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h
index 8b02d03b..c1310c4c 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h
@@ -24,8 +24,14 @@ freely, subject to the following restrictions:
 #ifndef __AmbientOcclusionCalculator_H__
 #define __AmbientOcclusionCalculator_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
-#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxImpl/RandomUnitVectors.h"
+#include "PolyVoxImpl/RandomVectors.h"
+
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/Raycast.h"
+
+#include <algorithm>
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl b/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl
index 9c3453de..29e7e4ae 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl
@@ -21,15 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/Array.h"
-#include "PolyVoxCore/Raycast.h"
-#include "PolyVoxCore/LargeVolume.h"
-
-#include "PolyVoxImpl/RandomUnitVectors.h"
-#include "PolyVoxImpl/RandomVectors.h"
-
-#include <algorithm>
-
 namespace PolyVox
 {
 	template< template<typename> class VolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Array.h b/library/PolyVoxCore/include/PolyVoxCore/Array.h
index f4a701b8..acb061bb 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Array.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Array.h
@@ -24,10 +24,10 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Array_H__
 #define __PolyVox_Array_H__
 
-#include "PolyVoxCore/ArraySizes.h" //Not strictly required, but convienient
-
 #include "PolyVoxImpl/SubArray.h"
 
+#include "PolyVoxCore/ArraySizes.h" //Not strictly required, but convienient
+
 namespace PolyVox
 {
 	///Provides an efficient implementation of a multidimensional array.
diff --git a/library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h b/library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h
index 51861073..bde93f4d 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/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 "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
index 17b6189d..c6d362dd 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
@@ -24,12 +24,11 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_CubicSurfaceExtractor_H__
 #define __PolyVox_CubicSurfaceExtractor_H__
 
-#include "PolyVoxCore/Array.h"
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
-#include "PolyVoxCore/LargeVolume.h"
-
 #include "PolyVoxImpl/TypeDef.h"
 
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/SurfaceMesh.h"
+
 namespace PolyVox
 {
 	template< template<typename> class VolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
index fae71749..68c00255 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
@@ -21,12 +21,6 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "PolyVoxCore/Array.h"
-#include "PolyVoxCore/MaterialDensityPair.h"
-#include "PolyVoxCore/SurfaceMesh.h"
-#include "PolyVoxImpl/MarchingCubesTables.h"
-#include "PolyVoxCore/VertexTypes.h"
-
 namespace PolyVox
 {
 	template< template<typename> class VolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
index 0f8f6c62..dfba9482 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
@@ -24,10 +24,10 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_CubicSurfaceExtractorWithNormals_H__
 #define __PolyVox_CubicSurfaceExtractorWithNormals_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
-#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxImpl/MarchingCubesTables.h"
 
-#include "PolyVoxImpl/TypeDef.h"
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/SurfaceMesh.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
index 9401eebc..da0ebf7e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl
@@ -21,12 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/Array.h"
-#include "PolyVoxCore/MaterialDensityPair.h"
-#include "PolyVoxCore/SurfaceMesh.h"
-#include "PolyVoxImpl/MarchingCubesTables.h"
-#include "PolyVoxCore/VertexTypes.h"
-
 namespace PolyVox
 {
 	template< template<typename> class VolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Density.h b/library/PolyVoxCore/include/PolyVoxCore/Density.h
index a2084c3e..5994b0f3 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Density.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Density.h
@@ -24,7 +24,6 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Density_H__
 #define __PolyVox_Density_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h b/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
index 641c9dc2..3f374308 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
@@ -24,9 +24,10 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_GradientEstimators_H__
 #define __PolyVox_GradientEstimators_H__
 
-#include <vector>
-
 #include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/VoxelFilters.h"
+
+#include <vector>
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl b/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl
index f3b7116c..eec70eca 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl
@@ -21,10 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/VoxelFilters.h"
-
-#include "PolyVoxCore/LargeVolume.h"
-
 namespace PolyVox
 {
 	template< template<typename> class VolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/IteratorController.h b/library/PolyVoxCore/include/PolyVoxCore/IteratorController.h
index 527263eb..935cc845 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/IteratorController.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/IteratorController.h
@@ -24,6 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_IteratorController_H__
 #define __PolyVox_IteratorController_H__
 
+#include "PolyVoxCore/Region.h"
+
 namespace PolyVox
 {
 	template <typename IteratorType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
index 323c7054..3a232997 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
@@ -25,14 +25,19 @@ freely, subject to the following restrictions:
 #define __PolyVox_LargeVolume_H__
 
 #include "PolyVoxImpl/Block.h"
+#include "PolyVoxCore/Log.h"
 #include "PolyVoxCore/Region.h"
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Vector.h"
 #include "PolyVoxCore/Volume.h"
 
 #include <limits>
+#include <cassert>
+#include <cstdlib> //For abort()
+#include <cstring> //For memcpy
+#include <list>
 #include <map>
-#include <set>
 #include <memory>
+#include <stdexcept> //For invalid_argument
 #include <vector>
 
 namespace PolyVox
@@ -141,6 +146,9 @@ namespace PolyVox
 	/// This is true even if you are only reading data from the volume, as concurrently reading from different threads can invalidate the contents
 	/// of the block cache (amoung other problems).
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	template <typename VoxelType> class ConstVolumeProxy;
+
 	template <typename VoxelType>
 	class LargeVolume : public Volume<VoxelType>
 	{
diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
index b041685c..75486746 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
@@ -21,18 +21,8 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
+//Included here rather than in the .h because it refers to LargeVolume (avoids forward declaration)
 #include "PolyVoxCore/ConstVolumeProxy.h"
-#include "PolyVoxImpl/Block.h"
-#include "PolyVoxCore/Log.h"
-#include "PolyVoxCore/Region.h"
-#include "PolyVoxCore/Vector.h"
-
-#include <limits>
-#include <cassert>
-#include <cstdlib> //For abort()
-#include <cstring> //For memcpy
-#include <list>
-#include <stdexcept> //For invalid_argument
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl
index f89d4c1b..86f9dcac 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl
@@ -21,13 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxImpl/Block.h"
-#include "PolyVoxCore/LargeVolume.h"
-#include "PolyVoxCore/Vector.h"
-#include "PolyVoxCore/Region.h"
-
-#include <limits>
-
 #define BORDER_LOW(x) ((( x >> this->mVolume->m_uBlockSideLengthPower) << this->mVolume->m_uBlockSideLengthPower) != x)
 #define BORDER_HIGH(x) ((( (x+1) >> this->mVolume->m_uBlockSideLengthPower) << this->mVolume->m_uBlockSideLengthPower) != (x+1))
 //#define BORDER_LOW(x) (( x % mVolume->m_uBlockSideLength) != 0)
diff --git a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h b/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h
index 3e93f3ec..6379b13b 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h
@@ -24,7 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_LowPassFilter_H__
 #define __PolyVox_LowPassFilter_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/IteratorController.h"
+#include "PolyVoxCore/RawVolume.h" //Is this desirable?
 #include "PolyVoxCore/Region.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl b/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl
index affa90f2..b3f6fce5 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl
@@ -21,9 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/IteratorController.h"
-#include "PolyVoxCore/RawVolume.h"
-
 namespace PolyVox
 {
 	template< template<typename> class SrcVolumeType, template<typename> class DestVolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Material.h b/library/PolyVoxCore/include/PolyVoxCore/Material.h
index 8f6ff962..040c482a 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Material.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Material.h
@@ -24,7 +24,6 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Material_H__
 #define __PolyVox_Material_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 #include <cassert>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
index 4ca6d5ba..03bff183 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
@@ -24,7 +24,6 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MaterialDensityPair_H__
 #define __PolyVox_MaterialDensityPair_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h
index dbfe89ce..8c3218ad 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h
@@ -24,7 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_MeshDecimator_H__
 #define __PolyVox_MeshDecimator_H__
 
+#include "PolyVoxCore/SurfaceMesh.h"
 #include "PolyVoxCore/Vector.h"
+#include "PolyVoxCore/VertexTypes.h"
 
 #include <bitset>
 #include <vector>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl
index 381b5ef5..367c5379 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.inl
@@ -21,8 +21,6 @@ freely, subject to the following restrictions:
     distribution.
 *******************************************************************************/
 
-#include "PolyVoxCore/SurfaceMesh.h"
-
 namespace PolyVox
 {
 	////////////////////////////////////////////////////////////////////////////////
diff --git a/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
index 656b3e1e..83b9b4df 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
@@ -60,18 +60,10 @@ namespace PolyVox
 
 	template <typename VoxelType> class Block;
 
-	template <typename VoxelType> class ConstVolumeProxy;
-
 	//---------- LargeVolume ----------
 	template <typename VoxelType> class LargeVolume;
 	//---------------------------------
 
-	//---------- Mesh ----------
-	class Mesh;
-	class MeshEdge;
-	class MeshFace;
-	class MeshVertex;
-	//---------------------------------
 
 	template <typename Type> class Density;
 	typedef Density<uint8_t> Density8;
diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.h b/library/PolyVoxCore/include/PolyVoxCore/RawVolume.h
index 83a287d1..fb73f6ea 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/RawVolume.h
@@ -24,12 +24,16 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_RawVolume_H__
 #define __PolyVox_RawVolume_H__
 
+#include "PolyVoxCore/Log.h"
 #include "PolyVoxCore/Region.h"
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Vector.h"
 #include "PolyVoxCore/Volume.h"
 
+#include <cassert>
+#include <cstdlib> //For abort()
 #include <limits>
 #include <memory>
+#include <stdexcept> //For invalid_argument
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl
index 27257dc6..c6d0f62e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl
@@ -21,17 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/ConstVolumeProxy.h"
-#include "PolyVoxImpl/Block.h"
-#include "PolyVoxCore/Log.h"
-#include "PolyVoxCore/Region.h"
-#include "PolyVoxCore/Vector.h"
-
-#include <limits>
-#include <cassert>
-#include <cstdlib> //For abort()
-#include <stdexcept> //For invalid_argument
-
 namespace PolyVox
 {
 	////////////////////////////////////////////////////////////////////////////////
diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
index bf4f97b1..7f2d70f7 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
@@ -21,13 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxImpl/Block.h"
-#include "PolyVoxCore/RawVolume.h"
-#include "PolyVoxCore/Vector.h"
-#include "PolyVoxCore/Region.h"
-
-#include <limits>
-
 #define BORDER_LOWX(val) (val > this->mVolume->getEnclosingRegion().getLowerCorner().getX())
 #define BORDER_HIGHX(val) (val < this->mVolume->getEnclosingRegion().getUpperCorner().getX())
 #define BORDER_LOWY(val) (val > this->mVolume->getEnclosingRegion().getLowerCorner().getY())
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Raycast.h b/library/PolyVoxCore/include/PolyVoxCore/Raycast.h
index 9282b26b..b94cf5f8 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Raycast.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Raycast.h
@@ -24,6 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Raycast_H__
 #define __PolyVox_Raycast_H__
 
+#include "PolyVoxCore/Vector.h"
+
 namespace PolyVox
 {
 	/// Stores the result of a raycast operation.
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl b/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl
index ccca4113..fb0f99ef 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/Raycast.inl
@@ -20,6 +20,7 @@ freely, subject to the following restrictions:
     3. This notice may not be removed or altered from any source
     distribution. 	
 *******************************************************************************/
+
 namespace PolyVox
 {
 	////////////////////////////////////////////////////////////////////////////////
diff --git a/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.h b/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.h
index fdf8746d..bb53812f 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.h
@@ -24,6 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_RaycastWithCallback_H__
 #define __PolyVox_RaycastWithCallback_H__
 
+#include "PolyVoxCore/Vector.h"
+
 namespace PolyVox
 {
 	template< template<typename> class VolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.inl b/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.inl
index df50c7bd..4e29cff5 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/RaycastWithCallback.inl
@@ -20,6 +20,7 @@ freely, subject to the following restrictions:
     3. This notice may not be removed or altered from any source
     distribution. 	
 *******************************************************************************/
+
 namespace PolyVox
 {
 	template< template<typename> class VolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Region.h b/library/PolyVoxCore/include/PolyVoxCore/Region.h
index e9297492..3668d847 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Region.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Region.h
@@ -25,6 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_Region_H__
 
 #include "PolyVoxImpl/TypeDef.h"
+
 #include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
index c11674f5..b9af204e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
@@ -24,12 +24,19 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_SimpleVolume_H__
 #define __PolyVox_SimpleVolume_H__
 
+#include "PolyVoxImpl/Utility.h"
+
+#include "PolyVoxCore/Log.h"
 #include "PolyVoxCore/Region.h"
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Vector.h"
 #include "PolyVoxCore/Volume.h"
 
+#include <cassert>
+#include <cstdlib> //For abort()
+#include <cstring> //For memcpy
 #include <limits>
 #include <memory>
+#include <stdexcept> //For invalid_argument
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl
index 75133e32..ace3929e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl
@@ -21,17 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/ConstVolumeProxy.h"
-#include "PolyVoxImpl/Block.h"
-#include "PolyVoxCore/Log.h"
-#include "PolyVoxCore/Region.h"
-#include "PolyVoxCore/Vector.h"
-
-#include <limits>
-#include <cassert>
-#include <cstdlib> //For abort()
-#include <stdexcept> //For invalid_argument
-
 namespace PolyVox
 {
 	////////////////////////////////////////////////////////////////////////////////
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeBlock.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeBlock.inl
index 4d3eb709..9b2d0c85 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeBlock.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeBlock.inl
@@ -21,14 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxImpl/Utility.h"
-#include "Vector.h"
-
-#include <cassert>
-#include <cstring> //For memcpy
-#include <limits>
-#include <stdexcept> //for std::invalid_argument
-
 namespace PolyVox
 {
 	template <typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
index 7148b510..6b1bf725 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
@@ -21,13 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxImpl/Block.h"
-#include "PolyVoxCore/SimpleVolume.h"
-#include "PolyVoxCore/Vector.h"
-#include "PolyVoxCore/Region.h"
-
-#include <limits>
-
 #define BORDER_LOW(x) ((( x >> this->mVolume->m_uBlockSideLengthPower) << this->mVolume->m_uBlockSideLengthPower) != x)
 #define BORDER_HIGH(x) ((( (x+1) >> this->mVolume->m_uBlockSideLengthPower) << this->mVolume->m_uBlockSideLengthPower) != (x+1))
 //#define BORDER_LOW(x) (( x % this->mVolume->m_uBlockSideLength) != 0)
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h b/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h
index 3a6b985a..484944fc 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h
@@ -24,11 +24,12 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_SurfaceExtractor_H__
 #define __PolyVox_SurfaceExtractor_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
-#include "PolyVoxCore/LargeVolume.h"
-
+#include "PolyVoxImpl/MarchingCubesTables.h"
 #include "PolyVoxImpl/TypeDef.h"
 
+#include "PolyVoxCore/Array.h"
+#include "PolyVoxCore/SurfaceMesh.h"
+
 namespace PolyVox
 {
 	template< template<typename> class VolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl b/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl
index a040fbc6..24b8178d 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl
@@ -21,12 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/Array.h"
-#include "PolyVoxCore/MaterialDensityPair.h"
-#include "PolyVoxCore/SurfaceMesh.h"
-#include "PolyVoxImpl/MarchingCubesTables.h"
-#include "PolyVoxCore/VertexTypes.h"
-
 namespace PolyVox
 {
 	template< template<typename> class VolumeType, typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h b/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h
index d51b399f..c0833d5a 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.h
@@ -24,15 +24,18 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_SurfaceMesh_H__
 #define __PolyVox_SurfaceMesh_H__
 
-#include <vector>
-#include <set>
-#include <memory>
-
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
-#include "PolyVoxCore/Region.h"
-#include "PolyVoxCore/VertexTypes.h"
 #include "PolyVoxImpl/TypeDef.h"
 
+#include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/VertexTypes.h" //Should probably do away with this on in the future...
+
+#include <algorithm>
+#include <cstdlib>
+#include <list>
+#include <memory>
+#include <set>
+#include <vector>
+
 namespace PolyVox
 {
 	class LodRecord
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl b/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl
index 033388c1..83fc97ab 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl
@@ -21,12 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include <cstdlib>
-#include <list>
-#include <algorithm>
-
-using namespace std;
-
 namespace PolyVox
 {
 	template <typename VertexType>
@@ -366,7 +360,7 @@ namespace PolyVox
 	template <typename VertexType>
 	void SurfaceMesh<VertexType>::removeUnusedVertices(void)
 	{
-		vector<bool> isVertexUsed(m_vecVertices.size());
+		std::vector<bool> isVertexUsed(m_vecVertices.size());
 		fill(isVertexUsed.begin(), isVertexUsed.end(), false);
 
 		for(uint32_t triCt = 0; triCt < m_vecTriangleIndices.size(); triCt++)
@@ -376,7 +370,7 @@ namespace PolyVox
 		}
 
 		int noOfUsedVertices = 0;
-		vector<uint32_t> newPos(m_vecVertices.size());
+		std::vector<uint32_t> newPos(m_vecVertices.size());
 		for(uint32_t vertCt = 0; vertCt < m_vecVertices.size(); vertCt++)
 		{
 			if(isVertexUsed[vertCt])
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Vector.h b/library/PolyVoxCore/include/PolyVoxCore/Vector.h
index 82c2fdbf..1269fe73 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Vector.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Vector.h
@@ -24,8 +24,11 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Vector_H__
 #define __PolyVox_Vector_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxImpl/TypeDef.h"
 
+#include <cassert>
+#include <cmath>
+#include <cstring>
 #include <iostream>
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Vector.inl b/library/PolyVoxCore/include/PolyVoxCore/Vector.inl
index 6c0f3b19..bd9dd88e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Vector.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/Vector.inl
@@ -21,11 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include <cassert>
-#include <cmath>
-#include <string>
-#include <cstring>
-
 namespace PolyVox
 {
     //-------------------------- Constructors, etc ---------------------------------
diff --git a/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h b/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h
index 3c2fd6ad..3e0df0b4 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h
@@ -25,6 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_SurfaceVertex_H__
 
 #include "PolyVoxImpl/TypeDef.h"
+
 #include "PolyVoxCore/Vector.h"
 
 #include <bitset>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Volume.h b/library/PolyVoxCore/include/PolyVoxCore/Volume.h
index 298b90af..3a3368b5 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Volume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Volume.h
@@ -24,11 +24,12 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Volume_H__
 #define __PolyVox_Volume_H__
 
+#include "PolyVoxCore/Log.h"
 #include "PolyVoxCore/Region.h"
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxCore/Vector.h"
 
+#include <cassert>
 #include <limits>
-#include <memory>
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Volume.inl b/library/PolyVoxCore/include/PolyVoxCore/Volume.inl
index fc17962c..0db51e3a 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Volume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/Volume.inl
@@ -21,12 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/Log.h"
-#include "PolyVoxCore/Region.h"
-#include "PolyVoxCore/Vector.h"
-
-#include <cassert>
-
 namespace PolyVox
 {
 	template <typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h
index fce4c5e9..1e0fa526 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h
@@ -24,8 +24,6 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_VolumeResampler_H__
 #define __PolyVox_VolumeResampler_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
-
 namespace PolyVox
 {
 	template< template<typename> class SrcVolumeType, template<typename> class DestVolumeType, typename VoxelType>
@@ -38,7 +36,6 @@ namespace PolyVox
 
 	private:
 		void resampleSameSize();
-		void resampleHalfSize();
 		void resampleArbitrary();
 
 		//Source data
diff --git a/library/PolyVoxCore/include/PolyVoxCore/VolumeSampler.inl b/library/PolyVoxCore/include/PolyVoxCore/VolumeSampler.inl
index 0dbf6ac1..57fdeb09 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/VolumeSampler.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/VolumeSampler.inl
@@ -21,12 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxImpl/Block.h"
-#include "PolyVoxCore/Volume.h"
-#include "PolyVoxCore/Vector.h"
-#include "PolyVoxCore/Region.h"
-
-#include <limits>
 namespace PolyVox
 {
 	template <typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h b/library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h
index f680a875..17d65e59 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h
@@ -24,11 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_VoxelFilters_H__
 #define __PolyVox_VoxelFilters_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
 
-#include "PolyVoxCore/LargeVolume.h"
-
 namespace PolyVox
 {
 	template< template<typename> class VolumeType>
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h b/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
index 311b6f85..e4a03498 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
@@ -26,6 +26,7 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxCore/Vector.h"
 
+#include <algorithm>
 #include <limits> //For numeric_limits
 #include <set>
 #include <vector>
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/Block.h b/library/PolyVoxCore/include/PolyVoxImpl/Block.h
index 34f0a6d9..c102ffa7 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/Block.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/Block.h
@@ -24,7 +24,9 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Block_H__
 #define __PolyVox_Block_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxImpl/TypeDef.h"
+#include "PolyVoxCore/Vector.h"
+
 #include <limits>
 #include <vector>
 
@@ -44,8 +46,6 @@ namespace PolyVox
 			static uint32_t maxRunlength(void) {return (std::numeric_limits<LengthType>::max)();}
 		};
 
-		//Make Sampler a friend
-		friend class LargeVolume<VoxelType>::Sampler;
 	public:
 		Block(uint16_t uSideLength = 0);
 
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/Block.inl b/library/PolyVoxCore/include/PolyVoxImpl/Block.inl
index 1d389c68..147e8fab 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/Block.inl
+++ b/library/PolyVoxCore/include/PolyVoxImpl/Block.inl
@@ -23,7 +23,6 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxImpl/Utility.h"
 #include "PolyVoxCore/Vector.h"
-#include "PolyVoxCore/LargeVolume.h"
 
 #include <cassert>
 #include <cstring> //For memcpy
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/RandomUnitVectors.h b/library/PolyVoxCore/include/PolyVoxImpl/RandomUnitVectors.h
index 8702f865..7e1c237d 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/RandomUnitVectors.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/RandomUnitVectors.h
@@ -24,6 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_RandomUnitVectors_H__
 #define __PolyVox_RandomUnitVectors_H__
 
+#include "PolyVoxImpl/TypeDef.h"
+
 #include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/RandomVectors.h b/library/PolyVoxCore/include/PolyVoxImpl/RandomVectors.h
index 2544d97d..6df39f08 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/RandomVectors.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/RandomVectors.h
@@ -24,6 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_RandomVectors_H__
 #define __PolyVox_RandomVectors_H__
 
+#include "PolyVoxImpl/TypeDef.h"
+
 #include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h
index 2b30eefd..9055429a 100644
--- a/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h
+++ b/library/PolyVoxCore/include/PolyVoxImpl/SubArray.h
@@ -24,6 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_SubArray_H__
 #define __PolyVox_SubArray_H__
 
+#include "PolyVoxImpl/TypeDef.h"
+
 namespace PolyVox
 {
 	template <uint32_t noOfDims, typename ElementType> class Array;
diff --git a/library/PolyVoxCore/source/AStarPathfinder.cpp b/library/PolyVoxCore/source/AStarPathfinder.cpp
index 848245ce..95c680a1 100644
--- a/library/PolyVoxCore/source/AStarPathfinder.cpp
+++ b/library/PolyVoxCore/source/AStarPathfinder.cpp
@@ -23,8 +23,6 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxCore/AStarPathfinder.h"
 
-#include "PolyVoxCore/Material.h"
-
 using namespace PolyVox;
 
 namespace PolyVox
diff --git a/library/PolyVoxCore/source/GradientEstimators.cpp b/library/PolyVoxCore/source/GradientEstimators.cpp
index 0ee44a5f..74417667 100644
--- a/library/PolyVoxCore/source/GradientEstimators.cpp
+++ b/library/PolyVoxCore/source/GradientEstimators.cpp
@@ -21,12 +21,9 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/GradientEstimators.h"
-#include "PolyVoxCore/SurfaceMesh.h"
-#include "PolyVoxCore/VertexTypes.h"
 #include "PolyVoxImpl/TypeDef.h"
 
-#include "PolyVoxCore/LargeVolume.h"
+#include "PolyVoxCore/GradientEstimators.h"
 
 using namespace std;
 
diff --git a/library/PolyVoxCore/source/MeshDecimator.cpp b/library/PolyVoxCore/source/MeshDecimator.cpp
index 1908f5ac..686e62c2 100644
--- a/library/PolyVoxCore/source/MeshDecimator.cpp
+++ b/library/PolyVoxCore/source/MeshDecimator.cpp
@@ -1,7 +1,31 @@
-#include "PolyVoxCore/MeshDecimator.h"
+/*******************************************************************************
+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/MeshDecimator.h"
 #include "PolyVoxCore/SurfaceMesh.h"
 
+using namespace std;
+
 namespace PolyVox
 {
 	template<>
diff --git a/library/PolyVoxCore/source/VertexTypes.cpp b/library/PolyVoxCore/source/VertexTypes.cpp
index d966fc9f..db41759e 100644
--- a/library/PolyVoxCore/source/VertexTypes.cpp
+++ b/library/PolyVoxCore/source/VertexTypes.cpp
@@ -21,8 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include <sstream>
-
 #include "PolyVoxCore/VertexTypes.h"
 
 namespace PolyVox
diff --git a/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h b/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h
index 17241db1..61eebfb7 100644
--- a/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h
+++ b/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.h
@@ -24,7 +24,8 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Serialization_H__
 #define __PolyVox_Serialization_H__
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
+#include "PolyVoxImpl/Utility.h"
+
 #include "PolyVoxCore/Region.h"
 
 #include <iostream>
diff --git a/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.inl b/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.inl
index e7fc630b..054a8f7f 100644
--- a/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.inl
+++ b/library/PolyVoxUtil/include/PolyVoxUtil/Serialization.inl
@@ -21,8 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxImpl/Utility.h"
-
 namespace PolyVox
 {
 	//Note: we don't do much error handling in here - exceptions will simply be propergated up to the caller.
diff --git a/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.h b/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.h
index 98aca8af..a10b2951 100644
--- a/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.h
+++ b/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.h
@@ -24,10 +24,11 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_VolumeChangeTracker_H__
 #define __PolyVox_VolumeChangeTracker_H__
 
-#include <list>
+#include "PolyVoxImpl/Utility.h"
 
-#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
 #include "PolyVoxCore/Region.h"
+#include "PolyVoxCore/SurfaceMesh.h"
+#include "PolyVoxCore/Vector.h"
 
 namespace PolyVox
 {	
diff --git a/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.inl b/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.inl
index 1f9eff8d..a426e653 100644
--- a/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.inl
+++ b/library/PolyVoxUtil/include/PolyVoxUtil/VolumeChangeTracker.inl
@@ -21,14 +21,6 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#include "PolyVoxCore/GradientEstimators.h"
-#include "PolyVoxCore/SurfaceMesh.h"
-#include "PolyVoxImpl/MarchingCubesTables.h"
-#include "PolyVoxCore/VertexTypes.h"
-#include "PolyVoxImpl/Utility.h"
-#include "PolyVoxCore/Vector.h"
-#include "PolyVoxCore/LargeVolume.h"
-
 namespace PolyVox
 {
 	template <typename VoxelType>
diff --git a/tests/TestAStarPathfinder.cpp b/tests/TestAStarPathfinder.cpp
index cdbceddd..7df04a0a 100644
--- a/tests/TestAStarPathfinder.cpp
+++ b/tests/TestAStarPathfinder.cpp
@@ -24,6 +24,7 @@ freely, subject to the following restrictions:
 #include "TestAStarPathfinder.h"
 
 #include "PolyVoxCore/AStarPathfinder.h"
+#include "PolyVoxCore/Material.h"
 #include "PolyVoxCore/RawVolume.h"
 
 #include <QtTest>