diff --git a/include/Block.h b/include/Block.h
index 39737ba7..8d96cae7 100644
--- a/include/Block.h
+++ b/include/Block.h
@@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 #pragma endregion
 
-#ifndef __Block_H__
-#define __Block_H__
+#ifndef __PolyVox_Block_H__
+#define __PolyVox_Block_H__
 
 #pragma region Headers
 #include "boost/cstdint.hpp"
diff --git a/include/Constants.h b/include/Constants.h
index 6e6f3e9f..90fc5119 100644
--- a/include/Constants.h
+++ b/include/Constants.h
@@ -1,5 +1,5 @@
-#ifndef __Constants_H__
-#define __Constants_H__
+#ifndef __PolyVox_Constants_H__
+#define __PolyVox_Constants_H__
 
 #include "boost/cstdint.hpp"
 
diff --git a/include/ForwardDeclarations.h b/include/ForwardDeclarations.h
index efc02b8b..ed67070e 100644
--- a/include/ForwardDeclarations.h
+++ b/include/ForwardDeclarations.h
@@ -1,5 +1,5 @@
-#ifndef __ForwardDeclarations_H__
-#define __ForwardDeclarations_H__
+#ifndef __PolyVox_ForwardDeclarations_H__
+#define __PolyVox_ForwardDeclarations_H__
 
 #include "boost/cstdint.hpp"
 
diff --git a/include/IndexedSurfacePatch.h b/include/IndexedSurfacePatch.h
index 161d5c54..210830f9 100644
--- a/include/IndexedSurfacePatch.h
+++ b/include/IndexedSurfacePatch.h
@@ -1,5 +1,5 @@
-#ifndef __IndexedSurfacePatch_H__
-#define __IndexedSurfacePatch_H__
+#ifndef __PolyVox_IndexedSurfacePatch_H__
+#define __PolyVox_IndexedSurfacePatch_H__
 
 #include <vector>
 
diff --git a/include/MarchingCubesTables.h b/include/MarchingCubesTables.h
index 61ed522d..bf7af207 100644
--- a/include/MarchingCubesTables.h
+++ b/include/MarchingCubesTables.h
@@ -1,5 +1,5 @@
-#ifndef MARCHING_CUBES_TABLES_HEADER_INCLUDED
-#define MARCHING_CUBES_TABLES_HEADER_INCLUDED
+#ifndef __PolyVox_MarchingCubeTables_H__
+#define __PolyVox_MarchingCubeTables_H__
 
 namespace PolyVox
 {
diff --git a/include/PolyVoxSceneManager.h b/include/PolyVoxSceneManager.h
index 26ab8b92..e2873d04 100644
--- a/include/PolyVoxSceneManager.h
+++ b/include/PolyVoxSceneManager.h
@@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
-#ifndef __PolyVoxSceneManager_H__
-#define __PolyVoxSceneManager_H__
+#ifndef __PolyVox_PolyVoxSceneManager_H__
+#define __PolyVox_PolyVoxSceneManager_H__
 
 #include <list>
 
diff --git a/include/RegionGeometry.h b/include/RegionGeometry.h
index 6a8f284e..b35ce06e 100644
--- a/include/RegionGeometry.h
+++ b/include/RegionGeometry.h
@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 
-#ifndef __RegionGeometry_H__
-#define __RegionGeometry_H__
+#ifndef __PolyVox_RegionGeometry_H__
+#define __PolyVox_RegionGeometry_H__
 
 #include "ForwardDeclarations.h"
 #include "TypeDef.h"
diff --git a/include/SurfaceEdge.h b/include/SurfaceEdge.h
index 9dd6560a..a020592d 100644
--- a/include/SurfaceEdge.h
+++ b/include/SurfaceEdge.h
@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 
-#ifndef __SurfaceEdge_H__
-#define __SurfaceEdge_H__
+#ifndef __PolyVox_SurfaceEdge_H__
+#define __PolyVox_SurfaceEdge_H__
 
 #include "SurfaceTypes.h"
 
diff --git a/include/SurfaceTriangle.h b/include/SurfaceTriangle.h
index 04a3c230..5f9756e8 100644
--- a/include/SurfaceTriangle.h
+++ b/include/SurfaceTriangle.h
@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 
-#ifndef __SurfaceTriangle_H__
-#define __SurfaceTriangle_H__
+#ifndef __PolyVox_SurfaceTriangle_H__
+#define __PolyVox_SurfaceTriangle_H__
 
 #include "SurfaceTypes.h"
 
diff --git a/include/SurfaceTypes.h b/include/SurfaceTypes.h
index 35c4344d..a7a4aa22 100644
--- a/include/SurfaceTypes.h
+++ b/include/SurfaceTypes.h
@@ -1,5 +1,5 @@
-#ifndef __SurfaceTypes_H__
-#define __SurfaceTypes_H__
+#ifndef __PolyVox_SurfaceTypes_H__
+#define __PolyVox_SurfaceTypes_H__
 
 #include <set>
 
diff --git a/include/SurfaceVertex.h b/include/SurfaceVertex.h
index 1e7a71a7..4e19d9c0 100644
--- a/include/SurfaceVertex.h
+++ b/include/SurfaceVertex.h
@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 
-#ifndef __SurfaceVertex_H__
-#define __SurfaceVertex_H__
+#ifndef __PolyVox_SurfaceVertex_H__
+#define __PolyVox_SurfaceVertex_H__
 
 #include "SurfaceTypes.h"
 #include "TypeDef.h"
diff --git a/include/TypeDef.h b/include/TypeDef.h
index a9acc93b..4bbeb079 100644
--- a/include/TypeDef.h
+++ b/include/TypeDef.h
@@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 //Dave, maybe make use of OgrePlatform.h instead?
 // I think use _OgreExport instead of POLYVOX_API and define OGRE_NONCLIENT_BUILD instead of POLYVOX_EXPORT?
-#ifndef __TYPEDEF_H__
-#define __TYPEDEF_H__
+#ifndef __PolyVox_TypeDef_H__
+#define __PolyVox_TypeDef_H__
 
 #ifdef WIN32
 	#ifdef POLYVOX_EXPORT
diff --git a/include/Vector.h b/include/Vector.h
index 39fad6a8..e866a6ad 100644
--- a/include/Vector.h
+++ b/include/Vector.h
@@ -1,5 +1,5 @@
-#ifndef VECTOR_HEADER_INCLUDED
-#define VECTOR_HEADER_INCLUDED
+#ifndef __PolyVox_Vector_H__
+#define __PolyVox_Vector_H__
 
 #include <iostream>
 
diff --git a/include/Volume.h b/include/Volume.h
index 5cbe9e90..f947ed36 100644
--- a/include/Volume.h
+++ b/include/Volume.h
@@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
-#ifndef __Volume_H__
-#define __Volume_H__
+#ifndef __PolyVox_Volume_H__
+#define __PolyVox_Volume_H__
 
 #include "boost/cstdint.hpp"