Index: read.c
===================================================================
--- read.c	(revision 30969)
+++ read.c	(revision 30970)
@@ -298,8 +298,8 @@
 	pcb_layer_t *ly;
 
 	rnd_coord_t centreX, centreY, width, height, Thickness, Clearance, radius;
-	pcb_angle_t start_angle = 0.0;
-	pcb_angle_t delta = 360.0;
+	rnd_angle_t start_angle = 0.0;
+	rnd_angle_t delta = 360.0;
 
 	pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */
 	pcb_layer_id_t PCB_layer;
@@ -1065,7 +1065,7 @@
 	pcb_subc_bbox(new_module);
 	if (st->pcb->Data->subc_tree == NULL)
 		st->pcb->Data->subc_tree = pcb_r_create_tree();
-	pcb_r_insert_entry(st->pcb->Data->subc_tree, (rnd_box_t *)new_module);
+	pcb_r_insert_entry(st->pcb->Data->subc_tree, (rnd_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_box_t board_size, *box;
+	rnd_rnd_box_t board_size, *box;
 	read_state_t st;
 	FILE *FP;
 	pcb_subc_t *subc = NULL;
Index: write.c
===================================================================
--- write.c	(revision 30969)
+++ write.c	(revision 30970)
@@ -290,7 +290,7 @@
 }
 
 /* generates an autotrax arc "segments" value to approximate an arc being exported   */
-static int pcb_rnd_arc_to_autotrax_segments(pcb_angle_t arc_start, pcb_angle_t arc_delta)
+static int pcb_rnd_arc_to_autotrax_segments(rnd_angle_t arc_start, rnd_angle_t arc_delta)
 {
 	int arc_segments = 0; /* start with no arc segments */
 	/* 15 = circle, bit 1 = LUQ, bit 2 = LLQ, bit 3 = LRQ, bit 4 = URQ */
@@ -497,7 +497,7 @@
 static int wrax_subc(wctx_t *ctx, pcb_subc_t *subc)
 {
 	int res, on_bottom = 0, silk_layer;
-	rnd_box_t *box = &subc->BoundingBox;
+	rnd_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")
@@ -552,7 +552,7 @@
 	rnd_cardinal_t current_layer = number;
 
 	pcb_poly_it_t poly_it;
-	pcb_polyarea_t *pa;
+	rnd_polyarea_t *pa;
 
 	rnd_coord_t minx, miny, maxx, maxy;