Index: drill.c
===================================================================
--- drill.c	(revision 30911)
+++ drill.c	(revision 30912)
@@ -76,7 +76,7 @@
 	pcb_drill_t *Drill = NULL;
 	rnd_bool DrillFound = pcb_false;
 	pcb_rtree_it_t it;
-	pcb_box_t *pb;
+	rnd_box_t *pb;
 
 	AllDrills = (pcb_drill_info_t *)calloc(1, sizeof(pcb_drill_info_t));
 
Index: report.c
===================================================================
--- report.c	(revision 30911)
+++ report.c	(revision 30912)
@@ -231,7 +231,7 @@
 
 static void report_arc(gds_t *dst, pcb_arc_t *arc)
 {
-	pcb_box_t box;
+	rnd_box_t box;
 #ifndef NDEBUG
 	if (pcb_gui->shift_is_pressed(pcb_gui))
 		pcb_r_dump_tree(arc->parent.layer->arc_tree, 0);
@@ -663,21 +663,21 @@
 #undef MINDIST2
 
 		rnd_message(PCB_MSG_INFO, "The two arms of the net are:\n");
-		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)l);
+		pcb_r_delete_entry(ly->line_tree, (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, (pcb_box_t *)l);
+		pcb_r_insert_entry(ly->line_tree, (rnd_box_t *)l);
 		report_net_length_(res, argc, argv, x, y);
-		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)l);
+		pcb_r_delete_entry(ly->line_tree, (rnd_box_t *)l);
 		l->Point1.X = ox; l->Point1.Y = oy;
-		pcb_r_insert_entry(ly->line_tree, (pcb_box_t *)l);
+		pcb_r_insert_entry(ly->line_tree, (rnd_box_t *)l);
 
-		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)l);
+		pcb_r_delete_entry(ly->line_tree, (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, (pcb_box_t *)l);
+		pcb_r_insert_entry(ly->line_tree, (rnd_box_t *)l);
 		report_net_length_(res, argc, argv, x, y);
-		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)l);
+		pcb_r_delete_entry(ly->line_tree, (rnd_box_t *)l);
 		l->Point2.X = ox; l->Point2.Y = oy;
-		pcb_r_insert_entry(ly->line_tree, (pcb_box_t *)l);
+		pcb_r_insert_entry(ly->line_tree, (rnd_box_t *)l);
 
 		PCB_FLAG_SET(PCB_FLAG_SELECTED, l);