Index: trunk/config.h.in
===================================================================
--- trunk/config.h.in	(revision 11605)
+++ trunk/config.h.in	(revision 11606)
@@ -222,11 +222,21 @@
 #	undef snprintf
 #	undef round
 #	undef strcasecmp
+#	undef fopen
+#	undef popen
+#	undef system
+#	undef remove
+#	undef rename
 #	define strdup      never_use_strdup__use_pcb_strdup
 #	define strndup     never_use_strndup__use_pcb_strndup
 #	define snprintf    never_use_snprintf__use_pcb_snprintf
 #	define round       never_use_round__use_pcb_round
 #	define strcasecmp  never_use_strcasecmp__use_pcb_strcasecmp
+#	define fopen       never_use_fopen__use_pcb_fopen
+#	define popen       never_use_popen__use_pcb_popen
+#	define system      never_use_system__use_pcb_system
+#	define remove      never_use_remove__use_pcb_remove
+#	define rename      never_use_rename__use_pcb_rename
 #endif
 
 
Index: trunk/src/plug_footprint.c
===================================================================
--- trunk/src/plug_footprint.c	(revision 11605)
+++ trunk/src/plug_footprint.c	(revision 11606)
@@ -106,14 +106,14 @@
 FILE *pcb_fp_fopen(const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
 {
 	FILE *res = NULL;
-	PCB_HOOK_CALL(pcb_plug_fp_t, pcb_plug_fp_chain, fopen, res, != NULL, (self, path, name, fctx));
+	PCB_HOOK_CALL(pcb_plug_fp_t, pcb_plug_fp_chain, fp_fopen, res, != NULL, (self, path, name, fctx));
 	return res;
 }
 
 void pcb_fp_fclose(FILE * f, pcb_fp_fopen_ctx_t *fctx)
 {
-	if ((fctx->backend != NULL) && (fctx->backend->fclose != NULL))
-		fctx->backend->fclose(fctx->backend, f, fctx);
+	if ((fctx->backend != NULL) && (fctx->backend->fp_fclose != NULL))
+		fctx->backend->fp_fclose(fctx->backend, f, fctx);
 }
 
 pcb_fplibrary_t *pcb_fp_append_entry(pcb_fplibrary_t *parent, const char *name, pcb_fptype_t type, void *tags[])
Index: trunk/src/plug_footprint.h
===================================================================
--- trunk/src/plug_footprint.h	(revision 11605)
+++ trunk/src/plug_footprint.h	(revision 11606)
@@ -52,10 +52,10 @@
    The user has to supply a state integer that will be used by pcb_pcb_fp_fclose().
    Must fill in fctx->backend, may use any other field of fctx as well.
  */
-	FILE *(*fopen)(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx);
+	FILE *(*fp_fopen)(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx);
 
 /* Close the footprint file opened by pcb_pcb_fp_fopen(). */
-	void (*fclose)(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx);
+	void (*fp_fclose)(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx);
 };
 
 extern pcb_plug_fp_t *pcb_plug_fp_chain;
Index: trunk/src_plugins/fp_board/fp_board.c
===================================================================
--- trunk/src_plugins/fp_board/fp_board.c	(revision 11605)
+++ trunk/src_plugins/fp_board/fp_board.c	(revision 11606)
@@ -165,8 +165,8 @@
 {
 	fp_board.plugin_data = NULL;
 	fp_board.load_dir = fp_board_load_dir;
-	fp_board.fopen = fp_board_fopen;
-	fp_board.fclose = fp_board_fclose;
+	fp_board.fp_fopen = fp_board_fopen;
+	fp_board.fp_fclose = fp_board_fclose;
 	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_board);
 	return 0;
 }
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 11605)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 11606)
@@ -532,8 +532,8 @@
 {
 	fp_fs.plugin_data = NULL;
 	fp_fs.load_dir = fp_fs_load_dir;
-	fp_fs.fopen = fp_fs_fopen;
-	fp_fs.fclose = fp_fs_fclose;
+	fp_fs.fp_fopen = fp_fs_fopen;
+	fp_fs.fp_fclose = fp_fs_fclose;
 	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs);
 	return 0;
 }
Index: trunk/src_plugins/fp_wget/edakrill.c
===================================================================
--- trunk/src_plugins/fp_wget/edakrill.c	(revision 11605)
+++ trunk/src_plugins/fp_wget/edakrill.c	(revision 11606)
@@ -258,8 +258,8 @@
 {
 	fp_edakrill.plugin_data = NULL;
 	fp_edakrill.load_dir = fp_edakrill_load_dir;
-	fp_edakrill.fopen = fp_edakrill_fopen;
-	fp_edakrill.fclose = fp_edakrill_fclose;
+	fp_edakrill.fp_fopen = fp_edakrill_fopen;
+	fp_edakrill.fp_fclose = fp_edakrill_fclose;
 
 	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_edakrill);
 }
Index: trunk/src_plugins/fp_wget/gedasymbols.c
===================================================================
--- trunk/src_plugins/fp_wget/gedasymbols.c	(revision 11605)
+++ trunk/src_plugins/fp_wget/gedasymbols.c	(revision 11606)
@@ -166,8 +166,8 @@
 {
 	fp_gedasymbols.plugin_data = NULL;
 	fp_gedasymbols.load_dir = fp_gedasymbols_load_dir;
-	fp_gedasymbols.fopen = fp_gedasymbols_fopen;
-	fp_gedasymbols.fclose = fp_gedasymbols_fclose;
+	fp_gedasymbols.fp_fopen = fp_gedasymbols_fopen;
+	fp_gedasymbols.fp_fclose = fp_gedasymbols_fclose;
 
 	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_gedasymbols);
 }