Index: bus.c
===================================================================
--- bus.c	(revision 30969)
+++ bus.c	(revision 30970)
@@ -95,7 +95,7 @@
 		ny = vx; \
 	} while(0)
 
-static int close_enough(pcb_point_t a, pcb_point_t b)
+static int close_enough(rnd_point_t a, rnd_point_t b)
 {
 	rnd_coord_t dx = a.X - b.X, dy = a.Y - b.Y;
 
@@ -123,8 +123,8 @@
 
 	o0 = ((bus->width - 1) * bus->pitch)/2;
 	for(l = linelist_first(&ely->Line); l != NULL; l = linelist_next(l)) {
-		pcb_rtree_box_t sb;
-		pcb_rtree_it_t it;
+		rnd_rtree_box_t sb;
+		rnd_rtree_it_t it;
 		bus_seg_def;
 		double o = o0, a1 = 0, a2 = 0, tune1, tune2;
 		int n, c1 = 0, c2 = 0;
@@ -137,7 +137,7 @@
 /*		rnd_trace("line\n");*/
 		sb.x1 = l->Point1.X-1; sb.y1 = l->Point1.Y-1;
 		sb.x2 = l->Point1.X+1; sb.y2 = l->Point1.Y+1;
-		for(ltmp = pcb_rtree_first(&it, ely->line_tree, &sb); ltmp != NULL; ltmp = pcb_rtree_next(&it))
+		for(ltmp = rnd_rtree_first(&it, ely->line_tree, &sb); ltmp != NULL; ltmp = rnd_rtree_next(&it))
 		{
 			if ((ltmp == l) || (ltmp->parent.any != l->parent.any)) continue;
 			if (close_enough(l->Point1, ltmp->Point1)) {
@@ -155,7 +155,7 @@
 		}
 		sb.x1 = l->Point2.X-1; sb.y1 = l->Point2.Y-1;
 		sb.x2 = l->Point2.X+1; sb.y2 = l->Point2.Y+1;
-		for(ltmp = pcb_rtree_first(&it, ely->line_tree, &sb); ltmp != NULL; ltmp = pcb_rtree_next(&it))
+		for(ltmp = rnd_rtree_first(&it, ely->line_tree, &sb); ltmp != NULL; ltmp = rnd_rtree_next(&it))
 		{
 			if ((ltmp == l) || (ltmp->parent.any != l->parent.any)) continue;
 			if (close_enough(l->Point2, ltmp->Point1)) {
Index: cord.c
===================================================================
--- cord.c	(revision 30969)
+++ cord.c	(revision 30970)
@@ -174,7 +174,7 @@
 {
 	pcb_exto_draw_mark(info, subc);
 	if (subc->extobj_data == cord_footprint)
-		pcb_draw_subc_mark((const rnd_box_t *)subc, info);
+		pcb_draw_subc_mark((const rnd_rnd_box_t *)subc, info);
 }
 
 static void pcb_cord_float_pre(pcb_subc_t *subc, pcb_any_obj_t *floater)
Index: dimension.c
===================================================================
--- dimension.c	(revision 30969)
+++ dimension.c	(revision 30970)
@@ -195,7 +195,7 @@
 	}
 	else { /* modify the floater if it exists */
 		if (ly->line_tree != NULL)
-			pcb_r_delete_entry(ly->line_tree, (rnd_box_t *)flt);
+			pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)flt);
 
 		flt->Point1.X = x1 + arrx * dim->dx; flt->Point1.Y = y1 + arrx * dim->dy;
 		flt->Point2.X = x2 - arrx * dim->dx; flt->Point2.Y = y2 - arrx * dim->dy;
@@ -202,7 +202,7 @@
 
 		pcb_line_bbox(flt);
 		if (ly->line_tree != NULL)
-			pcb_r_insert_entry(ly->line_tree, (rnd_box_t *)flt);
+			pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)flt);
 	}
 
 	/* guide lines */
Index: line_of_vias.c
===================================================================
--- line_of_vias.c	(revision 30969)
+++ line_of_vias.c	(revision 30970)
@@ -96,8 +96,8 @@
 	too_close = pitch/2.0;
 	qbox_bloat = pitch/4.0;
 	for(offs = 0; offs <= len; offs += pitch) {
-		pcb_rtree_it_t it;
-		pcb_rtree_box_t qbox;
+		rnd_rtree_it_t it;
+		rnd_rtree_box_t qbox;
 		pcb_pstk_t *cl;
 		int skip = 0;
 		rnd_coord_t rx = rnd_round(x), ry = rnd_round(y);
@@ -107,7 +107,7 @@
 		qbox.x2 = rnd_round(rx + qbox_bloat); qbox.y2 = rnd_round(ry + qbox_bloat);
 
 		if ((pcb != NULL) && (pcb->Data->padstack_tree != NULL)) {
-			for(cl = pcb_rtree_first(&it, pcb->Data->padstack_tree, &qbox); cl != NULL; cl = pcb_rtree_next(&it)) {
+			for(cl = rnd_rtree_first(&it, pcb->Data->padstack_tree, &qbox); cl != NULL; cl = rnd_rtree_next(&it)) {
 				if (rnd_distance(rx, ry, cl->x, cl->y) < too_close) {
 					skip = 1;
 					break;