Index: tool_insert.c
===================================================================
--- tool_insert.c	(revision 30912)
+++ tool_insert.c	(revision 30913)
@@ -48,7 +48,7 @@
 } fake;
 
 static pcb_point_t InsertedPoint;
-static pcb_cardinal_t polyIndex = 0;
+static rnd_cardinal_t polyIndex = 0;
 
 
 void pcb_tool_insert_uninit(void)
Index: tool_poly.c
===================================================================
--- tool_poly.c	(revision 30912)
+++ tool_poly.c	(revision 30913)
@@ -56,7 +56,7 @@
 void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl)
 {
 	pcb_point_t *points = pcb_crosshair.AttachedPolygon.Points;
-	pcb_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
+	rnd_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
 
 	/* do update of position */
 	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) {
Index: tool_polyhole.c
===================================================================
--- tool_polyhole.c	(revision 30912)
+++ tool_polyhole.c	(revision 30913)
@@ -83,7 +83,7 @@
 	case PCB_CH_STATE_SECOND:
 		{
 			pcb_point_t *points = pcb_crosshair.AttachedPolygon.Points;
-			pcb_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
+			rnd_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
 
 			/* do update of position */
 			if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST) {