Index: mentor_sch.c
===================================================================
--- mentor_sch.c	(revision 30902)
+++ mentor_sch.c	(revision 30903)
@@ -149,7 +149,7 @@
 		}
 	}
 	if (cnt == 0)
-		pcb_message(PCB_MSG_WARNING, "Couldn't find any part map rules - check your map_search_paths and rule files\n");
+		rnd_message(PCB_MSG_WARNING, "Couldn't find any part map rules - check your map_search_paths and rule files\n");
 
 	for(contents = view->children; contents != NULL; contents = contents->next) {
 		if (strcmp(contents->str, "contents") == 0) {
@@ -173,7 +173,7 @@
 
 	/* check the header */
 	if (strcmp(dom->root->str, "edif") != 0) {
-		pcb_message(PCB_MSG_ERROR, "Invalid mentor edf header: not an EDIF file\n");
+		rnd_message(PCB_MSG_ERROR, "Invalid mentor edf header: not an EDIF file\n");
 		return -1;
 	}
 
@@ -224,7 +224,7 @@
 
 	fn = pcb_fopen(NULL, fname_net, "r");
 	if (fn == NULL) {
-		pcb_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net);
+		rnd_message(PCB_MSG_ERROR, "can't open file '%s' for read\n", fname_net);
 		return -1;
 	}
 
@@ -244,7 +244,7 @@
 		ret = mentor_parse_tree(&dom);
 	}
 	else {
-		pcb_message(PCB_MSG_ERROR, "Invalid mentor edf: not a valid s-expression file near %d:%d\n", dom.parse.line, dom.parse.col);
+		rnd_message(PCB_MSG_ERROR, "Invalid mentor edf: not a valid s-expression file near %d:%d\n", dom.parse.line, dom.parse.col);
 		ret = -1;
 	}
 
@@ -291,7 +291,7 @@
 static int mentor_sch_import(pcb_plug_import_t *ctx, unsigned int aspects, const char **fns, int numfns)
 {
 	if (numfns != 1) {
-		pcb_message(PCB_MSG_ERROR, "import_mentor_sch: requires exactly 1 input file name\n");
+		rnd_message(PCB_MSG_ERROR, "import_mentor_sch: requires exactly 1 input file name\n");
 		return -1;
 	}
 	return mentor_sch_load(fns[0]);
Index: netlist_helper.c
===================================================================
--- netlist_helper.c	(revision 30902)
+++ netlist_helper.c	(revision 30903)
@@ -121,13 +121,13 @@
 	int prio;
 
 	if (argc != 5) {
-		pcb_message(PCB_MSG_ERROR, "Loading part map: wrong number of fields %d in %s:%d - expected 5 - ignoring this rule\n", argc, fn, lineno);
+		rnd_message(PCB_MSG_ERROR, "Loading part map: wrong number of fields %d in %s:%d - expected 5 - ignoring this rule\n", argc, fn, lineno);
 		return -1;
 	}
 	if (*argv[0] != '*') {
 		prio = strtol(argv[0], &end, 10);
 		if (*end != '\0') {
-			pcb_message(PCB_MSG_ERROR, "Loading part map: invaid priority '%s' in %s:%d - ignoring this rule\n", argv[0], fn, lineno);
+			rnd_message(PCB_MSG_ERROR, "Loading part map: invaid priority '%s' in %s:%d - ignoring this rule\n", argv[0], fn, lineno);
 			return -1;
 		}
 	}
@@ -135,13 +135,13 @@
 		prio = nethlp_prio_always;
 	kr = re_se_comp(argv[1]);
 	if (kr == NULL) {
-		pcb_message(PCB_MSG_ERROR, "Loading part map: can't compile attribute name regex in %s:%d - ignoring this rule\n", fn, lineno);
+		rnd_message(PCB_MSG_ERROR, "Loading part map: can't compile attribute name regex in %s:%d - ignoring this rule\n", fn, lineno);
 		return -1;
 	}
 	vr = re_se_comp(argv[2]);
 	if (vr == NULL) {
 		re_se_free(kr);
-		pcb_message(PCB_MSG_ERROR, "Loading part map: can't compile attribute value regex in %s:%d - ignoring this rule\n", fn, lineno);
+		rnd_message(PCB_MSG_ERROR, "Loading part map: can't compile attribute value regex in %s:%d - ignoring this rule\n", fn, lineno);
 		return -1;
 	}
 
@@ -260,7 +260,7 @@
 /*		printf("Elem '%s' -> %s:%s:%s\n", ectx->id, refdes, footprint, value);*/
 	}
 	else
-		pcb_message(PCB_MSG_ERROR, "Ignoring part %s: no refdes\n", ectx->id);
+		rnd_message(PCB_MSG_ERROR, "Ignoring part %s: no refdes\n", ectx->id);
 
 	/* free */
 	for (e = htsp_first(&ectx->attr); e; e = htsp_next(&ectx->attr, e)) {
@@ -293,7 +293,7 @@
 	char *refdes = htsp_get(&nctx->nhctx->id2refdes, part);
 	char term[256];
 	if (refdes == NULL) {
-		pcb_message(PCB_MSG_ERROR, "nethelper: can't resolve refdes of part %s\n", part);
+		rnd_message(PCB_MSG_ERROR, "nethelper: can't resolve refdes of part %s\n", part);
 	}
 	pcb_snprintf(term, sizeof(term), "%s-%s", refdes, pin);
 	rnd_actionva(hl, "Netlist", "Add",  nctx->netname, term, NULL);