Index: autocrop.c
===================================================================
--- autocrop.c	(revision 5004)
+++ autocrop.c	(revision 5005)
@@ -65,11 +65,11 @@
 {
 	if (Data) {
 		pcb_poly_restore_to_poly(Data, PCB_TYPE_VIA, Via, Via);
-		r_delete_entry(Data->via_tree, (pcb_box_t *) Via);
+		pcb_r_delete_entry(Data->via_tree, (pcb_box_t *) Via);
 	}
 	pcb_via_move(Via, dx, dy);
 	if (Data) {
-		r_insert_entry(Data->via_tree, (pcb_box_t *) Via, 0);
+		pcb_r_insert_entry(Data->via_tree, (pcb_box_t *) Via, 0);
 		pcb_poly_clear_from_poly(Data, PCB_TYPE_VIA, Via, Via);
 	}
 	return Via;
@@ -79,11 +79,11 @@
 {
 	if (Data) {
 		pcb_poly_restore_to_poly(Data, PCB_TYPE_LINE, Layer, Line);
-		r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
+		pcb_r_delete_entry(Layer->line_tree, (pcb_box_t *) Line);
 	}
 	pcb_line_move(Line, dx, dy);
 	if (Data) {
-		r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0);
+		pcb_r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0);
 		pcb_poly_clear_from_poly(Data, PCB_TYPE_LINE, Layer, Line);
 	}
 	return Line;
@@ -93,11 +93,11 @@
 {
 	if (Data) {
 		pcb_poly_restore_to_poly(Data, PCB_TYPE_ARC, Layer, Arc);
-		r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
+		pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc);
 	}
 	pcb_arc_move(Arc, dx, dy);
 	if (Data) {
-		r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0);
+		pcb_r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0);
 		pcb_poly_clear_from_poly(Data, PCB_TYPE_ARC, Layer, Arc);
 	}
 	return Arc;
@@ -106,12 +106,12 @@
 static void *Mypcb_poly_move(pcb_data_t * Data, pcb_layer_t * Layer, pcb_polygon_t * Polygon, pcb_coord_t dx, pcb_coord_t dy)
 {
 	if (Data) {
-		r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
+		pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon);
 	}
 	/* move.c actually only moves points, note no Data/Layer args */
 	pcb_poly_move(Polygon, dx, dy);
 	if (Data) {
-		r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0);
+		pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0);
 		pcb_poly_init_clip(Data, Layer, Polygon);
 	}
 	return Polygon;
@@ -120,10 +120,10 @@
 static void *MyMoveTextLowLevel(pcb_layer_t * Layer, pcb_text_t * Text, pcb_coord_t dx, pcb_coord_t dy)
 {
 	if (Layer)
-		r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
+		pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
 	pcb_text_move(Text, dx, dy);
 	if (Layer)
-		r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
+		pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
 	return Text;
 }