Index: hyp_l.c
===================================================================
--- hyp_l.c	(revision 30941)
+++ hyp_l.c	(revision 30942)
@@ -2205,7 +2205,7 @@
 #line 28 "hyp_l.l"
 #include <stdlib.h>
 
-char *pcb_strdup(const char *s); /* from #include <librnd/core/compat_misc.h> */
+char *rnd_strdup(const char *s); /* from #include <librnd/core/compat_misc.h> */
 
 #include "hyp_y.h"
 
@@ -3492,7 +3492,7 @@
 case 127:
 YY_RULE_SETUP
 #line 328 "hyp_l.l"
-{ yyless(0); BEGIN INITIAL; hyylval.strval = pcb_strdup(""); return H_STRING; } /* emit empty string and reprocess */
+{ yyless(0); BEGIN INITIAL; hyylval.strval = rnd_strdup(""); return H_STRING; } /* emit empty string and reprocess */
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
@@ -3506,7 +3506,7 @@
                         REJECT 
                       else 
                       { 
-                        char *s = pcb_strdup(hyytext);
+                        char *s = rnd_strdup(hyytext);
   
                         BEGIN INITIAL; 
   
@@ -3573,7 +3573,7 @@
                         else 
                         { 
                           BEGIN INITIAL; 
-                          hyylval.strval = pcb_strdup(hyytext); 
+                          hyylval.strval = rnd_strdup(hyytext); 
                           return H_STRING;
                         }
                       }
Index: hyp_l.l
===================================================================
--- hyp_l.l	(revision 30941)
+++ hyp_l.l	(revision 30942)
@@ -27,7 +27,7 @@
 %{
 #include <stdlib.h>
 
-char *pcb_strdup(const char *s); /* from #include <librnd/core/compat_misc.h> */
+char *rnd_strdup(const char *s); /* from #include <librnd/core/compat_misc.h> */
 
 #include "hyp_y.h"
 
@@ -324,7 +324,7 @@
                      */
 <STATE_STRING>{
 
-{EMPTY_STRING}      { yyless(0); BEGIN INITIAL; hyylval.strval = pcb_strdup(""); return H_STRING; } /* emit empty string and reprocess */
+{EMPTY_STRING}      { yyless(0); BEGIN INITIAL; hyylval.strval = rnd_strdup(""); return H_STRING; } /* emit empty string and reprocess */
 
 {STRING_W_SPACES}   {
                       /*
@@ -335,7 +335,7 @@
                         REJECT 
                       else 
                       { 
-                        char *s = pcb_strdup(hyytext);
+                        char *s = rnd_strdup(hyytext);
   
                         BEGIN INITIAL; 
   
@@ -382,7 +382,7 @@
                         else 
                         { 
                           BEGIN INITIAL; 
-                          hyylval.strval = pcb_strdup(hyytext); 
+                          hyylval.strval = rnd_strdup(hyytext); 
                           return H_STRING;
                         }
                       }
Index: parser.c
===================================================================
--- parser.c	(revision 30941)
+++ parser.c	(revision 30942)
@@ -1029,7 +1029,7 @@
 		rnd_message(PCB_MSG_ERROR, "error: negative arc precision\n");
 
 	/* A full circle is drawn using 'segments' segments; a 90 degree arc using segments/4. */
-	poly_points = pcb_round(segments * fabs(beta - alpha) / (2 * M_PI));
+	poly_points = rnd_round(segments * fabs(beta - alpha) / (2 * M_PI));
 
 	/* Sanity checks */
 	if (poly_points < 1)
@@ -1621,25 +1621,25 @@
 	/* add device to list  */
 	new_device = calloc(sizeof(device_t), 1);
 
-	new_device->ref = pcb_strdup(h->ref);
+	new_device->ref = rnd_strdup(h->ref);
 
 	new_device->name = NULL;
 	if (h->name_set)
-		new_device->name = pcb_strdup(h->name);
+		new_device->name = rnd_strdup(h->name);
 
 
 	new_device->value = NULL;
 	if (h->value_string_set)
-		new_device->value = pcb_strdup(h->value_string);
+		new_device->value = rnd_strdup(h->value_string);
 	else if (h->value_float_set) {
 		/* convert double to string */
 		pcb_snprintf(value, sizeof(value), "%f", h->value_float);
-		new_device->value = pcb_strdup(value);
+		new_device->value = rnd_strdup(value);
 	}
 
 	new_device->layer_name = NULL;
 	if (h->layer_name_set)
-		new_device->layer_name = pcb_strdup(h->layer_name);
+		new_device->layer_name = rnd_strdup(h->layer_name);
 
 	new_device->next = device_head;
 	device_head = new_device;
@@ -1730,7 +1730,7 @@
 		current_pstk = malloc(sizeof(padstack_t));
 		if (current_pstk == NULL)
 			return 1;									/*malloc failed */
-		current_pstk->name = pcb_strdup(h->padstack_name);
+		current_pstk->name = rnd_strdup(h->padstack_name);
 		current_pstk->drill_size = xy2coord(h->drill_size);
 		current_pstk_element = malloc(sizeof(padstack_element_t));
 		current_pstk->padstack = current_pstk_element;
@@ -1745,7 +1745,7 @@
 
 	/* fill in values */
 
-	current_pstk_element->layer_name = pcb_strdup(h->layer_name);
+	current_pstk_element->layer_name = rnd_strdup(h->layer_name);
 	current_pstk_element->pad_shape = h->pad_shape;
 	current_pstk_element->pad_sx = xy2coord(h->pad_sx);
 	current_pstk_element->pad_sy = xy2coord(h->pad_sy);
@@ -1893,11 +1893,11 @@
 	if (ref != NULL) {
 		char *dot;
 		/* reference has format 'device_name.pin_name' */
-		device_name = pcb_strdup(ref);
+		device_name = rnd_strdup(ref);
 		dot = strrchr(device_name, '.');
 		if (dot != NULL) {
 			*dot = '\0';
-			pin_name = pcb_strdup(dot + 1);
+			pin_name = rnd_strdup(dot + 1);
 		}
 
 		/* make sure device and pin name have valid values, even if reference has wrong format */
@@ -1943,7 +1943,7 @@
 	if (hyp_debug)
 		rnd_message(PCB_MSG_DEBUG, "net: net_name = \"%s\"\n", h->net_name);
 
-	net_name = pcb_strdup(h->net_name);
+	net_name = rnd_strdup(h->net_name);
 	net_clearance = -1;
 
 	return 0;
Index: write.c
===================================================================
--- write.c	(revision 30941)
+++ write.c	(revision 30942)
@@ -94,7 +94,7 @@
 		if (dup)
 			name = pcb_strdup_printf("%s___%d", name, n);
 		else
-			name = pcb_strdup(name);
+			name = rnd_strdup(name);
 		htpp_set(&wr->grp_names, grp, (char *)name);
 	}
 	return name;
@@ -129,7 +129,7 @@
 {
 	char dt[128];
 
-	pcb_print_utc(dt, sizeof(dt), 0);
+	rnd_print_utc(dt, sizeof(dt), 0);
 
 	fprintf(wr->f, "* %s exported by pcb-rnd " PCB_VERSION " (" PCB_REVISION ") on %s\n", wr->pcb->hidlib.filename, dt);
 	fprintf(wr->f, "* Board: %s\n", wr->pcb->hidlib.name);