diff -ur rcairo-1.10.0/ext/cairo/cairo.def rcairo-1.10.0-fixed/ext/cairo/cairo.def
--- rcairo-1.10.0/ext/cairo/cairo.def	2010-09-12 09:21:12.000000000 +0200
+++ rcairo-1.10.0-fixed/ext/cairo/cairo.def	2011-09-14 14:25:28.369000000 +0200
@@ -51,7 +51,6 @@
     rb_cCairo_GLDevice        DATA
     rb_cCairo_ScriptDevice    DATA
     rb_cCairo_XCBDevice       DATA
-    rb_cCairo_XlibtDevice     DATA
     rb_cCairo_XMLDevice       DATA
 
     rb_mCairo_Operator        DATA
diff -ur rcairo-1.10.0/ext/cairo/extconf.rb rcairo-1.10.0-fixed/ext/cairo/extconf.rb
--- rcairo-1.10.0/ext/cairo/extconf.rb	2010-09-12 09:21:12.000000000 +0200
+++ rcairo-1.10.0-fixed/ext/cairo/extconf.rb	2011-09-14 14:29:46.476000000 +0200
@@ -31,6 +31,7 @@
   case RUBY_PLATFORM
   when /cygwin|mingw|mswin32/
     $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+=begin
     import_library_name = "libruby-#{module_name}.a"
     $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
     $cleanfiles << import_library_name
@@ -39,6 +40,7 @@
     pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
     PKGConfig.add_path(pkg_config_dir.to_s)
     PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
+=end
     true
   else
     false
diff -ur rcairo-1.10.0/ext/cairo/rb_cairo_device.c rcairo-1.10.0-fixed/ext/cairo/rb_cairo_device.c
--- rcairo-1.10.0/ext/cairo/rb_cairo_device.c	2010-09-12 09:21:12.000000000 +0200
+++ rcairo-1.10.0-fixed/ext/cairo/rb_cairo_device.c	2011-09-14 14:29:10.762000000 +0200
@@ -97,6 +97,7 @@
   return device;
 }
 
+#  ifdef CAIRO_HAS_SCRIPT_SURFACE
 static rb_cairo__object_holder_t *
 cr_object_holder_new (VALUE object)
 {
@@ -108,6 +109,7 @@
 {
   rb_cairo__object_holder_free (rb_cCairo_Device, ptr);
 }
+#  endif
 
 static void
 cr_device_free (void *ptr)
@@ -227,6 +229,7 @@
                    Qnil);
 }
 
+#  ifdef CAIRO_HAS_SCRIPT_SURFACE
 static void
 yield_and_finish (VALUE self)
 {
@@ -238,6 +241,7 @@
   if (!cairo_device_get_user_data (device, &cr_finished_key))
     cr_device_finish (self);
 }
+#  endif
 
 #define DEFINE_OUTPUT_INITIALIZE(type)                                  \
 static VALUE                                                            \
diff -ur rcairo-1.10.0/ext/cairo/rb_cairo_font_face.c rcairo-1.10.0-fixed/ext/cairo/rb_cairo_font_face.c
--- rcairo-1.10.0/ext/cairo/rb_cairo_font_face.c	2010-09-12 09:21:12.000000000 +0200
+++ rcairo-1.10.0-fixed/ext/cairo/rb_cairo_font_face.c	2011-09-14 14:28:04.253000000 +0200
@@ -211,7 +211,7 @@
   data = (cr_user_font_face_invoke_data_t *)user_data;
   *(data->status) = rb_cairo__exception_to_status (exception);
 
-  if (*(data->status) == -1)
+  if (*(data->status) == (cairo_status_t)-1)
     rb_exc_raise (exception);
 
   return Qnil;