diff -u Cairo-1.090.orig/CairoFont.xs Cairo-1.090/CairoFont.xs
--- Cairo-1.090.orig/CairoFont.xs	2011-11-27 17:56:45.000000000 +1000
+++ Cairo-1.090/CairoFont.xs	2012-02-24 13:26:47.000000000 +1000
@@ -28,8 +28,12 @@
 
 	    /* These aren't wrapped yet: */
 	    case CAIRO_FONT_TYPE_WIN32:
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
 	    case CAIRO_FONT_TYPE_QUARTZ:
+#endif
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 8, 0)
 	    case CAIRO_FONT_TYPE_USER:
+#endif
 		package = "Cairo::FontFace";
 		break;
 
diff -u Cairo-1.090.orig/CairoSurface.xs Cairo-1.090/CairoSurface.xs
--- Cairo-1.090.orig/CairoSurface.xs	2011-11-27 17:56:45.000000000 +1000
+++ Cairo-1.090/CairoSurface.xs	2012-02-24 13:27:57.000000000 +1000
@@ -98,9 +98,13 @@
 	    case CAIRO_SURFACE_TYPE_WIN32:
 	    case CAIRO_SURFACE_TYPE_BEOS:
 	    case CAIRO_SURFACE_TYPE_DIRECTFB:
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 4, 0)
 	    case CAIRO_SURFACE_TYPE_OS2:
+#endif
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
 	    case CAIRO_SURFACE_TYPE_WIN32_PRINTING:
 	    case CAIRO_SURFACE_TYPE_QUARTZ_IMAGE:
+#endif
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
 	    case CAIRO_SURFACE_TYPE_SCRIPT:
 	    case CAIRO_SURFACE_TYPE_QT:
diff -u Cairo-1.090.orig/Makefile.PL Cairo-1.090/Makefile.PL
--- Cairo-1.090.orig/Makefile.PL	2012-01-20 16:47:14.000000000 +1000
+++ Cairo-1.090/Makefile.PL	2012-02-24 13:34:12.000000000 +1000
@@ -321,9 +321,6 @@
 		CAIRO_SURFACE_TYPE_BEOS
 		CAIRO_SURFACE_TYPE_DIRECTFB
 		CAIRO_SURFACE_TYPE_SVG
-		CAIRO_SURFACE_TYPE_OS2
-		CAIRO_SURFACE_TYPE_WIN32_PRINTING
-		CAIRO_SURFACE_TYPE_QUARTZ_IMAGE
 	/];
 
 	$enums{cairo_svg_version_t} = [qw/
@@ -354,6 +351,7 @@
 	add_new_enum_values(
 		cairo_status_t => [qw/CAIRO_STATUS_INVALID_INDEX
 		                      CAIRO_STATUS_CLIP_NOT_REPRESENTABLE/],
+		cairo_surface_type_t => [qw/CAIRO_SURFACE_TYPE_OS2/],
 	);
 
 	push @exports, qw/newSVCairoRectangle
@@ -365,6 +363,8 @@
 		cairo_font_type_t => [qw/CAIRO_FONT_TYPE_QUARTZ/],
 		cairo_status_t => [qw/CAIRO_STATUS_TEMP_FILE_ERROR
 				      CAIRO_STATUS_INVALID_STRIDE/],
+		cairo_surface_type_t => [qw/CAIRO_SURFACE_TYPE_WIN32_PRINTING
+		                            CAIRO_SURFACE_TYPE_QUARTZ_IMAGE/],
 
 	);
 
Common subdirectories: Cairo-1.090.orig/examples and Cairo-1.090/examples
Common subdirectories: Cairo-1.090.orig/inc and Cairo-1.090/inc
Common subdirectories: Cairo-1.090.orig/lib and Cairo-1.090/lib
Common subdirectories: Cairo-1.090.orig/t and Cairo-1.090/t