Index: tool_arc.c
===================================================================
--- tool_arc.c	(revision 30969)
+++ tool_arc.c	(revision 30970)
@@ -90,7 +90,7 @@
 		{
 			pcb_arc_t *arc;
 			rnd_coord_t wx, wy;
-			pcb_angle_t sa, dir;
+			rnd_angle_t sa, dir;
 			wx = hl->tool_x - pcb_crosshair.AttachedBox.Point1.X;
 			wy = hl->tool_y - pcb_crosshair.AttachedBox.Point1.Y;
 rnd_trace("arc: %mm %mm wh %mm %mm\n", hl->tool_x, hl->tool_y, wx, wy);
Index: tool_arrow.c
===================================================================
--- tool_arrow.c	(revision 30969)
+++ tool_arrow.c	(revision 30970)
@@ -83,7 +83,7 @@
 			pcb_tool_select_by_name(hl, "buffer");
 		}
 		else if (hl->tool_hit && !pcb_gui->shift_is_pressed(pcb_gui)) {
-			rnd_box_t box;
+			rnd_rnd_box_t box;
 
 			hl->tool_grabbed.status = pcb_true;
 			pcb_tool_save(hl);
@@ -109,7 +109,7 @@
 			pcb_tool_attach_for_copy(hl, hl->tool_x, hl->tool_y, pcb_true);
 		}
 		else {
-			rnd_box_t box;
+			rnd_rnd_box_t box;
 
 			hl->tool_hit = 0;
 			pcb_crosshair_note.Moving = pcb_false;
@@ -179,11 +179,11 @@
 
 void pcb_tool_arrow_release_mode(rnd_hidlib_t *hl)
 {
-	rnd_box_t box;
+	rnd_rnd_box_t box;
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
 	if (hl->tool_click) {
-		rnd_box_t box;
+		rnd_rnd_box_t box;
 
 		box.X1 = -PCB_MAX_COORD;
 		box.Y1 = -PCB_MAX_COORD;
Index: tool_insert.c
===================================================================
--- tool_insert.c	(revision 30969)
+++ tool_insert.c	(revision 30970)
@@ -48,7 +48,7 @@
 	pcb_line_t line;
 } fake;
 
-static pcb_point_t InsertedPoint;
+static rnd_point_t InsertedPoint;
 static rnd_cardinal_t polyIndex = 0;
 
 
@@ -135,7 +135,7 @@
 
 void pcb_tool_insert_adjust_attached_objects(rnd_hidlib_t *hl)
 {
-	pcb_point_t *pnt;
+	rnd_point_t *pnt;
 	pnt = pcb_adjust_insert_point();
 	if (pnt)
 		InsertedPoint = *pnt;
Index: tool_poly.c
===================================================================
--- tool_poly.c	(revision 30969)
+++ tool_poly.c	(revision 30970)
@@ -55,7 +55,7 @@
 
 void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl)
 {
-	pcb_point_t *points = pcb_crosshair.AttachedPolygon.Points;
+	rnd_point_t *points = pcb_crosshair.AttachedPolygon.Points;
 	rnd_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
 
 	/* do update of position */
Index: tool_polyhole.c
===================================================================
--- tool_polyhole.c	(revision 30969)
+++ tool_polyhole.c	(revision 30970)
@@ -82,7 +82,7 @@
 		/* second notify, insert new point into object */
 	case PCB_CH_STATE_SECOND:
 		{
-			pcb_point_t *points = pcb_crosshair.AttachedPolygon.Points;
+			rnd_point_t *points = pcb_crosshair.AttachedPolygon.Points;
 			rnd_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
 
 			/* do update of position */