Index: act.c
===================================================================
--- act.c	(revision 30941)
+++ act.c	(revision 30942)
@@ -59,7 +59,7 @@
 
 		RND_PCB_ACT_CONVARG(1, FGW_STR, Zoom, vp = argv[1].val.str);
 
-		if (pcb_strcasecmp(vp, "selected") == 0) {
+		if (rnd_strcasecmp(vp, "selected") == 0) {
 			rnd_box_t sb;
 			if (pcb_get_selection_bbox(&sb, PCB->Data) > 0)
 				pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
@@ -68,7 +68,7 @@
 			return 0;
 		}
 
-		if (pcb_strcasecmp(vp, "found") == 0) {
+		if (rnd_strcasecmp(vp, "found") == 0) {
 			rnd_box_t sb;
 			if (pcb_get_found_bbox(&sb, PCB->Data) > 0)
 				pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
@@ -175,7 +175,7 @@
 	pcb_draw_inhibit_dec();
 
 /*pcb_trace("-jump-> %mm;%mm -> %mm;%mm\n", x, y, (rnd_coord_t)(x + xoffs), (rnd_coord_t)(y + yoffs));*/
-	pcb_gui->pan(pcb_gui, pcb_round(x + xoffs), pcb_round(y + yoffs), 0);
+	pcb_gui->pan(pcb_gui, rnd_round(x + xoffs), rnd_round(y + yoffs), 0);
 	pcb_gui->set_crosshair(pcb_gui, x, y, HID_SC_PAN_VIEWPORT);
 
 	pcb_gui->invalidate_all(pcb_gui);
@@ -277,8 +277,8 @@
 	RND_PCB_ACT_CONVARG(1, FGW_LAYER, LayerHotkey, ly = fgw_layer(&argv[1]));
 	RND_PCB_ACT_CONVARG(2, FGW_STR, LayerHotkey, op = argv[2].val.str);
 
-	if (pcb_strcasecmp(op, "select") == 0)   { key = "pcb-rnd::key::select"; title = "set layer selection hotkey"; }
-	else if (pcb_strcasecmp(op, "vis") == 0) { key = "pcb-rnd::key::vis"; title = "set layer visibility hotkey"; }
+	if (rnd_strcasecmp(op, "select") == 0)   { key = "pcb-rnd::key::select"; title = "set layer selection hotkey"; }
+	else if (rnd_strcasecmp(op, "vis") == 0) { key = "pcb-rnd::key::vis"; title = "set layer visibility hotkey"; }
 	else RND_ACT_FAIL(LayerHotkey);
 
 	msg =
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 30941)
+++ routest_dlg.c	(revision 30942)
@@ -98,8 +98,8 @@
 
 	for(a = rst->attr.List, n = 0; n < rst->attr.Number; a++,n++) {
 		char *cell[3]= {NULL};
-		cell[0] = pcb_strdup(a->name);
-		cell[1] = pcb_strdup(a->value);
+		cell[0] = rnd_strdup(a->name);
+		cell[1] = rnd_strdup(a->value);
 		pcb_dad_tree_append(attr, NULL, cell);
 	}
 
@@ -178,12 +178,12 @@
 			PCB_DAD_STRING(dlg);
 				wkey = PCB_DAD_CURRENT(dlg);
 				if (*key != NULL)
-					PCB_DAD_DEFAULT_PTR(dlg, pcb_strdup(*key));
+					PCB_DAD_DEFAULT_PTR(dlg, rnd_strdup(*key));
 			PCB_DAD_LABEL(dlg, "value");
 			PCB_DAD_STRING(dlg);
 				wval = PCB_DAD_CURRENT(dlg);
 				if (*val != NULL)
-					PCB_DAD_DEFAULT_PTR(dlg, pcb_strdup(*val));
+					PCB_DAD_DEFAULT_PTR(dlg, rnd_strdup(*val));
 		PCB_DAD_BUTTON_CLOSES(dlg, clbtn);
 	PCB_DAD_END(dlg);
 
@@ -190,8 +190,8 @@
 	PCB_DAD_NEW("route_style_attr", dlg, "Edit route style attribute", NULL, pcb_true, NULL);
 	res = PCB_DAD_RUN(dlg);
 	if (res == 0) {
-		*key = pcb_strdup(dlg[wkey].val.str);
-		*val = pcb_strdup(dlg[wval].val.str);
+		*key = rnd_strdup(dlg[wkey].val.str);
+		*val = rnd_strdup(dlg[wval].val.str);
 	}
 	PCB_DAD_FREE(dlg);
 	return res;