Index: centgeo.c
===================================================================
--- centgeo.c	(revision 30912)
+++ centgeo.c	(revision 30913)
@@ -361,7 +361,7 @@
 
 	pdx = Arc2->X - Arc1->X;
 	pdy = Arc2->Y - Arc1->Y;
-	dl = pcb_distance(Arc1->X, Arc1->Y, Arc2->X, Arc2->Y);
+	dl = rnd_distance(Arc1->X, Arc1->Y, Arc2->X, Arc2->Y);
 
 	/* the original code used to do angle checks for concentric case here but
 	   those cases are already handled by the above endpoint checks. */
Index: cli.c
===================================================================
--- cli.c	(revision 30912)
+++ cli.c	(revision 30913)
@@ -98,7 +98,7 @@
 
 	rnd_coord_t x, y, dist;
 	pcb_angle_t angle, offs;
-	pcb_cardinal_t id;
+	rnd_cardinal_t id;
 };
 
 static const cli_ntype_t find_type(const char *type, int typelen)
Index: cli_line.c
===================================================================
--- cli_line.c	(revision 30912)
+++ cli_line.c	(revision 30913)
@@ -175,7 +175,7 @@
 				return 0;
 			}
 			replace=1;
-			pcb_snprintf(buff, sizeof(buff), "~%.08$$mm", pcb_distance(pcb_crosshair.X, pcb_crosshair.Y, ox, oy));
+			pcb_snprintf(buff, sizeof(buff), "~%.08$$mm", rnd_distance(pcb_crosshair.X, pcb_crosshair.Y, ox, oy));
 			break;
 		case_object: ;
 			{
Index: constraint.c
===================================================================
--- constraint.c	(revision 30912)
+++ constraint.c	(revision 30913)
@@ -83,7 +83,7 @@
 	double len, best_diff, diff, target_len;
 	int n, best;
 
-	len = pcb_distance(x1, y1, x2, y2);
+	len = rnd_distance(x1, y1, x2, y2);
 
 	if (lengthlen > 0) {
 		/* find the best matching constraint length */
Index: ddraft.c
===================================================================
--- ddraft.c	(revision 30912)
+++ ddraft.c	(revision 30913)
@@ -421,7 +421,7 @@
 		return 0;
 	}
 
-	d = pcb_distance(arc->X, arc->Y, line->point1.X, line->point1.Y);
+	d = rnd_distance(arc->X, arc->Y, line->point1.X, line->point1.Y);
 	r = arc->Width;
 
 	if (d <= r) {