diff --git a/library/bindings/CubicSurfaceExtractor.i b/library/bindings/CubicSurfaceExtractor.i
index 3a604d94..2ce36816 100644
--- a/library/bindings/CubicSurfaceExtractor.i
+++ b/library/bindings/CubicSurfaceExtractor.i
@@ -1,13 +1,8 @@
 %module CubicSurfaceExtractor
 %{
-#include "SimpleVolume.h"
-#include "Array.h"
 #include "CubicSurfaceExtractor.h"
 %}
 
-%include "SimpleVolume.h"
-%include "Array.h"
 %include "CubicSurfaceExtractor.h"
 
-%template(CubicSurfaceExtractorMaterial8) PolyVox::CubicSurfaceExtractor<PolyVox::Material8>;
-%template(CubicSurfaceExtractorDensity8) PolyVox::CubicSurfaceExtractor<PolyVox::Density8>;
\ No newline at end of file
+EXTRACTORS(MarchingCubesSurfaceExtractor)
diff --git a/library/bindings/MarchingCubesSurfaceExtractor.i b/library/bindings/MarchingCubesSurfaceExtractor.i
index cf97b0e6..f33806b4 100644
--- a/library/bindings/MarchingCubesSurfaceExtractor.i
+++ b/library/bindings/MarchingCubesSurfaceExtractor.i
@@ -1,11 +1,8 @@
 %module MarchingCubesSurfaceExtractor
 %{
-#include "SimpleVolume.h"
-#include "Material.h"
 #include "MarchingCubesSurfaceExtractor.h"
 %}
 
-%include "SimpleVolume.h"
 %include "MarchingCubesSurfaceExtractor.h"
 
 EXTRACTORS(MarchingCubesSurfaceExtractor)
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index 2207b191..41c09fa3 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -52,8 +52,10 @@ EXTRACTOR(shortname, LargeVolume)
 
 %feature("autodoc", "1");
 
+#ifdef SWIGPYTHON
 //This will rename "operator=" to "assign" since Python doesn't have assignment
 %rename(assign) *::operator=;
+#endif
 
 %include "stdint.i"
 %include "std_vector.i"
@@ -67,14 +69,11 @@ EXTRACTOR(shortname, LargeVolume)
 %include "SimpleVolume.i"
 %include "RawVolume.i"
 %include "LargeVolume.i"
-//%include "TypeDef.i"
 //%include "SubArray.i"
 //%include "Array.i"
 %include "VertexTypes.i"
 %include "SurfaceMesh.i"
-//%include "SimpleVolumeSampler.i"
 %include "MarchingCubesSurfaceExtractor.i"
 //%include "CubicSurfaceExtractor.i"
 //%include "CubicSurfaceExtractorWithNormals.i"
 //%include "MeshDecimator.i"
-