Index: gerber.c
===================================================================
--- gerber.c	(revision 30941)
+++ gerber.c	(revision 30942)
@@ -542,7 +542,7 @@
 		fprintf(f, "G04 start of page %d for group %ld layer_idx %ld *\r\n", pagecount, group, layer);
 
 		/* Create a portable timestamp. */
-		pcb_print_utc(utcTime, sizeof(utcTime), 0);
+		rnd_print_utc(utcTime, sizeof(utcTime), 0);
 
 		/* Print a cute file header at the beginning of each file. */
 		fprintf(f, "G04 Title: %s, %s *\r\n", PCB_UNKNOWN(PCB->hidlib.name), PCB_UNKNOWN(group_name));
@@ -562,7 +562,7 @@
 		/* build a legal identifier. */
 		if (layername)
 			free(layername);
-		layername = pcb_strdup(filesuff);
+		layername = rnd_strdup(filesuff);
 		if (strrchr(layername, '.'))
 			*strrchr(layername, '.') = 0;
 
@@ -958,7 +958,7 @@
 	if (radius <= 0)
 		return;
 	if (is_drill)
-		radius = 50 * pcb_round(radius / 50.0);
+		radius = 50 * rnd_round(radius / 50.0);
 	use_gc(gc, radius);
 	if (!f)
 		return;