Index: parse_l.c
===================================================================
--- parse_l.c	(revision 31016)
+++ parse_l.c	(revision 31017)
@@ -2621,7 +2621,7 @@
 			else
 				sprintf(tmps, "%s", Filename);
 
-			yyin = pcb_fopen(NULL, tmps, "r");
+			yyin = rnd_fopen(NULL, tmps, "r");
 			if (!yyin) {
 				free(tmps);
 				return (1);
@@ -2637,7 +2637,7 @@
 			p.hidlib = &PCB->hidlib;
 			command = rnd_build_argfn(Executable, &p);
 			/* open pipe to stdout of command */
-			if (*command == '\0' || (yyin = pcb_popen(NULL, command, "r")) == NULL) {
+			if (*command == '\0' || (yyin = rnd_popen(NULL, command, "r")) == NULL) {
 				rnd_popen_error_message(command);
 				free(command);
 				return (1);
@@ -2685,7 +2685,7 @@
 		return returncode;
 
 	if (used_popen)
-		return (pcb_pclose(yyin) ? 1 : returncode);
+		return (rnd_pclose(yyin) ? 1 : returncode);
 	return (fclose(yyin) ? 1 : returncode);
 }
 
Index: parse_l.l
===================================================================
--- parse_l.l	(revision 31016)
+++ parse_l.l	(revision 31017)
@@ -238,7 +238,7 @@
 			else
 				sprintf(tmps, "%s", Filename);
 
-			yyin = pcb_fopen(NULL, tmps, "r");
+			yyin = rnd_fopen(NULL, tmps, "r");
 			if (!yyin) {
 				free(tmps);
 				return (1);
@@ -254,7 +254,7 @@
 			p.hidlib = &PCB->hidlib;
 			command = rnd_build_argfn(Executable, &p);
 			/* open pipe to stdout of command */
-			if (*command == '\0' || (yyin = pcb_popen(NULL, command, "r")) == NULL) {
+			if (*command == '\0' || (yyin = rnd_popen(NULL, command, "r")) == NULL) {
 				rnd_popen_error_message(command);
 				free(command);
 				return (1);
@@ -302,7 +302,7 @@
 		return returncode;
 
 	if (used_popen)
-		return (pcb_pclose(yyin) ? 1 : returncode);
+		return (rnd_pclose(yyin) ? 1 : returncode);
 	return (fclose(yyin) ? 1 : returncode);
 }