Index: trunk/src/error.c
===================================================================
--- trunk/src/error.c	(revision 23812)
+++ trunk/src/error.c	(revision 23813)
@@ -36,8 +36,6 @@
 
 #include "data.h"
 #include "error.h"
-#include "plug_io.h"
-#include "compat_misc.h"
 #include "conf_core.h"
 
 void pcb_message(enum pcb_message_level level, const char *Format, ...)
@@ -71,23 +69,3 @@
 #endif
 }
 
-
-void pcb_open_error_message(const char *filename)
-{
-	pcb_message(PCB_MSG_ERROR, "Can't open file\n" "   '%s'\nfopen() returned: '%s'\n", filename, strerror(errno));
-}
-
-void pcb_popen_error_message(const char *filename)
-{
-	pcb_message(PCB_MSG_ERROR, "Can't execute command\n" "   '%s'\npopen() returned: '%s'\n", filename, strerror(errno));
-}
-
-void pcb_opendir_error_message(const char *dirname)
-{
-	pcb_message(PCB_MSG_ERROR, "Can't scan directory\n" "   '%s'\nopendir() returned: '%s'\n", dirname, strerror(errno));
-}
-
-void pcb_chdir_error_message(const char *dirname)
-{
-	pcb_message(PCB_MSG_ERROR, "Can't change working directory to\n" "   '%s'\nchdir() returned: '%s'\n", dirname, strerror(errno));
-}
Index: trunk/src/error.h
===================================================================
--- trunk/src/error.h	(revision 23812)
+++ trunk/src/error.h	(revision 23813)
@@ -42,11 +42,13 @@
 void pcb_message(enum pcb_message_level level, const char *Format, ...);
 
 /* shorthands for indicating common errors using pcb_message() */
-void pcb_open_error_message(const char *filename);
-void pcb_popen_error_message(const char *filename);
-void pcb_opendir_error_message(const char *dirname);
-void pcb_chdir_error_message(const char *dirname);
+#define pcb_FS_error_message(filename, func) pcb_message(PCB_MSG_ERROR, "Can't open file\n   '%s'\n" func "() returned: '%s'\n", filename, strerror(errno))
 
+#define pcb_open_error_message(filename)     pcb_FS_error_message(filename, "open")
+#define pcb_popen_error_message(filename)    pcb_FS_error_message(filename, "popen")
+#define pcb_opendir_error_message(filename)  pcb_FS_error_message(filename, "opendir")
+#define pcb_chdir_error_message(filename)    pcb_FS_error_message(filename, "chdir")
+
 /* pcb_printf()-like call to print temporary trace messages to stderr;
    disabled in non-debug compilation */
 void pcb_trace(const char *Format, ...);
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 23812)
+++ trunk/src/plug_io.c	(revision 23813)
@@ -45,6 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include "change.h"
 #include "conf.h"
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 23812)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 23813)
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 
 #include "data.h"
 #include "paths.h"
Index: trunk/src_plugins/import_netlist/import_netlist.c
===================================================================
--- trunk/src_plugins/import_netlist/import_netlist.c	(revision 23812)
+++ trunk/src_plugins/import_netlist/import_netlist.c	(revision 23813)
@@ -27,6 +27,9 @@
  */
 
 #include "config.h"
+
+#include <errno.h>
+
 #include "board.h"
 #include "plugins.h"
 #include "plug_io.h"
Index: trunk/src_plugins/lib_legacy_func/lib_legacy_func.c
===================================================================
--- trunk/src_plugins/lib_legacy_func/lib_legacy_func.c	(revision 23812)
+++ trunk/src_plugins/lib_legacy_func/lib_legacy_func.c	(revision 23813)
@@ -35,6 +35,7 @@
 #include <genvector/gds_char.h>
 #include <stdio.h>
 #include "config.h"
+#include <errno.h>
 #include "data.h"
 #include "change.h"
 #include "error.h"