diff --git a/ChangeLog b/ChangeLog
index b5e05463a..91cfef6e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2005-06-25  Carl Worth  <cworth@cworth.org>
+
+	From:		J. Ali Harlow" <ali@avrc.city.ac.uk>
+	Reviewed by:	Vladimir Vukicevic <vladimirv@gmail.com>
+
+	* test/Makefile.am:
+	* src/cairo-win32-surface.c: (_cairo_win32_surface_create_for_dc),
+	(_cairo_win32_surface_create_similar),
+	(_cairo_win32_surface_create_dib),
+	(_cairo_win32_surface_composite), (categorize_solid_dest_operator),
+	(_cairo_win32_surface_set_clip_region): Update win32 backend to
+	match current API, so it actually builds once again.
+
+2005-06-25  Carl Worth  <cworth@cworth.org>
+
+	* src/cairo-win32-surface.c: (_cairo_win32_surface_create_for_dc),
+	(_cairo_win32_surface_create_similar),
+	(_cairo_win32_surface_create_dib),
+	(_cairo_win32_surface_composite), (categorize_solid_dest_operator),
+	(_cairo_win32_surface_set_clip_region):
+	* test/Makefile.am:
+
 2005-06-24  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo-ft-font.c: (_cairo_ft_unscaled_font_create_glyph):
diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index 8d63adbf3..f4d3062b6 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -240,7 +240,6 @@ _create_dc_and_bitmap (cairo_win32_surface_t *surface,
 static cairo_surface_t *
 _cairo_win32_surface_create_for_dc (HDC             original_dc,
 				    cairo_format_t  format,
-				    int	            drawable,
 				    int	            width,
 				    int	            height)
 {
@@ -297,8 +296,7 @@ _cairo_win32_surface_create_similar (void	    *abstract_src,
 {
     cairo_win32_surface_t *src = abstract_src;
 
-    return _cairo_win32_surface_create_for_dc (src->dc, format, drawable,
-					       width, height);
+    return _cairo_win32_surface_create_for_dc (src->dc, format, width, height);
 }
 
 /**
@@ -319,8 +317,7 @@ _cairo_win32_surface_create_dib (cairo_format_t format,
 				 int	        width,
 				 int	        height)
 {
-    return _cairo_win32_surface_create_for_dc (NULL, format, TRUE,
-					       width, height);
+    return _cairo_win32_surface_create_for_dc (NULL, format, width, height);
 }
 
 static cairo_status_t
@@ -577,7 +574,6 @@ _cairo_win32_surface_composite (cairo_operator_t	operator,
     } else if (integer_transform &&
 	       (src->format == CAIRO_FORMAT_RGB24 || src->format == CAIRO_FORMAT_ARGB32) &&
 	       dst->format == CAIRO_FORMAT_RGB24 &&
-	       !src->base.repeat &&
 	       operator == CAIRO_OPERATOR_OVER) {
 
 	BLENDFUNCTION blend_function;
@@ -675,6 +671,9 @@ categorize_solid_dest_operator (cairo_operator_t operator,
 	    return DO_UNSUPPORTED;
 	break;
     }	
+
+    ASSERT_NOT_REACHED;
+    return DO_UNSUPPORTED;
 }
 
 static cairo_int_status_t
@@ -751,8 +750,12 @@ _cairo_win32_surface_set_clip_region (void              *abstract_surface,
     /* If we are in-memory, then we set the clip on the image surface
      * as well as on the underlying GDI surface.
      */
-    if (surface->image)
-	_cairo_surface_set_clip_region (surface->image, region);
+    if (surface->image) {
+	unsigned int serial;
+
+	serial = _cairo_surface_allocate_clip_serial (surface->image);
+	_cairo_surface_set_clip_region (surface->image, region, serial);
+    }
 
     /* The semantics we want is that any clip set by cairo combines
      * is intersected with the clip on device context that the
diff --git a/test/Makefile.am b/test/Makefile.am
index 48204192d..17ac36a85 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -109,8 +109,8 @@ INCLUDES =					\
 	-D_GNU_SOURCE				\
 	$(CAIRO_CFLAGS)				\
 	-I$(srcdir)				\
-	-I$(top_srcdir)/src			\
-	-I$(top_builddir)/src
+	-I$(top_builddir)/src			\
+	-I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libcairotest.la