--- a/src/uc2/libimg/_libimg.c	2013-02-25 11:20:00.000000000 +0100
+++ b/src/uc2/libimg/_libimg.c	2016-07-11 09:41:03.721305655 +0200
@@ -16,8 +16,8 @@
  *	along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <MagickWand/MagickWand.h>
 #include <Python.h>
-#include <wand/MagickWand.h>
 
 static PyObject *
 im_InitMagick(PyObject *self, PyObject *args) {
@@ -184,33 +184,18 @@
 	else if (img_type == GrayscaleType){
 		return Py_BuildValue("s", "GrayscaleType");
 	}
-	else if (img_type == GrayscaleMatteType){
-		return Py_BuildValue("s", "GrayscaleMatteType");
-	}
 	else if (img_type == PaletteType){
 		return Py_BuildValue("s", "PaletteType");
 	}
-	else if (img_type == PaletteMatteType){
-		return Py_BuildValue("s", "PaletteMatteType");
-	}
 	else if (img_type == TrueColorType){
 		return Py_BuildValue("s", "TrueColorType");
 	}
-	else if (img_type == TrueColorMatteType){
-		return Py_BuildValue("s", "TrueColorMatteType");
-	}
 	else if (img_type == ColorSeparationType){
 		return Py_BuildValue("s", "ColorSeparationType");
 	}
-	else if (img_type == ColorSeparationMatteType){
-		return Py_BuildValue("s", "ColorSeparationMatteType");
-	}
 	else if (img_type == OptimizeType){
 		return Py_BuildValue("s", "OptimizeType");
 	}
-	else if (img_type == PaletteBilevelMatteType){
-		return Py_BuildValue("s", "PaletteBilevelMatteType");
-	}
 	else {
 		return Py_BuildValue("s", "UndefinedType");
 	}
@@ -235,9 +220,7 @@
 //HSBColorspace,
 //HSLColorspace,
 //HWBColorspace,
-//Rec601LumaColorspace,
 //Rec601YCbCrColorspace,
-//Rec709LumaColorspace,
 //Rec709YCbCrColorspace,
 //LogColorspace,
 //CMYColorspace
@@ -305,15 +288,9 @@
 	else if (cs == HWBColorspace){
 		return Py_BuildValue("s", "HWBColorspace");
 	}
-	else if (cs == Rec601LumaColorspace){
-		return Py_BuildValue("s", "Rec601LumaColorspace");
-	}
 	else if (cs == Rec601YCbCrColorspace){
 		return Py_BuildValue("s", "Rec601YCbCrColorspace");
 	}
-	else if (cs == Rec709LumaColorspace){
-		return Py_BuildValue("s", "Rec709LumaColorspace");
-	}
 	else if (cs == Rec709YCbCrColorspace){
 		return Py_BuildValue("s", "Rec709YCbCrColorspace");
 	}