Index: polyhelp.c
===================================================================
--- polyhelp.c	(revision 30969)
+++ polyhelp.c	(revision 30970)
@@ -128,7 +128,7 @@
 {
 	rnd_cardinal_t res = 0;
 	pcb_poly_it_t it;
-	pcb_polyarea_t *pa;
+	rnd_polyarea_t *pa;
 
 
 	for(pa = pcb_poly_island_first(src, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
@@ -148,7 +148,7 @@
 static void add_track_seg(pcb_cpoly_edgetree_t *dst, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2)
 {
 	pcb_cpoly_edge_t *e = &dst->edges[dst->used++];
-	rnd_box_t *b = &e->bbox;
+	rnd_rnd_box_t *b = &e->bbox;
 
 	if (x1 <= x2) {
 		b->X1 = x1;
@@ -173,7 +173,7 @@
 	e->y2 = y2;
 
 	rnd_box_bump_box(&dst->bbox, b);
-	pcb_r_insert_entry(dst->edge_tree, (rnd_box_t *)e);
+	pcb_r_insert_entry(dst->edge_tree, (rnd_rnd_box_t *)e);
 }
 
 static void add_track(pcb_cpoly_edgetree_t *dst, pcb_pline_t *track)
@@ -200,7 +200,7 @@
 pcb_cpoly_edgetree_t *pcb_cpoly_edgetree_create(const pcb_poly_t *src, rnd_coord_t offs)
 {
 	pcb_poly_it_t it;
-	pcb_polyarea_t *pa;
+	rnd_polyarea_t *pa;
 	pcb_cpoly_edgetree_t *res;
 	rnd_cardinal_t alloced = pcb_cpoly_num_corners(src) * sizeof(pcb_cpoly_edge_t);
 
@@ -244,7 +244,7 @@
 	rnd_coord_t coord[1];
 } intersect_t;
 
-static pcb_r_dir_t pcb_cploy_hatch_edge_hor(const rnd_box_t *region, void *cl)
+static pcb_r_dir_t pcb_cploy_hatch_edge_hor(const rnd_rnd_box_t *region, void *cl)
 {
 	intersect_t *is = (intersect_t *)cl;
 	pcb_cpoly_edge_t *e = (pcb_cpoly_edge_t *)region;
@@ -263,7 +263,7 @@
 	return PCB_R_DIR_FOUND_CONTINUE;
 }
 
-static pcb_r_dir_t pcb_cploy_hatch_edge_ver(const rnd_box_t *region, void *cl)
+static pcb_r_dir_t pcb_cploy_hatch_edge_ver(const rnd_rnd_box_t *region, void *cl)
 {
 	intersect_t *is = (intersect_t *)cl;
 	pcb_cpoly_edge_t *e = (pcb_cpoly_edge_t *)region;
@@ -294,7 +294,7 @@
 void pcb_cpoly_hatch(const pcb_poly_t *src, pcb_cpoly_hatchdir_t dir, rnd_coord_t offs, rnd_coord_t period, void *ctx, void (*cb)(void *ctx, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2))
 {
 	pcb_cpoly_edgetree_t *etr;
-	rnd_box_t scan;
+	rnd_rnd_box_t scan;
 	int n;
 	intersect_t *is;
 
@@ -483,7 +483,7 @@
 			continue;
 		if (want_contour) {
 			pcb_poly_it_t it;
-			pcb_polyarea_t *pa;
+			rnd_polyarea_t *pa;
 			for(pa = pcb_poly_island_first(polygon, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
 				pcb_pline_t *pl = pcb_poly_contour(&it);
 				if (pl != NULL) { /* we have a contour */
Index: polyhelp.h
===================================================================
--- polyhelp.h	(revision 30969)
+++ polyhelp.h	(revision 30970)
@@ -44,13 +44,13 @@
 /*** Generate an rtree of all edges if a polygon */
 
 typedef struct {
-	rnd_box_t bbox;
+	rnd_rnd_box_t bbox;
 	rnd_coord_t x1, y1, x2, y2;
 } pcb_cpoly_edge_t;
 
 typedef struct {
-	pcb_rtree_t *edge_tree;
-	rnd_box_t bbox;
+	rnd_rtree_t *edge_tree;
+	rnd_rnd_box_t bbox;
 	rnd_cardinal_t used, alloced;
 	pcb_cpoly_edge_t edges[1];
 } pcb_cpoly_edgetree_t;
Index: topoly.c
===================================================================
--- topoly.c	(revision 30969)
+++ topoly.c	(revision 30970)
@@ -58,7 +58,7 @@
 	pcb_dynf_t mark;
 } next_conn_t;
 
-static pcb_r_dir_t next_conn_found_arc(const rnd_box_t *box, void *cl)
+static pcb_r_dir_t next_conn_found_arc(const rnd_rnd_box_t *box, void *cl)
 {
 	rnd_coord_t ex, ey;
 	next_conn_t *ctx = cl;
@@ -82,7 +82,7 @@
 	return PCB_R_DIR_NOT_FOUND;
 }
 
-static pcb_r_dir_t next_conn_found_line(const rnd_box_t *box, void *cl)
+static pcb_r_dir_t next_conn_found_line(const rnd_rnd_box_t *box, void *cl)
 {
 	next_conn_t *ctx = cl;
 	pcb_any_obj_t *obj = (pcb_any_obj_t *)box;
@@ -139,7 +139,7 @@
 	ctx.mark = df;
 
 	for(n = 0; n < 2; n++) {
-		rnd_box_t region;
+		rnd_rnd_box_t region;
 		int len;
 
 		region.X1 = cx[n]-1;