Index: read.c
===================================================================
--- read.c	(revision 31800)
+++ read.c	(revision 31801)
@@ -1003,7 +1003,7 @@
 	if (st->pcb != NULL) {
 		if (st->pcb->Data->subc_tree == NULL)
 			st->pcb->Data->subc_tree = rnd_r_create_tree();
-		rnd_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)subc);
+		rnd_r_insert_entry(st->pcb->Data->subc_tree, (rnd_box_t *)subc);
 		pcb_subc_rebind(st->pcb, subc);
 	}
 	else
@@ -2457,7 +2457,7 @@
 	if (st->pcb != NULL) {
 		if (st->pcb->Data->subc_tree == NULL)
 			st->pcb->Data->subc_tree = rnd_r_create_tree();
-		rnd_r_insert_entry(st->pcb->Data->subc_tree, (rnd_rnd_box_t *)subc);
+		rnd_r_insert_entry(st->pcb->Data->subc_tree, (rnd_box_t *)subc);
 		pcb_subc_rebind(st->pcb, subc);
 	}
 	else
Index: write.c
===================================================================
--- write.c	(revision 31800)
+++ write.c	(revision 31801)
@@ -586,7 +586,7 @@
 					if (tshp->shape[n].layer_mask & PCB_LYT_COPPER) {
 						int i;
 						pcb_line_t line;
-						rnd_rnd_box_t bx;
+						rnd_box_t bx;
 						pcb_pstk_shape_t *shape = &tshp->shape[n];
 						
 						on_bottom = tshp->shape[n].layer_mask & PCB_LYT_BOTTOM;