Index: obj_poly_draw_helper.c
===================================================================
--- obj_poly_draw_helper.c	(revision 30969)
+++ obj_poly_draw_helper.c	(revision 30970)
@@ -145,13 +145,13 @@
 	pcb_poly_contours_free(&local_pl);
 }
 
-static void fill_clipped_contour(pcb_hid_gc_t gc, pcb_pline_t * pl, const rnd_box_t * clip_box)
+static void fill_clipped_contour(pcb_hid_gc_t gc, pcb_pline_t * pl, const rnd_rnd_box_t * clip_box)
 {
 	pcb_pline_t *pl_copy;
-	pcb_polyarea_t *clip_poly;
-	pcb_polyarea_t *piece_poly;
-	pcb_polyarea_t *clipped_pieces;
-	pcb_polyarea_t *draw_piece;
+	rnd_polyarea_t *clip_poly;
+	rnd_polyarea_t *piece_poly;
+	rnd_polyarea_t *clipped_pieces;
+	rnd_polyarea_t *draw_piece;
 	int x;
 
 	/* Optimization: the polygon has no holes; if it is smaller the clip_box,
@@ -182,7 +182,7 @@
  * lets compute the complete no-holes polygon.
  */
 #define BOUNDS_INSIDE_CLIP_THRESHOLD 0.5
-static int should_compute_no_holes(pcb_poly_t * poly, const rnd_box_t * clip_box)
+static int should_compute_no_holes(pcb_poly_t * poly, const rnd_rnd_box_t * clip_box)
 {
 	rnd_coord_t x1, x2, y1, y2;
 	double poly_bounding_area;
@@ -214,7 +214,7 @@
 
 #undef BOUNDS_INSIDE_CLIP_THRESHOLD
 
-static void pcb_dhlp_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const rnd_box_t * clip_box)
+static void pcb_dhlp_fill_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const rnd_rnd_box_t * clip_box)
 {
 	if (!poly->NoHolesValid) {
 		/* If enough of the polygon is on-screen, compute the entire
@@ -254,7 +254,7 @@
 	return 0;
 }
 
-static void pcb_dhlp_thindraw_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const rnd_box_t * clip_box)
+static void pcb_dhlp_thindraw_pcb_polygon(pcb_hid_gc_t gc, pcb_poly_t * poly, const rnd_rnd_box_t * clip_box)
 {
 	thindraw_contour(gc, poly->Clipped->contours);
 	pcb_poly_holes(poly, clip_box, thindraw_hole_cb, gc);