Index: cord.c
===================================================================
--- cord.c	(revision 30941)
+++ cord.c	(revision 30942)
@@ -147,8 +147,8 @@
 
 			/* B(t)=(1-t)^3 * P0 + 3*(1-t)^2 * t * P1 + 3 * (1-t)*t^2 * P2 + t^3*P3 */
 
-			x = pcb_round(it3*e1->x + 3*it2*t*a1->X + 3*it*t2*a2->X + t3*e2->x);
-			y = pcb_round(it3*e1->y + 3*it2*t*a1->Y + 3*it*t2*a2->Y + t3*e2->y);
+			x = rnd_round(it3*e1->x + 3*it2*t*a1->X + 3*it*t2*a2->X + t3*e2->x);
+			y = rnd_round(it3*e1->y + 3*it2*t*a1->Y + 3*it*t2*a2->Y + t3*e2->y);
 
 			l = pcb_line_new(lyr, lx, ly, x, y,
 				PCB_MM_TO_COORD(0.25), 0, pcb_flag_make(0));
@@ -434,7 +434,7 @@
 			dl->is_bound = 1;
 			dl->type = PCB_OBJ_LAYER;
 			memcpy(&dl->meta.bound, &sl->meta.bound, sizeof(sl->meta.bound));
-			dl->name = pcb_strdup(sl->name);
+			dl->name = rnd_strdup(sl->name);
 			dl->comb = sl->comb;
 			if (dl->meta.bound.real != NULL)
 				pcb_layer_link_trees(dl, dl->meta.bound.real);
Index: dimension.c
===================================================================
--- dimension.c	(revision 30941)
+++ dimension.c	(revision 30942)
@@ -168,10 +168,10 @@
 	ly = &subc->data->Layer[LID_TARGET];
 
 	/* endpoints of the displaced baseline */
-	x1 = pcb_round(dim->x1 + dim->displace * -dim->dy);
-	y1 = pcb_round(dim->y1 + dim->displace * +dim->dx);
-	x2 = pcb_round(dim->x2 + dim->displace * -dim->dy);
-	y2 = pcb_round(dim->y2 + dim->displace * +dim->dx);
+	x1 = rnd_round(dim->x1 + dim->displace * -dim->dy);
+	y1 = rnd_round(dim->y1 + dim->displace * +dim->dx);
+	x2 = rnd_round(dim->x2 + dim->displace * -dim->dy);
+	y2 = rnd_round(dim->y2 + dim->displace * +dim->dx);
 
 	/* endpoints of the extended-displaced baseline */
 	dispe = PCB_MM_TO_COORD(0.5);
@@ -179,10 +179,10 @@
 		dispe = -dispe;
 	dispe = dim->displace + dispe;
 
-	x1e = pcb_round(dim->x1 + dispe * -dim->dy);
-	y1e = pcb_round(dim->y1 + dispe * +dim->dx);
-	x2e = pcb_round(dim->x2 + dispe * -dim->dy);
-	y2e = pcb_round(dim->y2 + dispe * +dim->dx);
+	x1e = rnd_round(dim->x1 + dispe * -dim->dy);
+	y1e = rnd_round(dim->y1 + dispe * +dim->dx);
+	x2e = rnd_round(dim->x2 + dispe * -dim->dy);
+	y2e = rnd_round(dim->y2 + dispe * +dim->dx);
 
 	/* main dim line */
 	flt = linelist_first(&subc->data->Layer[LID_TARGET].Line);
@@ -274,8 +274,8 @@
 		dimension_unpack(subc);
 	dim = subc->extobj_data;
 
-	fx = pcb_round((double)(fline->Point1.X + fline->Point2.X)/2.0);
-	fy = pcb_round((double)(fline->Point1.Y + fline->Point2.Y)/2.0);
+	fx = rnd_round((double)(fline->Point1.X + fline->Point2.X)/2.0);
+	fy = rnd_round((double)(fline->Point1.Y + fline->Point2.Y)/2.0);
 
 	memset(&bline, 0, sizeof(bline));
 	bline.Point1.X = dim->x1; bline.Point1.Y = dim->y1;
Index: line_of_vias.c
===================================================================
--- line_of_vias.c	(revision 30941)
+++ line_of_vias.c	(revision 30942)
@@ -100,11 +100,11 @@
 		pcb_rtree_box_t qbox;
 		pcb_pstk_t *cl;
 		int skip = 0;
-		rnd_coord_t rx = pcb_round(x), ry = pcb_round(y);
+		rnd_coord_t rx = rnd_round(x), ry = rnd_round(y);
 
 		/* skip if there's a via too close */
-		qbox.x1 = pcb_round(rx - qbox_bloat); qbox.y1 = pcb_round(ry - qbox_bloat);
-		qbox.x2 = pcb_round(rx + qbox_bloat); qbox.y2 = pcb_round(ry + qbox_bloat);
+		qbox.x1 = rnd_round(rx - qbox_bloat); qbox.y1 = rnd_round(ry - qbox_bloat);
+		qbox.x2 = rnd_round(rx + qbox_bloat); qbox.y2 = rnd_round(ry + qbox_bloat);
 
 		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)) {