Index: eagle_bin.c
===================================================================
--- eagle_bin.c	(revision 30912)
+++ eagle_bin.c	(revision 30913)
@@ -1477,7 +1477,7 @@
 			cy = c;
 			cx = (long)((y3-cy)*(y2-y1)/(double)((x2-x1)) + x3);
 		}
-		radius = (long)pcb_distance((double)cx, (double)cy, (double)x2, (double)y2);
+		radius = (long)rnd_distance((double)cx, (double)cy, (double)x2, (double)y2);
 		sprintf(itoa_buffer, "%ld", radius);
 		egb_node_prop_set(elem, "radius", itoa_buffer);
 		sprintf(itoa_buffer, "%ld", cx);
@@ -1612,7 +1612,7 @@
 		} else if (!(x1_ok && x2_ok && y1_ok && y2_ok)) {
 			rnd_message(PCB_MSG_ERROR, "x1/2 or y1/2 not set in binary arc\n");
 		}
-		radius = (long)(pcb_distance((double)cx, (double)cy, (double)x2, (double)y2));
+		radius = (long)(rnd_distance((double)cx, (double)cy, (double)x2, (double)y2));
 		sprintf(itoa_buffer, "%ld", radius);
 		egb_node_prop_set(elem, "radius", itoa_buffer);
 
Index: read.c
===================================================================
--- read.c	(revision 30912)
+++ read.c	(revision 30913)
@@ -1681,7 +1681,7 @@
 			linelist_foreach(&(ly)->Polygon, &itp, poly) {
 				if (PCB_FLAG_TEST(PCB_FLAG_FOUND, poly)) continue;
 				if (pcb_polyarea_touching(hole->Clipped, poly->Clipped)) {
-					pcb_cardinal_t n;
+					rnd_cardinal_t n;
 					poly->clip_dirty = 1;
 					/* add hole points to the permanent list */
 					pcb_poly_hole_new(poly);