diff --git a/include/PolyVox/BaseVolume.h b/include/PolyVox/BaseVolume.h
index b0a0c8cc..e58dbe21 100644
--- a/include/PolyVox/BaseVolume.h
+++ b/include/PolyVox/BaseVolume.h
@@ -104,7 +104,7 @@ namespace PolyVox
 			int32_t mYPosInVolume;
 			int32_t mZPosInVolume;
 		};
-		#endif
+		#endif // SWIG
 
 	public:
 		/// Gets a voxel at the position given by <tt>x,y,z</tt> coordinates
diff --git a/include/PolyVox/CubicSurfaceExtractor.h b/include/PolyVox/CubicSurfaceExtractor.h
index e43291fa..0fdb8bbf 100644
--- a/include/PolyVox/CubicSurfaceExtractor.h
+++ b/include/PolyVox/CubicSurfaceExtractor.h
@@ -36,12 +36,8 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
-#ifdef SWIG
-	struct CubicVertex
-#else
 	template<typename _DataType>
 	struct  CubicVertex
-#endif
 	{
 		typedef _DataType DataType;
 
diff --git a/include/PolyVox/MarchingCubesSurfaceExtractor.h b/include/PolyVox/MarchingCubesSurfaceExtractor.h
index 85539885..efc6eebf 100644
--- a/include/PolyVox/MarchingCubesSurfaceExtractor.h
+++ b/include/PolyVox/MarchingCubesSurfaceExtractor.h
@@ -35,12 +35,8 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
-#ifdef SWIG
-	struct MarchingCubesVertex
-#else
 	template<typename _DataType>
 	struct  MarchingCubesVertex
-#endif
 	{
 		typedef _DataType DataType;
 
diff --git a/include/PolyVox/PagedVolume.h b/include/PolyVox/PagedVolume.h
index ebc10479..f5e33dbd 100644
--- a/include/PolyVox/PagedVolume.h
+++ b/include/PolyVox/PagedVolume.h
@@ -253,7 +253,7 @@ namespace PolyVox
 			const uint16_t m_uChunkSideLengthMinusOne;
 		};
 
-		#endif
+		#endif // SWIG
 
 	public:
 		/// Constructor for creating a fixed size volume.
diff --git a/include/PolyVox/RawVolume.h b/include/PolyVox/RawVolume.h
index 4b05f7d5..b98fb2d1 100644
--- a/include/PolyVox/RawVolume.h
+++ b/include/PolyVox/RawVolume.h
@@ -114,7 +114,7 @@ namespace PolyVox
 			bool m_bIsCurrentPositionValidInY;
 			bool m_bIsCurrentPositionValidInZ;
 		};
-		#endif
+		#endif // SWIG
 
 	public:
 		/// Constructor for creating a fixed size volume.
diff --git a/include/PolyVox/Region.h b/include/PolyVox/Region.h
index 108f1110..092644fb 100644
--- a/include/PolyVox/Region.h
+++ b/include/PolyVox/Region.h
@@ -49,11 +49,7 @@ namespace PolyVox
 	 *  about these definitions.
 	 * 
 	 */
-#ifdef SWIG
 	class Region
-#else
-	class  Region
-#endif
 	{
 	public:
 
diff --git a/include/PolyVox/Vertex.h b/include/PolyVox/Vertex.h
index f66164df..ebdb8074 100644
--- a/include/PolyVox/Vertex.h
+++ b/include/PolyVox/Vertex.h
@@ -33,12 +33,8 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
-	#ifdef SWIG
-	struct Vertex
-#else
 	template<typename _DataType>
 	struct  Vertex
-#endif
 	{
 		typedef _DataType DataType;