Index: extedit.c
===================================================================
--- extedit.c	(revision 30941)
+++ extedit.c	(revision 30942)
@@ -122,7 +122,7 @@
 	fc = pcb_popen(&PCB->hidlib, cmd, "r");
 
 	if (pcb_gui != NULL) {
-		int fd = pcb_fileno(fc);
+		int fd = rnd_fileno(fc);
 		if (fd > 0) {
 			int n = 0;
 			pcb_hidval_t hd;
@@ -137,7 +137,7 @@
 					n++;
 					pcb_hid_progress(50+sin((double)n/10.0)*40, 100, "Invoked external editor. Please edit, save and close there to finish this operation");
 				}
-				pcb_ms_sleep(50);
+				rnd_ms_sleep(50);
 			}
 		}
 		else
@@ -148,7 +148,7 @@
 
 		if (pcb_gui != NULL) {
 			pcb_hid_progress(50, 100, "Invoked external editor. Please edit, save and close there to finish this operation");
-			pcb_ms_sleep(1000); /* ugly hack: give the GUI some time to flush */
+			rnd_ms_sleep(1000); /* ugly hack: give the GUI some time to flush */
 		}
 		while(!(feof(fc))) {
 			char tmp[128];
@@ -184,7 +184,7 @@
 	rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, extedit, method = argv[2].val.str);
 
 	/* pick up the object to edit */
-	if ((cmd == NULL) || (pcb_strcasecmp(cmd, "object") == 0)) {
+	if ((cmd == NULL) || (rnd_strcasecmp(cmd, "object") == 0)) {
 		rnd_coord_t x, y;
 		rnd_hid_get_coords("Click on object to edit", &x, &y, 0);
 		type = pcb_search_screen(x, y, EXTEDIT_TYPES, &ptr1, &ptr2, &ptr3);
@@ -197,7 +197,7 @@
 		}
 		paste = 1;
 	}
-	else if ((argc > 1) && (pcb_strcasecmp(cmd, "selected") == 0)) {
+	else if ((argc > 1) && (rnd_strcasecmp(cmd, "selected") == 0)) {
 		pcb_buffer_set_number(bn);
 		pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
 		pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, pcb_crosshair.X, pcb_crosshair.Y, pcb_false, pcb_false);
@@ -210,7 +210,7 @@
 			goto quit0;
 		}
 	}
-	else if ((argc > 1) && (pcb_strcasecmp(cmd, "buffer") == 0)) {
+	else if ((argc > 1) && (rnd_strcasecmp(cmd, "buffer") == 0)) {
 		load_bn = bn = conf_core.editor.buffer_number;
 		if (pcb_data_is_empty(PCB_PASTEBUFFER->Data)) {
 			rnd_message(PCB_MSG_WARNING, "Nothing in current buffer, can't ext-edit selection\n");
@@ -226,7 +226,7 @@
 	/* determine the method */
 	if (argc > 2) {
 		for(mth = methods; mth->name != NULL; mth++) {
-			if (pcb_strcasecmp(mth->name, method) == 0)
+			if (rnd_strcasecmp(mth->name, method) == 0)
 				break;
 		}
 		if (mth->name == NULL) {
Index: extedit_dad.c
===================================================================
--- extedit_dad.c	(revision 30941)
+++ extedit_dad.c	(revision 30942)
@@ -39,7 +39,7 @@
 {
 	PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wmethod, lng, ee->mthi);
 	PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wfmt, lng, methods[ee->mthi].fmt);
-	PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wcmd, str, pcb_strdup(methods[ee->mthi].command));
+	PCB_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wcmd, str, rnd_strdup(methods[ee->mthi].command));
 
 	/* we have only one format, so disable the combo box for selecting it */
 	pcb_gui->attr_dlg_widget_state(ee->dlg_hid_ctx, ee->wfmt, pcb_false);
@@ -68,7 +68,7 @@
 	if (lock)
 		return;
 
-	methods[ee->mthi].command = pcb_strdup(ee->dlg[ee->wcmd].val.str);
+	methods[ee->mthi].command = rnd_strdup(ee->dlg[ee->wcmd].val.str);
 
 	lock = 1;
 	ee_data2dialog(ee);