Index: file.c
===================================================================
--- file.c	(revision 30969)
+++ file.c	(revision 30970)
@@ -636,7 +636,7 @@
 			rnd_cardinal_t hole = 0;
 			fprintf(FP, "\tPolygon(%s)\n\t(", F2S(polygon, PCB_OBJ_POLY));
 			for (p = 0; p < polygon->PointN; p++) {
-				pcb_point_t *point = &polygon->Points[p];
+				rnd_point_t *point = &polygon->Points[p];
 
 				if (hole < polygon->HoleIndexN && p == polygon->HoleIndex[hole]) {
 					if (hole > 0)
@@ -772,7 +772,7 @@
 void PostLoadElementPCB()
 {
 	pcb_board_t *pcb_save = PCB;
-	rnd_box_t dbb;
+	rnd_rnd_box_t dbb;
 	pcb_subc_t *sc;
 
 	if (!yyPCB)
@@ -1073,7 +1073,7 @@
 	pcb_subc_bbox(yysubc);
 	if (Data->subc_tree == NULL)
 		Data->subc_tree = pcb_r_create_tree();
-	pcb_r_insert_entry(Data->subc_tree, (rnd_box_t *)yysubc);
+	pcb_r_insert_entry(Data->subc_tree, (rnd_rnd_box_t *)yysubc);
 }
 
 static pcb_layer_t *subc_silk_layer(pcb_subc_t *subc)
@@ -1090,7 +1090,7 @@
 }
 
 pcb_arc_t *io_pcb_element_arc_new(pcb_subc_t *subc, rnd_coord_t X, rnd_coord_t Y,
-	rnd_coord_t Width, rnd_coord_t Height, pcb_angle_t angle, pcb_angle_t delta, rnd_coord_t Thickness)
+	rnd_coord_t Width, rnd_coord_t Height, rnd_angle_t angle, rnd_angle_t delta, rnd_coord_t Thickness)
 {
 	pcb_layer_t *ly = subc_silk_layer(subc);
 	return pcb_arc_new(ly, X, Y, Width, Height, angle, delta, Thickness, 0, pcb_no_flags(), pcb_true);
Index: file.h
===================================================================
--- file.h	(revision 30969)
+++ file.h	(revision 30970)
@@ -84,7 +84,7 @@
 pcb_subc_t *io_pcb_element_new(pcb_data_t *Data, pcb_subc_t *Element, pcb_font_t *PCBFont, pcb_flag_t Flags, char *Description, char *NameOnPCB, char *Value, rnd_coord_t TextX, rnd_coord_t TextY, unsigned int Direction, int TextScale, pcb_flag_t TextFlags, rnd_bool uniqueName);
 void io_pcb_element_fin(pcb_data_t *Data);
 pcb_line_t *io_pcb_element_line_new(pcb_subc_t *subc, rnd_coord_t X1, rnd_coord_t Y1, rnd_coord_t X2, rnd_coord_t Y2, rnd_coord_t Thickness);
-pcb_arc_t *io_pcb_element_arc_new(pcb_subc_t *subc, rnd_coord_t X, rnd_coord_t Y, rnd_coord_t Width, rnd_coord_t Height, pcb_angle_t angle, pcb_angle_t delta, rnd_coord_t Thickness);
+pcb_arc_t *io_pcb_element_arc_new(pcb_subc_t *subc, rnd_coord_t X, rnd_coord_t Y, rnd_coord_t Width, rnd_coord_t Height, rnd_angle_t angle, rnd_angle_t delta, rnd_coord_t Thickness);
 pcb_pstk_t *io_pcb_element_pin_new(pcb_subc_t *subc, rnd_coord_t X, rnd_coord_t Y, rnd_coord_t Thickness, rnd_coord_t Clearance, rnd_coord_t Mask, rnd_coord_t DrillingHole, const char *Name, const char *Number, pcb_flag_t Flags);
 pcb_pstk_t *io_pcb_element_pad_new(pcb_subc_t *subc, rnd_coord_t X1, rnd_coord_t Y1, rnd_coord_t X2, rnd_coord_t Y2, rnd_coord_t Thickness, rnd_coord_t Clearance, rnd_coord_t Mask, const char *Name, const char *Number, pcb_flag_t Flags);
 void io_pcb_preproc_board(pcb_board_t *pcb);
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 30969)
+++ parse_y.c	(revision 30970)
@@ -2455,7 +2455,7 @@
 				    pcb_poly_bbox(Polygon);
 				    if (!Layer->polygon_tree)
 				      Layer->polygon_tree = pcb_r_create_tree();
-				    pcb_r_insert_entry(Layer->polygon_tree, (rnd_box_t *) Polygon);
+				    pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon);
 				  }
 			}
 #line 2462 "parse_y.c" /* yacc.c:1652  */
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 30969)
+++ parse_y.y	(revision 30970)
@@ -796,7 +796,7 @@
 				    pcb_poly_bbox(Polygon);
 				    if (!Layer->polygon_tree)
 				      Layer->polygon_tree = pcb_r_create_tree();
-				    pcb_r_insert_entry(Layer->polygon_tree, (rnd_box_t *) Polygon);
+				    pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon);
 				  }
 			}
 		;