Index: cord.c
===================================================================
--- cord.c	(revision 30912)
+++ cord.c	(revision 30913)
@@ -244,7 +244,7 @@
 	pcb_trace("cord chg_attr\n");
 }
 
-static pcb_cardinal_t endpt_pstk_proto(pcb_data_t *data, pcb_layer_type_t lyt)
+static rnd_cardinal_t endpt_pstk_proto(pcb_data_t *data, pcb_layer_type_t lyt)
 {
 	pcb_pstk_proto_t proto;
 	pcb_pstk_shape_t shape;
@@ -273,7 +273,7 @@
 	return pcb_pstk_proto_insert_dup(data, &proto, 1, 0);
 }
 
-static pcb_pstk_t *endpt_pstk(pcb_subc_t *subc, const char *ptidx, pcb_cardinal_t pid, rnd_coord_t x, rnd_coord_t y, rnd_coord_t ox, rnd_coord_t oy, const char *term, const char *grp, int floater)
+static pcb_pstk_t *endpt_pstk(pcb_subc_t *subc, const char *ptidx, rnd_cardinal_t pid, rnd_coord_t x, rnd_coord_t y, rnd_coord_t ox, rnd_coord_t oy, const char *term, const char *grp, int floater)
 {
 	pcb_pstk_t *ps;
 	rnd_coord_t dx = ox-x, dy = oy-y,  cpx = x+dx/4, cpy = y+dy/4, cpr = PCB_MM_TO_COORD(0.5);
Index: line_of_vias.c
===================================================================
--- line_of_vias.c	(revision 30912)
+++ line_of_vias.c	(revision 30913)
@@ -76,7 +76,7 @@
 
 #define line_geo_calc(line) \
 	do { \
-		len = pcb_distance(line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); \
+		len = rnd_distance(line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y); \
 		dx = (double)(line->Point2.X - line->Point1.X) / len; \
 		dy = (double)(line->Point2.Y - line->Point1.Y) / len; \
 	} while(0)
@@ -108,7 +108,7 @@
 
 		if ((pcb != NULL) && (pcb->Data->padstack_tree != NULL)) {
 			for(cl = pcb_rtree_first(&it, pcb->Data->padstack_tree, &qbox); cl != NULL; cl = pcb_rtree_next(&it)) {
-				if (pcb_distance(rx, ry, cl->x, cl->y) < too_close) {
+				if (rnd_distance(rx, ry, cl->x, cl->y) < too_close) {
 					skip = 1;
 					break;
 				}