Index: cam.c
===================================================================
--- cam.c	(revision 30941)
+++ cam.c	(revision 30942)
@@ -57,10 +57,10 @@
 		char *fn = pcb_derive_default_filename_(PCB->hidlib.filename, "");
 		char *val, *end = strrchr(fn, RND_DIR_SEPARATOR_C);
 		if (end != NULL)
-			val = pcb_strdup(end+1);
+			val = rnd_strdup(end+1);
 		else
-			val = pcb_strdup(fn);
-		pcb_cam_set_var(ctx->vars, pcb_strdup("base"), val);
+			val = rnd_strdup(fn);
+		pcb_cam_set_var(ctx->vars, rnd_strdup("base"), val);
 		free(fn);
 	}
 }
@@ -112,7 +112,7 @@
 
 static int cam_parse_opt_outfile(cam_ctx_t *ctx, const char *optval)
 {
-	char *fn, *tmp = pcb_strdup(optval);
+	char *fn, *tmp = rnd_strdup(optval);
 	int dirlen = prefix_mkdir(tmp, &fn);
 
 	free(ctx->prefix);
@@ -124,7 +124,7 @@
 	}
 	else
 		ctx->prefix = NULL;
-	pcb_cam_set_var(ctx->vars, pcb_strdup("base"), pcb_strdup(fn));
+	pcb_cam_set_var(ctx->vars, rnd_strdup("base"), rnd_strdup(fn));
 	free(tmp);
 	return 0;
 }
@@ -136,8 +136,8 @@
 	if (sep == NULL)
 		return 1;
 
-	key = pcb_strndup(opt, sep-opt);
-	val = pcb_strdup(sep+1);
+	key = rnd_strndup(opt, sep-opt);
+	val = rnd_strdup(sep+1);
 	pcb_cam_set_var(ctx->vars, key, val);
 	return 0;
 }
@@ -176,7 +176,7 @@
 		}
 	}
 
-	if (pcb_strcasecmp(cmd, "gui") == 0) {
+	if (rnd_strcasecmp(cmd, "gui") == 0) {
 		rs = cam_gui(RND_ACT_HIDLIB, arg);
 	}
 	else {
@@ -186,12 +186,12 @@
 			RND_ACT_IRES(1);
 			return 0;
 		}
-		if (pcb_strcasecmp(cmd, "exec") == 0) {
+		if (rnd_strcasecmp(cmd, "exec") == 0) {
 			rs = cam_compile(&ctx, arg);
 			if (rs == 0)
 				rs = cam_exec(&ctx);
 		}
-		else if (pcb_strcasecmp(cmd, "call") == 0)
+		else if (rnd_strcasecmp(cmd, "call") == 0)
 			rs = cam_call(arg, &ctx);
 	}
 
@@ -234,7 +234,7 @@
 
 	cam_export_has_outfile = 0;
 	cam_init_inst(&cam_export_ctx);
-	cam_export_job = pcb_strdup((*argv)[0]);
+	cam_export_job = rnd_strdup((*argv)[0]);
 	oargc = (*argc);
 	(*argc)--;
 	for(d = 0, s = 1; s < oargc; s++) {
Index: cam_compile.c
===================================================================
--- cam_compile.c	(revision 30941)
+++ cam_compile.c	(revision 30942)
@@ -186,11 +186,11 @@
 
 	if (strcmp(cmd, "desc") == 0) {
 		code->inst = PCB_CAM_DESC;
-		code->op.desc.arg = pcb_strdup(arg);
+		code->op.desc.arg = rnd_strdup(arg);
 	}
 	else if (strcmp(cmd, "write") == 0) {
 		code->inst = PCB_CAM_WRITE;
-		code->op.write.arg = pcb_strdup(arg);
+		code->op.write.arg = rnd_strdup(arg);
 	}
 	else if (strcmp(cmd, "partial") == 0) {
 		ctx->has_partial = 1;
@@ -198,7 +198,7 @@
 		if ((arg == NULL) || (*arg == '\0'))
 			code->op.partial.arg = NULL;
 		else
-			code->op.partial.arg = pcb_strdup(arg);
+			code->op.partial.arg = rnd_strdup(arg);
 	}
 	else if (strcmp(cmd, "full") == 0) {
 		code->inst = PCB_CAM_PARTIAL;
@@ -222,7 +222,7 @@
 		}
 		free(ctx->args);
 
-		curr = pcb_strdup(curr == NULL ? "" : curr);
+		curr = rnd_strdup(curr == NULL ? "" : curr);
 		for(maxa = 0, s = curr; *s != '\0'; s++)
 			if (isspace(*s))
 				maxa++;
@@ -242,7 +242,7 @@
 			}
 			if (*curr == '\0')
 				continue;
-			code->op.plugin.argv[code->op.plugin.argc] = pcb_strdup(curr);
+			code->op.plugin.argv[code->op.plugin.argc] = rnd_strdup(curr);
 			code->op.plugin.argc++;
 			
 		}
@@ -257,7 +257,7 @@
 
 static int cam_compile(cam_ctx_t *ctx, const char *script_in)
 {
-	char *arg, *curr, *next, *script = pcb_strdup(script_in);
+	char *arg, *curr, *next, *script = rnd_strdup(script_in);
 	int res = 0, r;
 
 	for(curr = script; curr != NULL; curr = next) {
Index: cam_gui.c
===================================================================
--- cam_gui.c	(revision 30941)
+++ cam_gui.c	(revision 30942)
@@ -53,7 +53,7 @@
 	/* remember cursor */
 	r = pcb_dad_tree_get_selected(attr);
 	if (r != NULL)
-		cursor_path = pcb_strdup(r->cell[0]);
+		cursor_path = rnd_strdup(r->cell[0]);
 
 	/* remove existing items */
 	pcb_dad_tree_clear(tree);
@@ -66,7 +66,7 @@
 
 		cell[1] = NULL;
 		conf_loop_list(cn->val.list, item, idx) {
-			cell[0] = pcb_strdup(item->name);
+			cell[0] = rnd_strdup(item->name);
 			pcb_dad_tree_append(attr, NULL, cell);
 		}
 	}
@@ -115,7 +115,7 @@
 					cell[2] = "<none>";
 
 				if (plugin != NULL)
-					cell[1] = pcb_strdup(plugin->op.plugin.exporter->name);
+					cell[1] = rnd_strdup(plugin->op.plugin.exporter->name);
 				else
 					cell[1] = "<NO PLUGIN>";
 
@@ -147,7 +147,7 @@
 	/* remember cursor */
 	r = pcb_dad_tree_get_selected(attr);
 	if (r != NULL)
-		cursor_path = pcb_strdup(r->cell[0]);
+		cursor_path = rnd_strdup(r->cell[0]);
 
 	/* remove existing items */
 	pcb_dad_tree_clear(tree);
@@ -154,8 +154,8 @@
 
 	/* add all new items */
 	for(e = htsp_first(vars); e != NULL; e = htsp_next(vars, e)) {
-		cell[0] = pcb_strdup(e->key);
-		cell[1] = pcb_strdup(e->value);
+		cell[0] = rnd_strdup(e->key);
+		cell[1] = rnd_strdup(e->value);
 		cell[2] = NULL;
 		pcb_dad_tree_append(attr, NULL, cell);
 	}
@@ -207,7 +207,7 @@
 static char *kill_tabs(const char *str_in)
 {
 	char *res, *o;
-	res = pcb_strdup(str_in);
+	res = rnd_strdup(str_in);
 	for(o = res; *o != '\0'; o++)
 		if (*o == '\t')
 			*o = ' ';