Index: read.c
===================================================================
--- read.c	(revision 31800)
+++ read.c	(revision 31801)
@@ -1065,7 +1065,7 @@
 	pcb_subc_bbox(new_module);
 	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 *)new_module);
+	rnd_r_insert_entry(st->pcb->Data->subc_tree, (rnd_box_t *)new_module);
 	pcb_subc_rebind(st->pcb, new_module);
 
 	return 0;
@@ -1075,7 +1075,7 @@
 int io_autotrax_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, rnd_conf_role_t settings_dest)
 {
 	int readres = 0;
-	rnd_rnd_box_t board_size, *box;
+	rnd_box_t board_size, *box;
 	read_state_t st;
 	FILE *FP;
 	pcb_subc_t *subc = NULL;
Index: write.c
===================================================================
--- write.c	(revision 31800)
+++ write.c	(revision 31801)
@@ -505,7 +505,7 @@
 static int wrax_subc(wctx_t *ctx, pcb_subc_t *subc)
 {
 	int res, on_bottom = 0, silk_layer;
-	rnd_rnd_box_t *box = &subc->BoundingBox;
+	rnd_box_t *box = &subc->BoundingBox;
 	rnd_coord_t xPos, yPos, yPos2, yPos3;
 
 TODO("do not hardcode things like this, especially when actual data is available")