diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
index f618c9ae..5f2d49b3 100644
--- a/library/PolyVoxCore/CMakeLists.txt
+++ b/library/PolyVoxCore/CMakeLists.txt
@@ -48,6 +48,8 @@ SET(CORE_INC_FILES
 	include/PolyVoxCore/BaseVolume.h
 	include/PolyVoxCore/BaseVolume.inl
 	include/PolyVoxCore/BaseVolumeSampler.inl
+	include/PolyVoxCore/Block.h
+	include/PolyVoxCore/Block.inl
 	include/PolyVoxCore/BlockCompressor.h
 	include/PolyVoxCore/Compressor.h
 	include/PolyVoxCore/CubicSurfaceExtractor.h
@@ -114,8 +116,6 @@ SET(IMPL_INC_FILES
 	include/PolyVoxCore/Impl/ArraySizesImpl.h
 	include/PolyVoxCore/Impl/ArraySizesImpl.inl
 	include/PolyVoxCore/Impl/AStarPathfinderImpl.h
-	include/PolyVoxCore/Impl/Block.h
-	include/PolyVoxCore/Impl/Block.inl
     include/PolyVoxCore/Impl/CompilerCapabilities.h
     include/PolyVoxCore/Impl/Config.h
 	include/PolyVoxCore/Impl/ErrorHandling.h
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h b/library/PolyVoxCore/include/PolyVoxCore/Block.h
similarity index 99%
rename from library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
rename to library/PolyVoxCore/include/PolyVoxCore/Block.h
index 718ee9db..a1567552 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Block.h
@@ -126,6 +126,6 @@ namespace PolyVox
 	};
 }
 
-#include "PolyVoxCore/Impl/Block.inl"
+#include "PolyVoxCore/Block.inl"
 
 #endif
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl b/library/PolyVoxCore/include/PolyVoxCore/Block.inl
similarity index 100%
rename from library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
rename to library/PolyVoxCore/include/PolyVoxCore/Block.inl
diff --git a/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h b/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h
index dbef7a02..2646e94c 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h
@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_BlockCompressor_H__
 
 #include "PolyVoxCore/PolyVoxForwardDeclarations.h"
-#include "PolyVoxCore/Impl/Block.h"
+#include "PolyVoxCore/Block.h"
 
 namespace PolyVox
 {
diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
index 986bcf2b..a26bc29b 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
@@ -25,7 +25,7 @@ freely, subject to the following restrictions:
 #define __PolyVox_LargeVolume_H__
 
 #include "PolyVoxCore/BaseVolume.h"
-#include "PolyVoxCore/Impl/Block.h"
+#include "PolyVoxCore/Block.h"
 #include "PolyVoxCore/BlockCompressor.h"
 #include "PolyVoxCore/Pager.h"
 #include "PolyVoxCore/Region.h"
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Pager.h b/library/PolyVoxCore/include/PolyVoxCore/Pager.h
index af1e3387..6189566a 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Pager.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Pager.h
@@ -24,7 +24,7 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Pager_H__
 #define __PolyVox_Pager_H__
 
-#include "PolyVoxCore/Impl/Block.h"
+#include "PolyVoxCore/Block.h"
 #include "PolyVoxCore/Impl/TypeDef.h"
 
 namespace PolyVox