Index: excitation.c
===================================================================
--- excitation.c	(revision 30941)
+++ excitation.c	(revision 30942)
@@ -114,7 +114,7 @@
 			hv.dbl = strtod(orig, &end);
 			if (*end != '\0') {
 				while(isspace(*end)) end++;
-				if (pcb_strcasecmp(end, "hz") != 0) {
+				if (rnd_strcasecmp(end, "hz") != 0) {
 					rnd_message(PCB_MSG_ERROR, "Invalid real value (Hz) in board attribute '%s': '%s'\n", attrkey, orig);
 					hv.dbl = 0;
 				}
@@ -302,7 +302,7 @@
 
 static char *exc_user_get(int idx)
 {
-	return pcb_strdup(rnd_attribute_get(&PCB->Attributes, AEPREFIX "user-defined::script"));
+	return rnd_strdup(rnd_attribute_get(&PCB->Attributes, AEPREFIX "user-defined::script"));
 }
 
 static void exc_user_ser(int idx, int save)
@@ -529,7 +529,7 @@
 {
 	if ((exc_ctx.selected < 0) || (exc_ctx.selected >= sizeof(excitations)/sizeof(excitations[0]))) {
 		rnd_message(PCB_MSG_ERROR, "No excitation selected\n");
-		return pcb_strdup("%% ERROR: no excitation selected\n");
+		return rnd_strdup("%% ERROR: no excitation selected\n");
 	}
 	return excitations[exc_ctx.selected].get(exc_ctx.selected);
 }
Index: export_openems.c
===================================================================
--- export_openems.c	(revision 30941)
+++ export_openems.c	(revision 30942)
@@ -170,12 +170,12 @@
 	}
 
 TODO(": when export dialogs change into DAD, this hack to convert the strings to allocated ones will not be needed anymore")
-	openems_attribute_list[HA_def_copper_cond].default_val.str = pcb_strdup(openems_attribute_list[HA_def_copper_cond].default_val.str);
-	openems_attribute_list[HA_def_subst_epsilon].default_val.str = pcb_strdup(openems_attribute_list[HA_def_subst_epsilon].default_val.str);
-	openems_attribute_list[HA_def_subst_mue].default_val.str = pcb_strdup(openems_attribute_list[HA_def_subst_mue].default_val.str);
-	openems_attribute_list[HA_def_subst_kappa].default_val.str = pcb_strdup(openems_attribute_list[HA_def_subst_kappa].default_val.str);
-	openems_attribute_list[HA_def_subst_sigma].default_val.str = pcb_strdup(openems_attribute_list[HA_def_subst_sigma].default_val.str);
-	openems_attribute_list[HA_void_name].default_val.str = pcb_strdup(openems_attribute_list[HA_void_name].default_val.str);
+	openems_attribute_list[HA_def_copper_cond].default_val.str = rnd_strdup(openems_attribute_list[HA_def_copper_cond].default_val.str);
+	openems_attribute_list[HA_def_subst_epsilon].default_val.str = rnd_strdup(openems_attribute_list[HA_def_subst_epsilon].default_val.str);
+	openems_attribute_list[HA_def_subst_mue].default_val.str = rnd_strdup(openems_attribute_list[HA_def_subst_mue].default_val.str);
+	openems_attribute_list[HA_def_subst_kappa].default_val.str = rnd_strdup(openems_attribute_list[HA_def_subst_kappa].default_val.str);
+	openems_attribute_list[HA_def_subst_sigma].default_val.str = rnd_strdup(openems_attribute_list[HA_def_subst_sigma].default_val.str);
+	openems_attribute_list[HA_void_name].default_val.str = rnd_strdup(openems_attribute_list[HA_void_name].default_val.str);
 
 	if (n)
 		*n = NUM_OPTIONS;
@@ -362,7 +362,7 @@
 
 static void openems_vport_write(wctx_t *ctx, pcb_any_obj_t *o, rnd_coord_t x, rnd_coord_t y, pcb_layergrp_id_t gid1, pcb_layergrp_id_t gid2, const char *port_name)
 {
-	char *end, *s, *safe_name = pcb_strdup(port_name);
+	char *end, *s, *safe_name = rnd_strdup(port_name);
 	const char *att;
 	double resistance = ctx->options[HA_def_port_res].dbl;
 	int act = 1;
@@ -380,9 +380,9 @@
 
 	att = rnd_attribute_get(&o->Attributes, "openems::active");
 	if (att != NULL) {
-		if (pcb_strcasecmp(att, "true") == 0)
+		if (rnd_strcasecmp(att, "true") == 0)
 			act = 1;
-		else if (pcb_strcasecmp(att, "false") == 0)
+		else if (rnd_strcasecmp(att, "false") == 0)
 			act = 0;
 		else
 			rnd_message(PCB_MSG_WARNING, "Ignoring invalid openems::active value for port %s: '%s' (must be true or false)\n", port_name, att);
Index: mesh.c
===================================================================
--- mesh.c	(revision 30941)
+++ mesh.c	(revision 30942)
@@ -635,19 +635,19 @@
 		else if (grp->ltype & PCB_LYT_SUBSTRATE) {
 			rnd_coord_t d, t = mesh->def_subs_thick;
 			double dens = (double)t/(double)lns;
-			bottom_dens = pcb_round(dens);
+			bottom_dens = rnd_round(dens);
 			if (lns != 0) {
 				for(n = 0; n <= lns; n++) {
 					if (n == 0) {
 						if (first) {
 							ytop = y;
-							top_dens = pcb_round(dens);
+							top_dens = rnd_round(dens);
 							first = 0;
 						}
 						else
 							continue;
 					}
-					d = pcb_round((double)y+dens*(double)n);
+					d = rnd_round((double)y+dens*(double)n);
 					mesh_add_result(mesh, PCB_MESH_Z, d);
 				}
 			}
@@ -977,7 +977,7 @@
 
 	if (default_file != NULL) {
 		free(default_file);
-		default_file = pcb_strdup(fname);
+		default_file = rnd_strdup(fname);
 	}
 
 	f = pcb_fopen_askovr(&PCB->hidlib, fname, "w", NULL);
@@ -1007,7 +1007,7 @@
 
 	if (default_file != NULL) {
 		free(default_file);
-		default_file = pcb_strdup(fname);
+		default_file = rnd_strdup(fname);
 	}
 
 	f = pcb_fopen(&PCB->hidlib, fname, "r");
@@ -1039,7 +1039,7 @@
 	free(mesh.ui_name_xy);
 	free((char *)mesh.ui_layer_xy->name); /* we have strdup'd it */
 	mesh.ui_name_xy = pcb_strdup_printf("mesh 0: %s", mesh.layer->name);
-	mesh.ui_layer_xy->name = pcb_strdup(mesh.ui_name_xy);
+	mesh.ui_layer_xy->name = rnd_strdup(mesh.ui_name_xy);
 	pcb_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
 
 	pcb_gui->invalidate_all(pcb_gui);