Index: undo_old.c
===================================================================
--- undo_old.c	(revision 30969)
+++ undo_old.c	(revision 30970)
@@ -238,7 +238,7 @@
 		pcb_layer_t *Layer = (pcb_layer_t *) ptr1;
 		pcb_arc_t *a = (pcb_arc_t *) ptr2;
 		pcb_poly_restore_to_poly(PCB->Data, a->type, ptr1, ptr2);
-		pcb_r_delete_entry(Layer->arc_tree, (rnd_box_t *) a);
+		pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a);
 		old_sa = a->StartAngle;
 		old_da = a->Delta;
 		if (pcb_undo_and_draw)
@@ -246,7 +246,7 @@
 		a->StartAngle = Entry->Data.AngleChange.angle[0];
 		a->Delta = Entry->Data.AngleChange.angle[1];
 		pcb_arc_bbox(a);
-		pcb_r_insert_entry(Layer->arc_tree, (rnd_box_t *) a);
+		pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a);
 		pcb_poly_clear_from_poly(PCB->Data, a->type, ptr1, ptr2);
 		Entry->Data.AngleChange.angle[0] = old_sa;
 		Entry->Data.AngleChange.angle[1] = old_da;
@@ -270,7 +270,7 @@
 	if (type == PCB_OBJ_ARC) {
 		pcb_layer_t *Layer = (pcb_layer_t *) ptr1;
 		pcb_arc_t *a = (pcb_arc_t *) ptr2;
-		pcb_r_delete_entry(Layer->arc_tree, (rnd_box_t *) a);
+		pcb_r_delete_entry(Layer->arc_tree, (rnd_rnd_box_t *) a);
 		old_w = a->Width;
 		old_h = a->Height;
 		if (pcb_undo_and_draw)
@@ -278,7 +278,7 @@
 		a->Width = Entry->Data.Move.DX;
 		a->Height = Entry->Data.Move.DY;
 		pcb_arc_bbox(a);
-		pcb_r_insert_entry(Layer->arc_tree, (rnd_box_t *) a);
+		pcb_r_insert_entry(Layer->arc_tree, (rnd_rnd_box_t *) a);
 		Entry->Data.Move.DX = old_w;
 		Entry->Data.Move.DY = old_h;
 		pcb_draw_obj((pcb_any_obj_t *)a);
@@ -671,7 +671,7 @@
 {
 	pcb_layer_t *layer;
 	pcb_poly_t *polygon;
-	pcb_point_t *pnt;
+	rnd_point_t *pnt;
 	int type;
 	rnd_cardinal_t point_idx;
 	rnd_cardinal_t hole;
@@ -923,7 +923,7 @@
 /* ---------------------------------------------------------------------------
  * adds an object to the list of rotated objects
  */
-void pcb_undo_add_obj_to_rotate(int Type, void *Ptr1, void *Ptr2, void *Ptr3, rnd_coord_t CenterX, rnd_coord_t CenterY, pcb_angle_t angle)
+void pcb_undo_add_obj_to_rotate(int Type, void *Ptr1, void *Ptr2, void *Ptr3, rnd_coord_t CenterX, rnd_coord_t CenterY, rnd_angle_t angle)
 {
 	UndoListTypePtr undo;