Index: attribs.c
===================================================================
--- attribs.c	(revision 30941)
+++ attribs.c	(revision 30942)
@@ -115,7 +115,7 @@
 			if (nv == NULL)
 				continue;
 			if (nv->type == CFN_LIST) {
-				char *tmp = pcb_strdup(pcb->Attributes.List[n].value);
+				char *tmp = rnd_strdup(pcb->Attributes.List[n].value);
 				char *next, *curr;
 				for(curr = tmp; curr != NULL; curr = next) {
 					next = strstr(curr, LISTSEP);
Index: file.c
===================================================================
--- file.c	(revision 30941)
+++ file.c	(revision 30942)
@@ -583,12 +583,12 @@
 	/* The old PCB format encodes some properties in layer names - have to
 	   alter the real layer name before save to get the same effect */
 	if (PCB_LAYER_IS_OUTLINE(lflg, purpi)) {
-		if (pcb_strcasecmp(name, "outline") == 0)
+		if (rnd_strcasecmp(name, "outline") == 0)
 			return name;
 		return "Outline";
 	}
 	if (lflg & PCB_LYT_SILK) {
-		if (pcb_strcasecmp(name, "silk") == 0)
+		if (rnd_strcasecmp(name, "silk") == 0)
 			return name;
 		return "silk";
 	}
@@ -866,7 +866,7 @@
 	if (pcb->Data->LayerN >= PCB_MAX_LAYER)
 		return -1;
 	lid = pcb->Data->LayerN;
-	pcb->Data->Layer[lid].name = pcb_strdup(name);
+	pcb->Data->Layer[lid].name = rnd_strdup(name);
 	pcb->Data->Layer[lid].parent.data = pcb->Data;
 	pcb->Data->Layer[lid].parent_type = PCB_PARENT_DATA;
 	pcb->Data->Layer[lid].type = PCB_OBJ_LAYER;
@@ -894,7 +894,7 @@
 	for(lid = 0; lid < PCB_MAX_LAYER; lid++) {
 		if (pcb->Data->Layer[lid].meta.real.grp == 0) {
 			free((char *)pcb->Data->Layer[lid].name);
-			pcb->Data->Layer[lid].name = pcb_strdup(name);
+			pcb->Data->Layer[lid].name = rnd_strdup(name);
 			pcb->Data->Layer[lid].parent.data = pcb->Data;
 			pcb->Data->Layer[lid].parent_type = PCB_PARENT_DATA;
 			pcb->Data->Layer[lid].type = PCB_OBJ_LAYER;
@@ -929,7 +929,7 @@
 			else {
 				if (*pcb->Data->Layer[lid].name == '\0') {
 					free((char *)pcb->Data->Layer[lid].name);
-					pcb->Data->Layer[lid].name = pcb_strdup("anonymous");
+					pcb->Data->Layer[lid].name = rnd_strdup("anonymous");
 				}
 				if (lid == 0)
 					pcb_layergrp_list(PCB, PCB_LYT_TOP | PCB_LYT_COPPER, &gid, 1);
Index: parse_l.c
===================================================================
--- parse_l.c	(revision 30941)
+++ parse_l.c	(revision 30942)
@@ -1484,7 +1484,7 @@
 case 47:
 YY_RULE_SETUP
 #line 160 "parse_l.l"
-{	pcb_lval.integer = pcb_round (strtod (yytext, NULL)); return INTEGER; }
+{	pcb_lval.integer = rnd_round(strtod (yytext, NULL)); return INTEGER; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
@@ -2901,7 +2901,7 @@
 /*		printf("tag:%s=%s:\n", key,val); */
 		if (strcmp(key, "name") == 0) {
 			free(yyFont->name);
-			yyFont->name = pcb_strdup(val);
+			yyFont->name = rnd_strdup(val);
 		}
 	}
 }
Index: parse_l.l
===================================================================
--- parse_l.l	(revision 30941)
+++ parse_l.l	(revision 30942)
@@ -156,7 +156,7 @@
 						return(CHAR_CONST);
 					}
 {FLOATING}		{	return parse_number(); }
-{INTEGER}		{	pcb_lval.integer = pcb_round (strtod (yytext, NULL)); return INTEGER; }
+{INTEGER}		{	pcb_lval.integer = rnd_round(strtod (yytext, NULL)); return INTEGER; }
 
 {HEX}			{	unsigned n;
 				sscanf((char *) yytext, "%x", &n);
@@ -518,7 +518,7 @@
 /*		printf("tag:%s=%s:\n", key,val); */
 		if (strcmp(key, "name") == 0) {
 			free(yyFont->name);
-			yyFont->name = pcb_strdup(val);
+			yyFont->name = rnd_strdup(val);
 		}
 	}
 }
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 30941)
+++ parse_y.c	(revision 30942)
@@ -1894,13 +1894,13 @@
 		    if (yyElemFixLayers) {
 		    	yyData->LayerN = 2;
 		    	free((char *)yyData->Layer[0].name);
-		    	yyData->Layer[0].name = pcb_strdup("top-silk");
+		    	yyData->Layer[0].name = rnd_strdup("top-silk");
 		    	yyData->Layer[0].parent_type = PCB_PARENT_DATA;
 		    	yyData->Layer[0].parent.data = yyData;
 		    	yyData->Layer[0].is_bound = 1;
 		    	yyData->Layer[0].meta.bound.type = PCB_LYT_SILK | PCB_LYT_TOP;
 		    	free((char *)yyData->Layer[1].name);
-		    	yyData->Layer[1].name = pcb_strdup("bottom-silk");
+		    	yyData->Layer[1].name = rnd_strdup("bottom-silk");
 		    	yyData->Layer[1].parent_type = PCB_PARENT_DATA;
 		    	yyData->Layer[1].parent.data = yyData;
 		    	yyData->Layer[1].is_bound = 1;
@@ -3297,7 +3297,7 @@
 do_measure (PLMeasure *m, rnd_coord_t i, double d, int u)
 {
   m->ival = i;
-  m->bval = pcb_round (d);
+  m->bval = rnd_round(d);
   m->dval = d;
   m->has_units = u;
 }
@@ -3317,7 +3317,7 @@
     return m.bval;
   if (m.ival != 0)
     pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */
-  return pcb_round (PCB_MIL_TO_COORD (m.ival));
+  return rnd_round(PCB_MIL_TO_COORD (m.ival));
 }
 
 static rnd_coord_t
@@ -3328,7 +3328,7 @@
   if (m.dval != 0)
     pcb_io_pcb_usty_seen |= PCB_USTY_CMIL;
   /* if there's no unit m.dval already contains the converted value */
-  return pcb_round (m.dval);
+  return rnd_round(m.dval);
 }
 
 /* This converts old flag bits (from saved PCB files) to new format.  */
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 30941)
+++ parse_y.y	(revision 30942)
@@ -234,13 +234,13 @@
 		    if (yyElemFixLayers) {
 		    	yyData->LayerN = 2;
 		    	free((char *)yyData->Layer[0].name);
-		    	yyData->Layer[0].name = pcb_strdup("top-silk");
+		    	yyData->Layer[0].name = rnd_strdup("top-silk");
 		    	yyData->Layer[0].parent_type = PCB_PARENT_DATA;
 		    	yyData->Layer[0].parent.data = yyData;
 		    	yyData->Layer[0].is_bound = 1;
 		    	yyData->Layer[0].meta.bound.type = PCB_LYT_SILK | PCB_LYT_TOP;
 		    	free((char *)yyData->Layer[1].name);
-		    	yyData->Layer[1].name = pcb_strdup("bottom-silk");
+		    	yyData->Layer[1].name = rnd_strdup("bottom-silk");
 		    	yyData->Layer[1].parent_type = PCB_PARENT_DATA;
 		    	yyData->Layer[1].parent.data = yyData;
 		    	yyData->Layer[1].is_bound = 1;
@@ -1393,7 +1393,7 @@
 do_measure (PLMeasure *m, rnd_coord_t i, double d, int u)
 {
   m->ival = i;
-  m->bval = pcb_round (d);
+  m->bval = rnd_round(d);
   m->dval = d;
   m->has_units = u;
 }
@@ -1413,7 +1413,7 @@
     return m.bval;
   if (m.ival != 0)
     pcb_io_pcb_usty_seen |= PCB_USTY_CMIL; /* ... because we can't save in mil */
-  return pcb_round (PCB_MIL_TO_COORD (m.ival));
+  return rnd_round(PCB_MIL_TO_COORD (m.ival));
 }
 
 static rnd_coord_t
@@ -1424,7 +1424,7 @@
   if (m.dval != 0)
     pcb_io_pcb_usty_seen |= PCB_USTY_CMIL;
   /* if there's no unit m.dval already contains the converted value */
-  return pcb_round (m.dval);
+  return rnd_round(m.dval);
 }
 
 /* This converts old flag bits (from saved PCB files) to new format.  */