Index: fp_fs.c
===================================================================
--- fp_fs.c	(revision 30954)
+++ fp_fs.c	(revision 30955)
@@ -127,7 +127,7 @@
 	/* Cache old dir, then cd into subdir because stat is given relative file names. */
 	memset(olddir, 0, sizeof olddir);
 	if (rnd_get_wd(olddir) == NULL) {
-		rnd_message(PCB_MSG_ERROR, "fp_fs_list(): Could not determine initial working directory\n");
+		rnd_message(RND_MSG_ERROR, "fp_fs_list(): Could not determine initial working directory\n");
 		return 0;
 	}
 
@@ -136,7 +136,7 @@
 
 	if (chdir(subdir)) {
 		if (!subdir_may_not_exist)
-			pcb_chdir_error_message(subdir);
+			rnd_chdir_error_message(subdir);
 		return 0;
 	}
 
@@ -143,9 +143,9 @@
 
 	/* Determine subdir's abs path */
 	if (rnd_get_wd(new_subdir) == NULL) {
-		rnd_message(PCB_MSG_ERROR, "fp_fs_list(): Could not determine new working directory\n");
+		rnd_message(RND_MSG_ERROR, "fp_fs_list(): Could not determine new working directory\n");
 		if (chdir(olddir))
-			pcb_chdir_error_message(olddir);
+			rnd_chdir_error_message(olddir);
 		return 0;
 	}
 
@@ -157,9 +157,9 @@
 
 	/* First try opening the directory specified by path */
 	if ((subdirobj = pcb_opendir(&PCB->hidlib, new_subdir)) == NULL) {
-		pcb_opendir_error_message(new_subdir);
+		rnd_opendir_error_message(new_subdir);
 		if (chdir(olddir))
-			pcb_chdir_error_message(olddir);
+			rnd_chdir_error_message(olddir);
 		return 0;
 	}
 
@@ -225,7 +225,7 @@
 	/* Done.  Clean up, cd back into old dir, and return */
 	pcb_closedir(subdirobj);
 	if (chdir(olddir))
-		pcb_chdir_error_message(olddir);
+		rnd_chdir_error_message(olddir);
 	return n_footprints;
 }
 
@@ -427,7 +427,7 @@
 					pcb_pclose(fp);
 				}
 				else
-					rnd_message(PCB_MSG_ERROR, "Parametric footprint: failed to execute %s\n", cmd);
+					rnd_message(RND_MSG_ERROR, "Parametric footprint: failed to execute %s\n", cmd);
 				rewind(f);
 			}
 			free(cmd);