Index: polyhelp.c
===================================================================
--- polyhelp.c	(revision 31039)
+++ polyhelp.c	(revision 31040)
@@ -173,7 +173,7 @@
 	e->y2 = y2;
 
 	rnd_box_bump_box(&dst->bbox, b);
-	pcb_r_insert_entry(dst->edge_tree, (rnd_rnd_box_t *)e);
+	rnd_r_insert_entry(dst->edge_tree, (rnd_rnd_box_t *)e);
 }
 
 static void add_track(pcb_cpoly_edgetree_t *dst, rnd_pline_t *track)
@@ -208,7 +208,7 @@
 
 	res->alloced = alloced;
 	res->used = 0;
-	res->edge_tree = pcb_r_create_tree();
+	res->edge_tree = rnd_r_create_tree();
 	res->bbox.X1 = res->bbox.Y1 = RND_MAX_COORD;
 	res->bbox.X2 = res->bbox.Y2 = -RND_MAX_COORD;
 
@@ -234,7 +234,7 @@
 
 void pcb_cpoly_edgetree_destroy(pcb_cpoly_edgetree_t *etr)
 {
-	pcb_r_destroy_tree(&etr->edge_tree);
+	rnd_r_destroy_tree(&etr->edge_tree);
 	free(etr);
 }
 
@@ -244,7 +244,7 @@
 	rnd_coord_t coord[1];
 } intersect_t;
 
-static pcb_r_dir_t pcb_cploy_hatch_edge_hor(const rnd_rnd_box_t *region, void *cl)
+static rnd_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;
@@ -260,10 +260,10 @@
 		is->used++;
 	}
 
-	return PCB_R_DIR_FOUND_CONTINUE;
+	return RND_R_DIR_FOUND_CONTINUE;
 }
 
-static pcb_r_dir_t pcb_cploy_hatch_edge_ver(const rnd_rnd_box_t *region, void *cl)
+static rnd_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;
@@ -279,7 +279,7 @@
 		is->used++;
 	}
 
-	return PCB_R_DIR_FOUND_CONTINUE;
+	return RND_R_DIR_FOUND_CONTINUE;
 }
 
 static int coord_cmp(const void *p1, const void *p2)
@@ -316,7 +316,7 @@
 
 			is->used = 0;
 			is->at = y;
-			pcb_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_hor, is, NULL);
+			rnd_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_hor, is, NULL);
 			qsort(is->coord, is->used, sizeof(rnd_coord_t), coord_cmp);
 			for(n = 1; n < is->used; n+=2) /* call the callback for the odd scan lines */
 				cb(ctx, is->coord[n-1], y, is->coord[n], y);
@@ -334,7 +334,7 @@
 
 			is->used = 0;
 			is->at = x;
-			pcb_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_ver, is, NULL);
+			rnd_r_search(etr->edge_tree, &scan, NULL, pcb_cploy_hatch_edge_ver, is, NULL);
 			qsort(is->coord, is->used, sizeof(rnd_coord_t), coord_cmp);
 			for(n = 1; n < is->used; n+=2) /* call the callback for the odd scan lines */
 				cb(ctx, x, is->coord[n-1], x, is->coord[n]);
Index: topoly.c
===================================================================
--- topoly.c	(revision 31039)
+++ topoly.c	(revision 31040)
@@ -58,7 +58,7 @@
 	pcb_dynf_t mark;
 } next_conn_t;
 
-static pcb_r_dir_t next_conn_found_arc(const rnd_rnd_box_t *box, void *cl)
+static rnd_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;
@@ -66,7 +66,7 @@
 	int n;
 
 	if (PCB_DFLAG_TEST(&obj->Flags, ctx->mark))
-		return PCB_R_DIR_NOT_FOUND; /* object already mapped */
+		return RND_R_DIR_NOT_FOUND; /* object already mapped */
 
 	for(n = 0; n < 2; n++) {
 		pcb_arc_get_end((pcb_arc_t *)obj, n, &ex, &ey);
@@ -75,14 +75,14 @@
 			vtp0_append(ctx->list, obj);
 			PCB_DFLAG_SET(&obj->Flags, ctx->mark);
 			ctx->result = obj;
-			return PCB_R_DIR_FOUND_CONTINUE;
+			return RND_R_DIR_FOUND_CONTINUE;
 		}
 	}
 
-	return PCB_R_DIR_NOT_FOUND;
+	return RND_R_DIR_NOT_FOUND;
 }
 
-static pcb_r_dir_t next_conn_found_line(const rnd_rnd_box_t *box, void *cl)
+static rnd_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;
@@ -89,7 +89,7 @@
 	pcb_line_t *l = (pcb_line_t *)box;
 
 	if (PCB_DFLAG_TEST(&obj->Flags, ctx->mark))
-		return PCB_R_DIR_NOT_FOUND; /* object already mapped */
+		return RND_R_DIR_NOT_FOUND; /* object already mapped */
 
 	if (NEAR(ctx->tx, l->Point1.X, ctx->ty, l->Point1.Y)) {
 		vti0_append(ctx->endlist, 0);
@@ -96,7 +96,7 @@
 		vtp0_append(ctx->list, obj);
 		PCB_DFLAG_SET(&obj->Flags, ctx->mark);
 		ctx->result = obj;
-		return PCB_R_DIR_FOUND_CONTINUE;
+		return RND_R_DIR_FOUND_CONTINUE;
 	}
 
 	if (NEAR(ctx->tx, l->Point2.X, ctx->ty, l->Point2.Y)) {
@@ -104,10 +104,10 @@
 		vtp0_append(ctx->list, obj);
 		PCB_DFLAG_SET(&obj->Flags, ctx->mark);
 		ctx->result = obj;
-		return PCB_R_DIR_FOUND_CONTINUE;
+		return RND_R_DIR_FOUND_CONTINUE;
 	}
 
-	return PCB_R_DIR_NOT_FOUND;
+	return RND_R_DIR_NOT_FOUND;
 }
 
 static pcb_any_obj_t *next_conn(vtp0_t *list, vti0_t *endlist, pcb_any_obj_t *curr, pcb_dynf_t df)
@@ -149,7 +149,7 @@
 		ctx.tx = cx[n];
 		ctx.ty = cy[n];
 
-		pcb_r_search(curr->parent.layer->arc_tree, &region, NULL, next_conn_found_arc, &ctx, &len);
+		rnd_r_search(curr->parent.layer->arc_tree, &region, NULL, next_conn_found_arc, &ctx, &len);
 		if (len > 1) {
 			rnd_message(RND_MSG_ERROR, "map_contour(): contour is not a clean loop: it contains at least one stub or subloop\n");
 			return NULL;
@@ -157,7 +157,7 @@
 		if (ctx.result != NULL)
 			return ctx.result;
 
-		pcb_r_search(curr->parent.layer->line_tree, &region, NULL, next_conn_found_line, &ctx, &len);
+		rnd_r_search(curr->parent.layer->line_tree, &region, NULL, next_conn_found_line, &ctx, &len);
 		if (len > 1) {
 			rnd_message(RND_MSG_ERROR, "map_contour(): contour is not a clean loop: it contains at least one stub or subloop\n");
 			return NULL;