diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 8103068d..21b11a23 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -33,7 +33,7 @@ endif()
 
 add_subdirectory(PolyVoxCore)
 add_subdirectory(PolyVoxUtil)
-#add_subdirectory(bindings)
+add_subdirectory(bindings)
 
 #Set up install paths e.g. for PolyVoxConfig.cmake
 if(WIN32)
diff --git a/library/bindings/CMakeLists.txt b/library/bindings/CMakeLists.txt
index 598637fd..f69f6077 100644
--- a/library/bindings/CMakeLists.txt
+++ b/library/bindings/CMakeLists.txt
@@ -1,8 +1,8 @@
 find_package(SWIG)
-if(SWIG_FOUND)
+find_package(PythonLibs)
+if(SWIG_FOUND AND PYTHONLIBS_FOUND)
 	include(${SWIG_USE_FILE})
 	
-	find_package(PythonLibs)
 	include_directories(${PYTHON_INCLUDE_PATH})
 	include_directories(${PolyVoxCore_SOURCE_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include/PolyVoxCore)
 	link_directories(${PolyVoxCore_BINARY_DIR})
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index db4d46a2..b4270caf 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -17,18 +17,18 @@
 
 %include "stdint.i"
 %include "std_vector.i"
-%include "Material.i"
-%include "Density.i"
 %include "Vector.i"
-%include "Region.i"
-%include "SimpleVolume.i"
-%include "TypeDef.i"
+//%include "Material.i"
+//%include "Density.i"
+//%include "Region.i"
+//%include "SimpleVolume.i"
+//%include "TypeDef.i"
 //%include "SubArray.i"
 //%include "Array.i"
-%include "VertexTypes.i"
-%include "SurfaceMesh.i"
+//%include "VertexTypes.i"
+//%include "SurfaceMesh.i"
 //%include "SimpleVolumeSampler.i"
-%include "SurfaceExtractor.i"
+//%include "SurfaceExtractor.i"
 //%include "CubicSurfaceExtractor.i"
 //%include "CubicSurfaceExtractorWithNormals.i"
 //%include "MeshDecimator.i"
\ No newline at end of file
diff --git a/library/bindings/Vector.i b/library/bindings/Vector.i
index 297ffe8f..e8d808d6 100644
--- a/library/bindings/Vector.i
+++ b/library/bindings/Vector.i
@@ -1,7 +1,6 @@
 %module Vector
 %{
 #include "Vector.h"
-//#include "PolyVoxCore/include/PolyVoxCStdInt.h"
 %}
 
 %include "Vector.h"