Index: obj_poly_draw_helper.c
===================================================================
--- obj_poly_draw_helper.c	(revision 31036)
+++ obj_poly_draw_helper.c	(revision 31037)
@@ -69,10 +69,10 @@
 	}
 
 
-static void fill_contour(rnd_hid_gc_t gc, pcb_pline_t * pl)
+static void fill_contour(rnd_hid_gc_t gc, rnd_pline_t * pl)
 {
 	size_t n, i = 0;
-	pcb_vnode_t *v;
+	rnd_vnode_t *v;
 	int first = 1;
 
 	n = pl->Count;
@@ -108,9 +108,9 @@
 }
 
 
-static void thindraw_contour(rnd_hid_gc_t gc, pcb_pline_t * pl)
+static void thindraw_contour(rnd_hid_gc_t gc, rnd_pline_t * pl)
 {
-	pcb_vnode_t *v;
+	rnd_vnode_t *v;
 
 
 	rnd_hid_set_line_width(gc, 0);
@@ -136,18 +136,18 @@
 	vert_opt_end();
 }
 
-static void fill_contour_cb(pcb_pline_t * pl, void *user_data)
+static void fill_contour_cb(rnd_pline_t * pl, void *user_data)
 {
 	rnd_hid_gc_t gc = (rnd_hid_gc_t) user_data;
-	pcb_pline_t *local_pl = pl;
+	rnd_pline_t *local_pl = pl;
 
 	fill_contour(gc, pl);
-	pcb_poly_contours_free(&local_pl);
+	rnd_poly_contours_free(&local_pl);
 }
 
-static void fill_clipped_contour(rnd_hid_gc_t gc, pcb_pline_t * pl, const rnd_rnd_box_t * clip_box)
+static void fill_clipped_contour(rnd_hid_gc_t gc, rnd_pline_t * pl, const rnd_rnd_box_t * clip_box)
 {
-	pcb_pline_t *pl_copy;
+	rnd_pline_t *pl_copy;
 	rnd_polyarea_t *clip_poly;
 	rnd_polyarea_t *piece_poly;
 	rnd_polyarea_t *clipped_pieces;
@@ -162,11 +162,11 @@
 	}
 
 	clip_poly = pcb_poly_from_rect(clip_box->X1, clip_box->X2, clip_box->Y1, clip_box->Y2);
-	pcb_poly_contour_copy(&pl_copy, pl);
-	piece_poly = pcb_polyarea_create();
-	pcb_polyarea_contour_include(piece_poly, pl_copy);
-	x = pcb_polyarea_boolean_free(piece_poly, clip_poly, &clipped_pieces, PCB_PBO_ISECT);
-	if (x != pcb_err_ok || clipped_pieces == NULL)
+	rnd_poly_contour_copy(&pl_copy, pl);
+	piece_poly = rnd_polyarea_create();
+	rnd_polyarea_contour_include(piece_poly, pl_copy);
+	x = rnd_polyarea_boolean_free(piece_poly, clip_poly, &clipped_pieces, RND_PBO_ISECT);
+	if (x != rnd_err_ok || clipped_pieces == NULL)
 		return;
 
 	draw_piece = clipped_pieces;
@@ -175,7 +175,7 @@
 		fill_contour(gc, draw_piece->contours);
 	}
 	while ((draw_piece = draw_piece->f) != clipped_pieces);
-	pcb_polyarea_free(&clipped_pieces);
+	rnd_polyarea_free(&clipped_pieces);
 }
 
 /* If at least 50% of the bounding box of the polygon is on the screen,
@@ -227,7 +227,7 @@
 			pcb_poly_no_holes_dicer(poly, clip_box, fill_contour_cb, gc);
 	}
 	if (poly->NoHolesValid && poly->NoHoles) {
-		pcb_pline_t *pl;
+		rnd_pline_t *pl;
 
 		for (pl = poly->NoHoles; pl != NULL; pl = pl->next) {
 			if (clip_box == NULL)
@@ -247,7 +247,7 @@
 	}
 }
 
-static int thindraw_hole_cb(pcb_pline_t * pl, void *user_data)
+static int thindraw_hole_cb(rnd_pline_t * pl, void *user_data)
 {
 	rnd_hid_gc_t gc = (rnd_hid_gc_t) user_data;
 	thindraw_contour(gc, pl);