12 files changed, 120 insertions, 123 deletions

diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c
index eaa7947e..d7d950a7 100644
--- a/src/cairo-analysis-surface.c
+++ b/src/cairo-analysis-surface.c
@@ -215,7 +215,7 @@ _add_operation  (cairo_analysis_surface_t *surface,
      * region there is no benefit in emitting a native operation as
      * the fallback image will be painted on top.
      */
-    if (_cairo_region_contains_rectangle (surface->fallback_region, rect) == CAIRO_REGION_OVERLAP_IN)
+    if (cairo_region_contains_rectangle (surface->fallback_region, rect) == CAIRO_REGION_OVERLAP_IN)
 	return CAIRO_INT_STATUS_IMAGE_FALLBACK;
 
     if (backend_status == CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY) {
@@ -226,7 +226,7 @@ _add_operation  (cairo_analysis_surface_t *surface,
 	 * natively supported and the backend will blend the
 	 * transparency into the white background.
 	 */
-	if (_cairo_region_contains_rectangle (surface->supported_region, rect) == CAIRO_REGION_OVERLAP_OUT)
+	if (cairo_region_contains_rectangle (surface->supported_region, rect) == CAIRO_REGION_OVERLAP_OUT)
 	    backend_status = CAIRO_STATUS_SUCCESS;
     }
 
@@ -235,8 +235,7 @@ _add_operation  (cairo_analysis_surface_t *surface,
 	 * this region will be emitted as native operations.
 	 */
 	surface->has_supported = TRUE;
-	status = _cairo_region_union_rect (surface->supported_region,
-					   rect);
+	status = cairo_region_union_rect (surface->supported_region, rect);
 	return status;
     }
 
@@ -245,8 +244,7 @@ _add_operation  (cairo_analysis_surface_t *surface,
      * emitted.
      */
     surface->has_unsupported = TRUE;
-    status = _cairo_region_union_rect (surface->fallback_region,
-				       rect);
+    status = cairo_region_union_rect (surface->fallback_region, rect);
 
     /* The status CAIRO_INT_STATUS_IMAGE_FALLBACK is used to indicate
      * unsupported operations to the meta surface as using
@@ -265,8 +263,8 @@ _cairo_analysis_surface_finish (void *abstract_surface)
 {
     cairo_analysis_surface_t	*surface = (cairo_analysis_surface_t *) abstract_surface;
 
-    _cairo_region_destroy (surface->supported_region);
-    _cairo_region_destroy (surface->fallback_region);
+    cairo_region_destroy (surface->supported_region);
+    cairo_region_destroy (surface->fallback_region);
 
     cairo_surface_destroy (surface->target);
 
@@ -781,8 +779,8 @@ _cairo_analysis_surface_create (cairo_surface_t		*target,
     surface->page_bbox.p2.x = 0;
     surface->page_bbox.p2.y = 0;
 
-    surface->supported_region = _cairo_region_create ();
-    surface->fallback_region = _cairo_region_create ();
+    surface->supported_region = cairo_region_create ();
+    surface->fallback_region = cairo_region_create ();
 
     if (width == -1 && height == -1) {
 	surface->current_clip.x      = CAIRO_RECT_INT_MIN;
diff --git a/src/cairo-clip.c b/src/cairo-clip.c
index 4ca3e9aa..58b6335a 100644
--- a/src/cairo-clip.c
+++ b/src/cairo-clip.c
@@ -84,12 +84,12 @@ _cairo_clip_init_copy (cairo_clip_t *clip, cairo_clip_t *other)
     if (other->region) {
 	cairo_status_t status;
 	
-	clip->region = _cairo_region_copy (other->region);
+	clip->region = cairo_region_copy (other->region);
 
-	status = _cairo_region_status (clip->region);
+	status = cairo_region_status (clip->region);
 	if (unlikely (status)) {
 	    cairo_surface_destroy (clip->surface);
-	    _cairo_region_destroy (clip->region);
+	    cairo_region_destroy (clip->region);
 	    clip->region = NULL;
 	    
 	    return status;
@@ -115,7 +115,7 @@ _cairo_clip_reset (cairo_clip_t *clip)
     clip->serial = 0;
 
     if (clip->region) {
-	_cairo_region_destroy (clip->region);
+	cairo_region_destroy (clip->region);
 
 	clip->region = NULL;
     }
@@ -177,7 +177,7 @@ _cairo_clip_intersect_to_rectangle (cairo_clip_t            *clip,
     if (clip->region) {
 	cairo_rectangle_int_t extents;
 
-	_cairo_region_get_extents (clip->region, &extents);
+	cairo_region_get_extents (clip->region, &extents);
 	is_empty = _cairo_rectangle_intersect (rectangle, &extents);
 	if (is_empty)
 	    return CAIRO_STATUS_SUCCESS;
@@ -201,11 +201,11 @@ _cairo_clip_intersect_to_region (cairo_clip_t   *clip,
     if (clip->all_clipped) {
 	cairo_region_t *clip_rect;
 
-	clip_rect = _cairo_region_create_rect (&clip->surface_rect);
+	clip_rect = cairo_region_create_rect (&clip->surface_rect);
 
-	status = _cairo_region_intersect (region, clip_rect);
+	status = cairo_region_intersect (region, clip_rect);
 
-	_cairo_region_destroy (clip_rect);
+	cairo_region_destroy (clip_rect);
 
 	return status;
     }
@@ -215,7 +215,7 @@ _cairo_clip_intersect_to_region (cairo_clip_t   *clip,
     }
 
     if (clip->region) {
-	status = _cairo_region_intersect (region, clip->region);
+	status = cairo_region_intersect (region, clip->region);
 	if (unlikely (status))
 	    return status;
     }
@@ -223,11 +223,11 @@ _cairo_clip_intersect_to_region (cairo_clip_t   *clip,
     if (clip->surface) {
 	cairo_region_t *clip_rect;
 
-	clip_rect = _cairo_region_create_rect (&clip->surface_rect);
+	clip_rect = cairo_region_create_rect (&clip->surface_rect);
 
-	status = _cairo_region_intersect (region, clip_rect);
+	status = cairo_region_intersect (region, clip_rect);
 
-	_cairo_region_destroy (clip_rect);
+	cairo_region_destroy (clip_rect);
 
         if (unlikely (status))
             return status;
@@ -354,20 +354,20 @@ _cairo_clip_intersect_region (cairo_clip_t    *clip,
 	return status;
 
     if (clip->region) {
-	status = _cairo_region_intersect (clip->region, region);
+	status = cairo_region_intersect (clip->region, region);
     } else {
-	clip->region = _cairo_region_copy (region);
+	clip->region = cairo_region_copy (region);
 
 	assert (clip->region != NULL);
 	
-        if ((status = _cairo_region_status (clip->region)))
+        if ((status = cairo_region_status (clip->region)))
 	    clip->region = NULL;
     }
 
     clip->serial = _cairo_surface_allocate_clip_serial (target);
-    _cairo_region_destroy (region);
+    cairo_region_destroy (region);
 
-    if (!clip->region || _cairo_region_empty (clip->region))
+    if (!clip->region || cairo_region_empty (clip->region))
 	_cairo_clip_set_all_clipped (clip, target);
 
     return status;
@@ -725,9 +725,9 @@ _cairo_clip_translate (cairo_clip_t  *clip,
 	return;
 
     if (clip->region) {
-        _cairo_region_translate (clip->region,
-                                 _cairo_fixed_integer_part (tx),
-                                 _cairo_fixed_integer_part (ty));
+        cairo_region_translate (clip->region,
+				_cairo_fixed_integer_part (tx),
+				_cairo_fixed_integer_part (ty));
     }
 
     if (clip->surface) {
@@ -783,8 +783,8 @@ _cairo_clip_init_deep_copy (cairo_clip_t    *clip,
          * whatever the right handling is happen */
     } else {
         if (other->region) {
-	    clip->region = _cairo_region_copy (other->region);
-	    if (unlikely ((status = _cairo_region_status (clip->region))))
+	    clip->region = cairo_region_copy (other->region);
+	    if (unlikely ((status = cairo_region_status (clip->region))))
 		goto BAIL;
         }
 
@@ -818,7 +818,7 @@ _cairo_clip_init_deep_copy (cairo_clip_t    *clip,
 
 BAIL:
     if (clip->region)
-	_cairo_region_destroy (clip->region);
+	cairo_region_destroy (clip->region);
     if (clip->surface)
 	cairo_surface_destroy (clip->surface);
 
@@ -872,7 +872,7 @@ _cairo_clip_copy_rectangle_list (cairo_clip_t *clip, cairo_gstate_t *gstate)
     if (clip->region) {
         int i;
 
-	n_rects = _cairo_region_num_rectangles (clip->region);
+	n_rects = cairo_region_num_rectangles (clip->region);
 
 	if (n_rects) {
 	    rectangles = _cairo_malloc_ab (n_rects, sizeof (cairo_rectangle_t));
@@ -884,7 +884,7 @@ _cairo_clip_copy_rectangle_list (cairo_clip_t *clip, cairo_gstate_t *gstate)
 	    for (i = 0; i < n_rects; ++i) {
 		cairo_rectangle_int_t clip_rect;
 
-		_cairo_region_get_rectangle (clip->region, i, &clip_rect);
+		cairo_region_get_rectangle (clip->region, i, &clip_rect);
 		
 		if (!_cairo_clip_int_rect_to_user(gstate, &clip_rect, &rectangles[i])) {
 		    _cairo_error_throw (CAIRO_STATUS_CLIP_NOT_REPRESENTABLE);
diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index 3873f3e9..3eee33cc 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -1305,7 +1305,7 @@ _cairo_directfb_surface_set_clip_region (void           *abstract_surface,
 
 	surface->has_clip = TRUE;
 
-	n_rects = _cairo_region_num_rectangles (region);
+	n_rects = cairo_region_num_rectangles (region);
 
 	if (n_rects == 0)
 	    return CAIRO_STATUS_SUCCESS;
@@ -1326,7 +1326,7 @@ _cairo_directfb_surface_set_clip_region (void           *abstract_surface,
 	for (i = 0; i < n_rects; i++) {
 	    cairo_rectangle_int_t rect;
 
-	    _cairo_region_get_rectangle (region, i, &rect);
+	    cairo_region_get_rectangle (region, i, &rect);
 	    
 	    surface->clips[i].x1 = rect.x;
 	    surface->clips[i].y1 = rect.y;
diff --git a/src/cairo-paginated-surface.c b/src/cairo-paginated-surface.c
index cc09b59c..b84fbffe 100644
--- a/src/cairo-paginated-surface.c
+++ b/src/cairo-paginated-surface.c
@@ -397,11 +397,11 @@ _paint_page (cairo_paginated_surface_t *surface)
 
 	region = _cairo_analysis_surface_get_unsupported (analysis);
 
-	num_rects = _cairo_region_num_rectangles (region);
+	num_rects = cairo_region_num_rectangles (region);
 	for (i = 0; i < num_rects; i++) {
 	    cairo_rectangle_int_t rect;
 
-	    _cairo_region_get_rectangle (region, i, &rect);
+	    cairo_region_get_rectangle (region, i, &rect);
 	    
 	    status = _paint_fallback_image (surface, &rect);
 	    
diff --git a/src/cairo-region-private.h b/src/cairo-region-private.h
index 78ba5fc5..c9b2ae1c 100644
--- a/src/cairo-region-private.h
+++ b/src/cairo-region-private.h
@@ -59,68 +59,68 @@ typedef enum _cairo_region_overlap {
 } cairo_region_overlap_t;
 
 cairo_private cairo_region_t *
-_cairo_region_create (void);
+cairo_region_create (void);
 
 cairo_private cairo_region_t *
-_cairo_region_create_rect (cairo_rectangle_int_t *rect);
+cairo_region_create_rect (cairo_rectangle_int_t *rect);
 
 cairo_private cairo_status_t
-_cairo_region_status (cairo_region_t *region);
+cairo_region_status (cairo_region_t *region);
 
 cairo_private void
-_cairo_region_clear (cairo_region_t *region);
+cairo_region_clear (cairo_region_t *region);
 
 cairo_private cairo_region_t *
-_cairo_region_create_rectangles (cairo_rectangle_int_t *rects,
+cairo_region_create_rectangles (cairo_rectangle_int_t *rects,
 				 int count);
 
 cairo_private void
-_cairo_region_destroy (cairo_region_t *region);
+cairo_region_destroy (cairo_region_t *region);
 
 cairo_private cairo_region_t *
-_cairo_region_copy (cairo_region_t *original);
+cairo_region_copy (cairo_region_t *original);
 
 cairo_private int
-_cairo_region_num_rectangles (cairo_region_t *region);
+cairo_region_num_rectangles (cairo_region_t *region);
 
 cairo_private void
-_cairo_region_get_rectangle (cairo_region_t *region,
+cairo_region_get_rectangle (cairo_region_t *region,
 			     int nth_rectangle,
 			     cairo_rectangle_int_t *rectangle);
 
 cairo_private void
-_cairo_region_get_extents (cairo_region_t *region,
+cairo_region_get_extents (cairo_region_t *region,
 			   cairo_rectangle_int_t *extents);
 
 cairo_private cairo_status_t
-_cairo_region_subtract (cairo_region_t *dst,
+cairo_region_subtract (cairo_region_t *dst,
 			cairo_region_t *other);
 
 cairo_private cairo_status_t
-_cairo_region_intersect (cairo_region_t *dst,
+cairo_region_intersect (cairo_region_t *dst,
 			 cairo_region_t *other);
 
 cairo_private cairo_status_t
-_cairo_region_union (cairo_region_t *dst,
+cairo_region_union (cairo_region_t *dst,
 		     cairo_region_t *other);
 
 cairo_private cairo_status_t
-_cairo_region_union_rect (cairo_region_t *dst,
+cairo_region_union_rect (cairo_region_t *dst,
 			  cairo_rectangle_int_t *rect);
 
 cairo_private cairo_bool_t
-_cairo_region_empty (cairo_region_t *region);
+cairo_region_empty (cairo_region_t *region);
 
 cairo_private void
-_cairo_region_translate (cairo_region_t *region,
+cairo_region_translate (cairo_region_t *region,
 			 int dx, int dy);
 
 cairo_private cairo_region_overlap_t
-_cairo_region_contains_rectangle (cairo_region_t *region,
+cairo_region_contains_rectangle (cairo_region_t *region,
 				  const cairo_rectangle_int_t *rect);
 
 cairo_private cairo_bool_t
-_cairo_region_contains_point (cairo_region_t *region,
+cairo_region_contains_point (cairo_region_t *region,
 			      int x, int y);
 
 CAIRO_END_DECLS
diff --git a/src/cairo-region.c b/src/cairo-region.c
index 04bfbd97..59ce0bf8 100644
--- a/src/cairo-region.c
+++ b/src/cairo-region.c
@@ -43,7 +43,7 @@ const cairo_region_t _cairo_region_nil = {
 };
 
 cairo_region_t *
-_cairo_region_create (void)
+cairo_region_create (void)
 {
     cairo_region_t *region = _cairo_malloc (sizeof (cairo_region_t));
 
@@ -58,7 +58,7 @@ _cairo_region_create (void)
 }
 
 cairo_region_t *
-_cairo_region_create_rect (cairo_rectangle_int_t *rect)
+cairo_region_create_rect (cairo_rectangle_int_t *rect)
 {
     cairo_region_t *region = _cairo_malloc (sizeof (cairo_region_t));
 
@@ -75,8 +75,8 @@ _cairo_region_create_rect (cairo_rectangle_int_t *rect)
 }
 
 cairo_region_t *
-_cairo_region_create_rectangles (cairo_rectangle_int_t *rects,
-				 int count)
+cairo_region_create_rectangles (cairo_rectangle_int_t *rects,
+				int count)
 {
     pixman_box32_t stack_pboxes[CAIRO_STACK_ARRAY_LENGTH (pixman_box32_t)];
     pixman_box32_t *pboxes = stack_pboxes;
@@ -119,7 +119,7 @@ _cairo_region_create_rectangles (cairo_rectangle_int_t *rects,
 }
 
 void
-_cairo_region_destroy (cairo_region_t *region)
+cairo_region_destroy (cairo_region_t *region)
 {
     if (region->status)
 	return;
@@ -129,19 +129,19 @@ _cairo_region_destroy (cairo_region_t *region)
 }
 
 cairo_region_t *
-_cairo_region_copy (cairo_region_t *original)
+cairo_region_copy (cairo_region_t *original)
 {
     cairo_region_t *copy;
     
     if (original->status)
 	return (cairo_region_t *)&_cairo_region_nil;
 
-    copy = _cairo_region_create ();
+    copy = cairo_region_create ();
     if (!copy)
 	return (cairo_region_t *)&_cairo_region_nil;
 
     if (!pixman_region32_copy (&copy->rgn, &original->rgn)) {
-	_cairo_region_destroy (copy);
+	cairo_region_destroy (copy);
 
 	return (cairo_region_t *)&_cairo_region_nil;
     }
@@ -150,7 +150,7 @@ _cairo_region_copy (cairo_region_t *original)
 }
 
 int
-_cairo_region_num_rectangles (cairo_region_t *region)
+cairo_region_num_rectangles (cairo_region_t *region)
 {
     if (region->status)
 	return 0;
@@ -159,9 +159,9 @@ _cairo_region_num_rectangles (cairo_region_t *region)
 }
 
 cairo_private void
-_cairo_region_get_rectangle (cairo_region_t *region,
-			     int nth_box,
-			     cairo_rectangle_int_t *rect)
+cairo_region_get_rectangle (cairo_region_t *region,
+			    int nth_box,
+			    cairo_rectangle_int_t *rect)
 {
     pixman_box32_t *pbox;
 
@@ -177,15 +177,15 @@ _cairo_region_get_rectangle (cairo_region_t *region,
 }
 
 /**
- * _cairo_region_get_extents:
+ * cairo_region_get_extents:
  * @region: a #cairo_region_t
  * @rect: rectangle into which to store the extents
  *
  * Gets the bounding box of a region as a #cairo_rectangle_int_t
  **/
 void
-_cairo_region_get_extents (cairo_region_t *region,
-			   cairo_rectangle_int_t *extents)
+cairo_region_get_extents (cairo_region_t *region,
+			  cairo_rectangle_int_t *extents)
 {
     pixman_box32_t *pextents;
 
@@ -201,13 +201,13 @@ _cairo_region_get_extents (cairo_region_t *region,
 }
 
 cairo_status_t
-_cairo_region_status (cairo_region_t *region)
+cairo_region_status (cairo_region_t *region)
 {
     return region->status;
 }
 
 void
-_cairo_region_clear (cairo_region_t *region)
+cairo_region_clear (cairo_region_t *region)
 {
     if (region->status)
 	return;
@@ -217,7 +217,7 @@ _cairo_region_clear (cairo_region_t *region)
 }
 
 cairo_status_t
-_cairo_region_subtract (cairo_region_t *dst, cairo_region_t *other)
+cairo_region_subtract (cairo_region_t *dst, cairo_region_t *other)
 {
     if (dst->status)
 	return dst->status;
@@ -232,7 +232,7 @@ _cairo_region_subtract (cairo_region_t *dst, cairo_region_t *other)
 }
 
 cairo_status_t
-_cairo_region_intersect (cairo_region_t *dst, cairo_region_t *other)
+cairo_region_intersect (cairo_region_t *dst, cairo_region_t *other)
 {
     if (dst->status)
 	return dst->status;
@@ -247,8 +247,8 @@ _cairo_region_intersect (cairo_region_t *dst, cairo_region_t *other)
 }
 
 cairo_private cairo_status_t
-_cairo_region_union (cairo_region_t *dst,
-		     cairo_region_t *other)
+cairo_region_union (cairo_region_t *dst,
+		    cairo_region_t *other)
 {
     if (dst->status)
 	return dst->status;
@@ -263,8 +263,8 @@ _cairo_region_union (cairo_region_t *dst,
 }
 
 cairo_status_t
-_cairo_region_union_rect (cairo_region_t *dst,
-			  cairo_rectangle_int_t *rect)
+cairo_region_union_rect (cairo_region_t *dst,
+			 cairo_rectangle_int_t *rect)
 {
     if (!pixman_region32_union_rect (&dst->rgn, &dst->rgn,
 				     rect->x, rect->y,
@@ -277,7 +277,7 @@ _cairo_region_union_rect (cairo_region_t *dst,
 }
 
 cairo_bool_t
-_cairo_region_empty (cairo_region_t *region)
+cairo_region_empty (cairo_region_t *region)
 {
     if (region->status)
 	return TRUE;
@@ -286,8 +286,8 @@ _cairo_region_empty (cairo_region_t *region)
 }
 
 void
-_cairo_region_translate (cairo_region_t *region,
-			 int dx, int dy)
+cairo_region_translate (cairo_region_t *region,
+			int dx, int dy)
 {
     if (region->status)
 	return;
@@ -296,8 +296,8 @@ _cairo_region_translate (cairo_region_t *region,
 }
 
 cairo_region_overlap_t
-_cairo_region_contains_rectangle (cairo_region_t *region,
-				  const cairo_rectangle_int_t *rect)
+cairo_region_contains_rectangle (cairo_region_t *region,
+				 const cairo_rectangle_int_t *rect)
 {
     pixman_box32_t pbox;
     pixman_region_overlap_t poverlap;
@@ -328,9 +328,8 @@ _cairo_region_contains_rectangle (cairo_region_t *region,
 }
 
 cairo_private cairo_bool_t
-_cairo_region_contains_point (cairo_region_t *region,
-			      int x,
-			      int y)
+cairo_region_contains_point (cairo_region_t *region,
+			     int x, int y)
 {
     if (region->status)
 	return FALSE;
diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c
index 876268f5..42d86e73 100644
--- a/src/cairo-surface-fallback.c
+++ b/src/cairo-surface-fallback.c
@@ -417,7 +417,7 @@ _composite_trap_region (cairo_clip_t            *clip,
     cairo_status_t status;
     cairo_solid_pattern_t solid_pattern;
     cairo_surface_pattern_t mask;
-    int num_rects = _cairo_region_num_rectangles (trap_region);
+    int num_rects = cairo_region_num_rectangles (trap_region);
     unsigned int clip_serial;
     cairo_surface_t *clip_surface = clip ? clip->surface : NULL;
 
@@ -544,7 +544,7 @@ _clip_and_composite_trapezoids (const cairo_pattern_t *src,
             if (unlikely (status))
                 goto out;
 
-            _cairo_region_get_extents (trap_region, &trap_extents);
+            cairo_region_get_extents (trap_region, &trap_extents);
         } else {
             cairo_box_t trap_box;
             _cairo_traps_extents (traps, &trap_box);
@@ -567,9 +567,9 @@ _clip_and_composite_trapezoids (const cairo_pattern_t *src,
              * _cairo_surface_fill_rectangles() or to drawing with a
              * clip region, then we have an additional region to clear.
              */
-            clear_region = _cairo_region_create_rect (&extents);
+            clear_region = cairo_region_create_rect (&extents);
 
-	    status = _cairo_region_status (clear_region);
+	    status = cairo_region_status (clear_region);
 	    if (unlikely (status))
 		goto out;
 
@@ -577,14 +577,14 @@ _clip_and_composite_trapezoids (const cairo_pattern_t *src,
             if (unlikely (status))
                 goto out;
 
-            _cairo_region_get_extents (clear_region, &extents);
+            cairo_region_get_extents (clear_region, &extents);
 
-            status = _cairo_region_subtract (clear_region, trap_region);
+            status = cairo_region_subtract (clear_region, trap_region);
             if (unlikely (status))
                 goto out;
 
-            if (_cairo_region_empty (clear_region)) {
-                _cairo_region_destroy (clear_region);
+            if (cairo_region_empty (clear_region)) {
+                cairo_region_destroy (clear_region);
 		clear_region = NULL;
             }
         } else {
@@ -659,9 +659,9 @@ _clip_and_composite_trapezoids (const cairo_pattern_t *src,
 
 out:
     if (trap_region)
-        _cairo_region_destroy (trap_region);
+        cairo_region_destroy (trap_region);
     if (clear_region)
-        _cairo_region_destroy (clear_region);
+        cairo_region_destroy (clear_region);
 
     return status;
 }
diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index 42fc6da8..e0931221 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -1587,7 +1587,7 @@ _cairo_surface_fill_region (cairo_surface_t	   *surface,
 
     assert (! surface->is_snapshot);
 
-    num_rects = _cairo_region_num_rectangles (region);
+    num_rects = cairo_region_num_rectangles (region);
     if (num_rects == 0)
 	return CAIRO_STATUS_SUCCESS;
 
@@ -1601,7 +1601,7 @@ _cairo_surface_fill_region (cairo_surface_t	   *surface,
     }
 
     for (i = 0; i < num_rects; i++)
-	_cairo_region_get_rectangle (region, i, &rects[i]);
+	cairo_region_get_rectangle (region, i, &rects[i]);
 
     status =  _cairo_surface_fill_rectangles (surface, op,
 					      color, rects, num_rects);
@@ -2692,7 +2692,7 @@ _cairo_surface_composite_fixup_unbounded_internal (cairo_surface_t         *dst,
     dst_rectangle.width = width;
     dst_rectangle.height = height;
 
-    clear_region = _cairo_region_create_rect (&dst_rectangle);
+    clear_region = cairo_region_create_rect (&dst_rectangle);
 
     drawn_rectangle = dst_rectangle;
 
@@ -2708,10 +2708,10 @@ _cairo_surface_composite_fixup_unbounded_internal (cairo_surface_t         *dst,
 
     /* Now compute the area that is in dst_rectangle but not in drawn_rectangle
      */
-    drawn_region = _cairo_region_create_rect (&drawn_rectangle);
+    drawn_region = cairo_region_create_rect (&drawn_rectangle);
     has_drawn_region = TRUE;
 
-    status = _cairo_region_subtract (clear_region, drawn_region);
+    status = cairo_region_subtract (clear_region, drawn_region);
     if (unlikely (status))
         goto CLEANUP_REGIONS;
 
@@ -2722,8 +2722,8 @@ _cairo_surface_composite_fixup_unbounded_internal (cairo_surface_t         *dst,
 
   CLEANUP_REGIONS:
     if (drawn_region)
-        _cairo_region_destroy (drawn_region);
-    _cairo_region_destroy (clear_region);
+        cairo_region_destroy (drawn_region);
+    cairo_region_destroy (clear_region);
 
     return _cairo_surface_set_error (dst, status);
 }
diff --git a/src/cairo-traps.c b/src/cairo-traps.c
index 96db4ba1..73bb124e 100644
--- a/src/cairo-traps.c
+++ b/src/cairo-traps.c
@@ -600,7 +600,7 @@ _cairo_traps_extents (const cairo_traps_t *traps,
  * Determines if a set of trapezoids are exactly representable as a
  * cairo region.  If so, the passed-in region is initialized to
  * the area representing the given traps.  It should be finalized
- * with _cairo_region_fini().  If not, %CAIRO_INT_STATUS_UNSUPPORTED
+ * with cairo_region_fini().  If not, %CAIRO_INT_STATUS_UNSUPPORTED
  * is returned.
  *
  * Return value: %CAIRO_STATUS_SUCCESS, %CAIRO_INT_STATUS_UNSUPPORTED
@@ -616,7 +616,7 @@ _cairo_traps_extract_region (const cairo_traps_t  *traps,
     cairo_int_status_t status;
 
     if (traps->num_traps == 0) {
-	*region = _cairo_region_create ();
+	*region = cairo_region_create ();
 	return CAIRO_STATUS_SUCCESS;
     }
 
@@ -662,15 +662,15 @@ _cairo_traps_extract_region (const cairo_traps_t  *traps,
 	rect_count++;
     }
 
-    *region = _cairo_region_create_rectangles (rects, rect_count);
-    status = _cairo_region_status (*region);
+    *region = cairo_region_create_rectangles (rects, rect_count);
+    status = cairo_region_status (*region);
     
     if (rects != stack_rects)
 	free (rects);
 
     if (unlikely (status))
     {
-	_cairo_region_destroy (*region);
+	cairo_region_destroy (*region);
 	*region = NULL;
     }
 
diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index f182642f..649a96b5 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -1471,11 +1471,11 @@ _cairo_win32_surface_set_clip_region (void           *abstract_surface,
 
 	/* Create a GDI region for the cairo region */
 
-	_cairo_region_get_extents (region, &extents);
-	num_rects = _cairo_region_num_rectangles (region);
+	cairo_region_get_extents (region, &extents);
+	num_rects = cairo_region_num_rectangles (region);
 
 	if (num_rects == 1)
-	    _cairo_region_get_rectangle (region, 0, &rect0);
+	    cairo_region_get_rectangle (region, 0, &rect0);
 	    
 	if (num_rects == 1 &&
 	    rect0.x == 0 &&
@@ -1517,7 +1517,7 @@ _cairo_win32_surface_set_clip_region (void           *abstract_surface,
 	    for (i = 0; i < num_rects; i++) {
 		cairo_rectangle_int_t rect;
 
-	        _cairo_region_get_rectangle (region, i, &rect);
+	        cairo_region_get_rectangle (region, i, &rect);
 		
 		rects[i].left = rect.x;
 		rects[i].top = rect.y;
diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index ab589e1d..8d0090b0 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -1559,7 +1559,7 @@ _cairo_xcb_surface_set_clip_region (void           *abstract_surface,
 	xcb_rectangle_t *rects = NULL;
 	int n_rects, i;
 
-	n_rects = _cairo_region_num_rectangles (region);
+	n_rects = cairo_region_num_rectangles (region);
 
 	if (n_rects > 0) {
 	    rects = _cairo_malloc_ab (n_rects, sizeof(xcb_rectangle_t));
@@ -1572,7 +1572,7 @@ _cairo_xcb_surface_set_clip_region (void           *abstract_surface,
 	for (i = 0; i < n_rects; i++) {
 	    cairo_rectangle_int_t rect;
 
-	    _cairo_region_get_rectangle (region, i, &rect);
+	    cairo_region_get_rectangle (region, i, &rect);
 	    
 	    rects[i].x = rect.x;
 	    rects[i].y = rect.y;
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index e411977b..f547f5fa 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -2302,19 +2302,19 @@ _cairo_xlib_surface_set_clip_region (void           *abstract_surface,
 	 * is necessary so we don't wrap around when we convert cairo's
 	 * 32 bit region into 16 bit rectangles.
 	 */
-	bounded = _cairo_region_create_rect (&rect);
-	status = _cairo_region_intersect (bounded, region);
+	bounded = cairo_region_create_rect (&rect);
+	status = cairo_region_intersect (bounded, region);
 	if (unlikely (status)) {
-	    _cairo_region_destroy (bounded);
+	    cairo_region_destroy (bounded);
 	    return status;
 	}
 
-	n_rects = _cairo_region_num_rectangles (bounded);
+	n_rects = cairo_region_num_rectangles (bounded);
 
 	if (n_rects > ARRAY_LENGTH (surface->embedded_clip_rects)) {
 	    rects = _cairo_malloc_ab (n_rects, sizeof (XRectangle));
 	    if (unlikely (rects == NULL)) {
-		_cairo_region_destroy (bounded);
+		cairo_region_destroy (bounded);
 		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	    }
 	} else {
@@ -2324,7 +2324,7 @@ _cairo_xlib_surface_set_clip_region (void           *abstract_surface,
 	for (i = 0; i < n_rects; i++) {
 	    cairo_rectangle_int_t rect;
 	    
-	    _cairo_region_get_rectangle (bounded, i, &rect);
+	    cairo_region_get_rectangle (bounded, i, &rect);
 
 	    rects[i].x = rect.x;
 	    rects[i].y = rect.y;
@@ -2332,7 +2332,7 @@ _cairo_xlib_surface_set_clip_region (void           *abstract_surface,
 	    rects[i].height = rect.height;
 	}
 	
-	_cairo_region_destroy (bounded);
+	cairo_region_destroy (bounded);
 
 	surface->have_clip_rects = TRUE;
 	surface->clip_rects = rects;