Index: drill.c
===================================================================
--- drill.c	(revision 31039)
+++ drill.c	(revision 31040)
@@ -80,7 +80,7 @@
 
 	AllDrills = (pcb_drill_info_t *)calloc(1, sizeof(pcb_drill_info_t));
 
-	for(pb = pcb_r_first(top->padstack_tree, &it); pb != NULL; pb = pcb_r_next(&it)) {
+	for(pb = rnd_r_first(top->padstack_tree, &it); pb != NULL; pb = rnd_r_next(&it)) {
 		pcb_pstk_t *ps = (pcb_pstk_t *)pb;
 		pcb_pstk_proto_t *proto = pcb_pstk_get_proto(ps);
 		if (proto->hdia <= 0)
@@ -112,7 +112,7 @@
 				drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
 		}
 	}
-	pcb_r_end(&it);
+	rnd_r_end(&it);
 
 	qsort(AllDrills->Drill, AllDrills->DrillN, sizeof(pcb_drill_t), drill_qsort_cmp);
 	return AllDrills;
Index: report.c
===================================================================
--- report.c	(revision 31039)
+++ report.c	(revision 31040)
@@ -177,7 +177,7 @@
 
 #ifndef NDEBUG
 	if (rnd_gui->shift_is_pressed(rnd_gui))
-		pcb_r_dump_tree(PCB->Data->padstack_tree, 0);
+		rnd_r_dump_tree(PCB->Data->padstack_tree, 0);
 #endif
 	proto = pcb_pstk_get_proto(ps);
 
@@ -195,7 +195,7 @@
 {
 #ifndef NDEBUG
 	if (rnd_gui->shift_is_pressed(rnd_gui))
-		pcb_r_dump_tree(line->parent.layer->line_tree, 0);
+		rnd_r_dump_tree(line->parent.layer->line_tree, 0);
 #endif
 	rnd_append_printf(dst, "%m+LINE ID# %ld;  Flags:%s\n"
 		"FirstPoint(X,Y)  = %$mD, ID = %ld.\n"
@@ -217,7 +217,7 @@
 {
 #ifndef NDEBUG
 	if (rnd_gui->shift_is_pressed(rnd_gui))
-		pcb_r_dump_tree(PCB->Data->rat_tree, 0);
+		rnd_r_dump_tree(PCB->Data->rat_tree, 0);
 #endif
 	rnd_append_printf(dst, "%m+RAT-LINE ID# %ld;  Flags:%s\n"
 		"FirstPoint(X,Y)  = %$mD; ID = %ld; "
@@ -234,7 +234,7 @@
 	rnd_rnd_box_t box;
 #ifndef NDEBUG
 	if (rnd_gui->shift_is_pressed(rnd_gui))
-		pcb_r_dump_tree(arc->parent.layer->arc_tree, 0);
+		rnd_r_dump_tree(arc->parent.layer->arc_tree, 0);
 #endif
 	pcb_arc_get_end(arc, 0, &box.X1, &box.Y1);
 	pcb_arc_get_end(arc, 1, &box.X2, &box.Y2);
@@ -265,7 +265,7 @@
 
 #ifndef NDEBUG
 	if (rnd_gui->shift_is_pressed(rnd_gui))
-		pcb_r_dump_tree(poly->parent.layer->polygon_tree, 0);
+		rnd_r_dump_tree(poly->parent.layer->polygon_tree, 0);
 #endif
 
 	aunit = rnd_conf.editor.grid_unit->suffix;
@@ -300,7 +300,7 @@
 {
 #ifndef NDEBUG
 	if (rnd_gui->shift_is_pressed(rnd_gui))
-		pcb_r_dump_tree(PCB->Data->subc_tree, 0);
+		rnd_r_dump_tree(PCB->Data->subc_tree, 0);
 #endif
 	rnd_append_printf(dst, "%m+SUBCIRCUIT ID# %ld;  Flags:%s\n"
 		"BoundingBox %$mD %$mD.\n"
@@ -319,7 +319,7 @@
 {
 #ifndef NDEBUG
 		if (rnd_gui->shift_is_pressed(rnd_gui))
-			pcb_r_dump_tree(text->parent.layer->text_tree, 0);
+			rnd_r_dump_tree(text->parent.layer->text_tree, 0);
 #endif
 
 	rnd_append_printf(dst, "%m+TEXT ID# %ld;  Flags:%s\n"
@@ -336,7 +336,7 @@
 {
 #ifndef NDEBUG
 		if (rnd_gui->shift_is_pressed(rnd_gui))
-			pcb_r_dump_tree(gfx->parent.layer->gfx_tree, 0);
+			rnd_r_dump_tree(gfx->parent.layer->gfx_tree, 0);
 #endif
 
 	rnd_append_printf(dst, "%m+GFX ID# %ld;  Flags:%s\n"
@@ -663,21 +663,21 @@
 #undef MINDIST2
 
 		rnd_message(RND_MSG_INFO, "The two arms of the net are:\n");
-		pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l);
+		rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l);
 		ox = l->Point1.X; oy = l->Point1.Y; l->Point1.X = x; l->Point1.Y = y;
-		pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l);
+		rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l);
 		report_net_length_(res, argc, argv, x, y);
-		pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l);
+		rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l);
 		l->Point1.X = ox; l->Point1.Y = oy;
-		pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l);
+		rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l);
 
-		pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l);
+		rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l);
 		ox = l->Point2.X; oy = l->Point2.Y; l->Point2.X = x; l->Point2.Y = y;
-		pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l);
+		rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l);
 		report_net_length_(res, argc, argv, x, y);
-		pcb_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l);
+		rnd_r_delete_entry(ly->line_tree, (rnd_rnd_box_t *)l);
 		l->Point2.X = ox; l->Point2.Y = oy;
-		pcb_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l);
+		rnd_r_insert_entry(ly->line_tree, (rnd_rnd_box_t *)l);
 
 		PCB_FLAG_SET(PCB_FLAG_SELECTED, l);