Index: centgeo.c
===================================================================
--- centgeo.c	(revision 30941)
+++ centgeo.c	(revision 30942)
@@ -75,8 +75,8 @@
 				s = 1.0;
 
 			if (ip != NULL) {
-				ip->X1 = pcb_round((double)Line1->Point1.X + r * line1_dx);
-				ip->Y1 = pcb_round((double)Line1->Point1.Y + r * line1_dy);
+				ip->X1 = rnd_round((double)Line1->Point1.X + r * line1_dx);
+				ip->Y1 = rnd_round((double)Line1->Point1.Y + r * line1_dy);
 				if (s == 1.0) {
 					ip->X2 = Line1->Point2.X;
 					ip->Y2 = Line1->Point2.Y;
@@ -102,8 +102,8 @@
 	if (r >= 0.0 && r <= 1.0) {
 		if (s >= 0.0 && s <= 1.0) {
 			if (ip != NULL) {
-				ip->X1 = pcb_round((double)Line1->Point1.X + r * line1_dx);
-				ip->Y1 = pcb_round((double)Line1->Point1.Y + r * line1_dy);
+				ip->X1 = rnd_round((double)Line1->Point1.X + r * line1_dx);
+				ip->Y1 = rnd_round((double)Line1->Point1.Y + r * line1_dy);
 			}
 			if (offs != NULL)
 				offs[0] = r;
@@ -124,8 +124,8 @@
 	line_dx = line->Point2.X - line->Point1.X;
 	line_dy = line->Point2.Y - line->Point1.Y;
 
-	*dstx = pcb_round((double)line->Point1.X + offs * line_dx);
-	*dsty = pcb_round((double)line->Point1.Y + offs * line_dy);
+	*dstx = rnd_round((double)line->Point1.X + offs * line_dx);
+	*dsty = rnd_round((double)line->Point1.Y + offs * line_dy);
 }
 
 double pcb_cline_pt_offs(pcb_line_t *line, rnd_coord_t px, rnd_coord_t py)
@@ -215,8 +215,8 @@
 	r = (Radius + r2) / l;
 
 	if ((r >= 0) && (r <= 1)) {
-		ix = pcb_round(Line->Point1.X + r * dx);
-		iy = pcb_round(Line->Point1.Y + r * dy);
+		ix = rnd_round(Line->Point1.X + r * dx);
+		iy = rnd_round(Line->Point1.Y + r * dy);
 		if (!line_ep(Line, ix, iy) && pcb_is_point_on_arc(ix, iy, 1, Arc)) {
 			if (oline)
 				append(r, ix, iy);
@@ -227,8 +227,8 @@
 
 	r = (Radius - r2) / l;
 	if ((r >= 0) && (r <= 1)) {
-		ix = pcb_round(Line->Point1.X + r * dx);
-		iy = pcb_round(Line->Point1.Y + r * dy);
+		ix = rnd_round(Line->Point1.X + r * dx);
+		iy = rnd_round(Line->Point1.Y + r * dy);
 		if (!line_ep(Line, ix, iy) && pcb_is_point_on_arc(ix, iy, 1, Arc)) {
 			if (oline)
 				append(r, ix, iy);
Index: cli.c
===================================================================
--- cli.c	(revision 30941)
+++ cli.c	(revision 30942)
@@ -109,7 +109,7 @@
 		return CLI_INVALID;
 
 	for(p = cli_tnames; p->name != NULL; p++) {
-		if (pcb_strncasecmp(p->name, type, typelen) == 0) {
+		if (rnd_strncasecmp(p->name, type, typelen) == 0) {
 			if (found != NULL)
 				return CLI_INVALID; /* multiple match */
 			found = p;
@@ -426,10 +426,10 @@
 		if (moved) {
 			if ((annot) && (len > 0)) {
 				rnd_coord_t *c = vtc0_alloc_append(&pcb_ddraft_attached.annot_lines, 4);
-				c[0] = pcb_round(lx);
-				c[1] = pcb_round(ly);
-				c[2] = pcb_round(x);
-				c[3] = pcb_round(y);
+				c[0] = rnd_round(lx);
+				c[1] = rnd_round(ly);
+				c[2] = rnd_round(x);
+				c[3] = rnd_round(y);
 			}
 			angle = atan2(y - ly, x - lx) * PCB_RAD_TO_DEG;
 			lx = x;
@@ -441,8 +441,8 @@
 	over:;
 		if (have_angle || have_dist) /* could not apply */
 			return -1;
-	*ox = pcb_round(x);
-	*oy = pcb_round(y);
+	*ox = rnd_round(x);
+	*oy = rnd_round(y);
 	return n;
 }
 
@@ -482,7 +482,7 @@
 		return NULL;
 
 	for(p = ddraft_ops; p->name != NULL; p++) {
-		if (pcb_strncasecmp(p->name, op, oplen) == 0) {
+		if (rnd_strncasecmp(p->name, op, oplen) == 0) {
 			if (found != NULL)
 				return NULL; /* multiple match */
 			found = p;
Index: constraint_gui.c
===================================================================
--- constraint_gui.c	(revision 30941)
+++ constraint_gui.c	(revision 30942)
@@ -66,7 +66,7 @@
 		len -= l; \
 		end += l; \
 	} \
-	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.name, str, pcb_strdup(buff)); \
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.name, str, rnd_strdup(buff)); \
 } while(0)
 
 #define c2g_float(name) \
@@ -140,9 +140,9 @@
 
 static void reset_line(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
 {
-	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle, str, pcb_strdup(""));
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle, str, rnd_strdup(""));
 	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_angle_mod, dbl, 0);
-	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length, str, pcb_strdup(""));
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length, str, rnd_strdup(""));
 	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.line_length_mod, crd, 0);
 	gui2cons(hid_ctx, caller_data, attr);
 }
@@ -149,9 +149,9 @@
 
 static void reset_move(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
 {
-	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle, str, pcb_strdup(""));
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle, str, rnd_strdup(""));
 	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_angle_mod, dbl, 0);
-	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length, str, pcb_strdup(""));
+	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length, str, rnd_strdup(""));
 	PCB_DAD_SET_VALUE(cnstgui_ctx.dlg_hid_ctx, cnstgui_ctx.move_length_mod, crd, 0);
 	gui2cons(hid_ctx, caller_data, attr);
 }