Index: trunk/src/plug_footprint.c
===================================================================
--- trunk/src/plug_footprint.c	(revision 4797)
+++ trunk/src/plug_footprint.c	(revision 4798)
@@ -35,7 +35,7 @@
 #include "error.h"
 #include "compat_misc.h"
 
-plug_fp_t *plug_fp_chain = NULL;
+pcb_plug_fp_t *plug_fp_chain = NULL;
 library_t library;
 
 int fp_dupname(const char *name, char **basename, char **params)
@@ -102,14 +102,14 @@
 	return (char *) tagid;
 }
 
-FILE *fp_fopen(const char *path, const char *name, fp_fopen_ctx_t *fctx)
+FILE *fp_fopen(const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
 {
 	FILE *res = NULL;
-	HOOK_CALL(plug_fp_t, plug_fp_chain, fopen, res, != NULL, (self, path, name, fctx));
+	HOOK_CALL(pcb_plug_fp_t, plug_fp_chain, fopen, res, != NULL, (self, path, name, fctx));
 	return res;
 }
 
-void fp_fclose(FILE * f, fp_fopen_ctx_t *fctx)
+void fp_fclose(FILE * f, pcb_fp_fopen_ctx_t *fctx)
 {
 	if (fctx->backend->fclose != NULL)
 		fctx->backend->fclose(fctx->backend, f, fctx);
@@ -352,7 +352,7 @@
 
 		/* Next read in any footprints in the top level dir */
 		res = -1;
-		HOOK_CALL(plug_fp_t, plug_fp_chain, load_dir, res, >= 0, (self, toppath));
+		HOOK_CALL(pcb_plug_fp_t, plug_fp_chain, load_dir, res, >= 0, (self, toppath));
 		if (res >= 0)
 			n_footprints += res;
 		else
Index: trunk/src/plug_footprint.h
===================================================================
--- trunk/src/plug_footprint.h	(revision 4797)
+++ trunk/src/plug_footprint.h	(revision 4798)
@@ -4,19 +4,19 @@
 #include <stdio.h>
 #include "vtlibrary.h"
 
-typedef struct plug_fp_s plug_fp_t;
+typedef struct pcb_plug_fp_s pcb_plug_fp_t;
 
 typedef struct {
-	plug_fp_t *backend;
+	pcb_plug_fp_t *backend;
 	union {
 		int i;
 		void *p;
 	} field[4];
-} fp_fopen_ctx_t;
+} pcb_fp_fopen_ctx_t;
 
 /* hook bindings, see below */
-FILE *fp_fopen(const char *path, const char *name, fp_fopen_ctx_t *fctx);
-void fp_fclose(FILE * f, fp_fopen_ctx_t *fctx);
+FILE *fp_fopen(const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx);
+void fp_fclose(FILE * f, pcb_fp_fopen_ctx_t *fctx);
 
 /* duplicates the name and splits it into a basename and params;
    params is NULL if the name is not parametric (and "" if parameter list is empty)
@@ -37,13 +37,13 @@
 void fp_uninit();
 
 /**************************** API definition *********************************/
-struct plug_fp_s {
-	plug_fp_t *next;
+struct pcb_plug_fp_s {
+	pcb_plug_fp_t *next;
 	void *plugin_data;
 
 	/* returns the number of footprints loaded into the library or -1 on
 	   error; next in chain is run only on error. */
-	int (*load_dir)(plug_fp_t *ctx, const char *path);
+	int (*load_dir)(pcb_plug_fp_t *ctx, const char *path);
 
 /* Open a footprint for reading; if the footprint is parametric, it's run
    prefixed with libshell (or executed directly, if libshell is NULL).
@@ -51,13 +51,13 @@
    The user has to supply a state integer that will be used by pcb_fp_fclose().
    Must fill in fctx->backend, may use any other field of fctx as well.
  */
-	FILE *(*fopen)(plug_fp_t *ctx, const char *path, const char *name, fp_fopen_ctx_t *fctx);
+	FILE *(*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_fp_fopen(). */
-	void (*fclose)(plug_fp_t *ctx, FILE * f, fp_fopen_ctx_t *fctx);
+	void (*fclose)(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx);
 };
 
-extern plug_fp_t *plug_fp_chain;
+extern pcb_plug_fp_t *plug_fp_chain;
 
 
 /* Optional pcb-rnd-side glue for some implementations */
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 4797)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 4798)
@@ -258,7 +258,7 @@
 }
 
 
-static int fp_fs_load_dir(plug_fp_t *ctx, const char *path)
+static int fp_fs_load_dir(pcb_plug_fp_t *ctx, const char *path)
 {
 	return fp_fs_load_dir_(&library, ".", path, 1);
 }
@@ -446,7 +446,7 @@
 }
 
 #define F_IS_PARAMETRIC 0
-static FILE *fp_fs_fopen(plug_fp_t *ctx, const char *path, const char *name, fp_fopen_ctx_t *fctx)
+static FILE *fp_fs_fopen(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
 {
 	char *basename, *params, *fullname;
 	FILE *f = NULL;
@@ -487,7 +487,7 @@
 	return f;
 }
 
-static void fp_fs_fclose(plug_fp_t *ctx, FILE * f, fp_fopen_ctx_t *fctx)
+static void fp_fs_fclose(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx)
 {
 	if (fctx->field[F_IS_PARAMETRIC].i)
 		pclose(f);
@@ -496,11 +496,11 @@
 }
 
 
-static plug_fp_t fp_fs;
+static pcb_plug_fp_t fp_fs;
 
 void hid_fp_fs_uninit(void)
 {
-	HOOK_UNREGISTER(plug_fp_t, plug_fp_chain, &fp_fs);
+	HOOK_UNREGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_fs);
 }
 
 pcb_uninit_t hid_fp_fs_init(void)
@@ -509,6 +509,6 @@
 	fp_fs.load_dir = fp_fs_load_dir;
 	fp_fs.fopen = fp_fs_fopen;
 	fp_fs.fclose = fp_fs_fclose;
-	HOOK_REGISTER(plug_fp_t, plug_fp_chain, &fp_fs);
+	HOOK_REGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_fs);
 	return hid_fp_fs_uninit;
 }
Index: trunk/src_plugins/fp_wget/gedasymbols.c
===================================================================
--- trunk/src_plugins/fp_wget/gedasymbols.c	(revision 4797)
+++ trunk/src_plugins/fp_wget/gedasymbols.c	(revision 4798)
@@ -68,7 +68,7 @@
 	return changed;
 }
 
-int fp_gedasymbols_load_dir(plug_fp_t *ctx, const char *path)
+int fp_gedasymbols_load_dir(pcb_plug_fp_t *ctx, const char *path)
 {
 	FILE *f;
 	int fctx;
@@ -149,7 +149,7 @@
 
 #define FIELD_WGET_CTX 0
 
-FILE *fp_gedasymbols_fopen(plug_fp_t *ctx, const char *path, const char *name, fp_fopen_ctx_t *fctx)
+FILE *fp_gedasymbols_fopen(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
 {
 	gds_t s;
 	FILE *f;
@@ -173,17 +173,17 @@
 	return f;
 }
 
-void fp_gedasymbols_fclose(plug_fp_t *ctx, FILE * f, fp_fopen_ctx_t *fctx)
+void fp_gedasymbols_fclose(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx)
 {
 	fp_wget_close(&f, &(fctx->field[FIELD_WGET_CTX].i));
 }
 
 
-static plug_fp_t fp_gedasymbols;
+static pcb_plug_fp_t fp_gedasymbols;
 
 void fp_gedasymbols_uninit(void)
 {
-	HOOK_UNREGISTER(plug_fp_t, plug_fp_chain, &fp_gedasymbols);
+	HOOK_UNREGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_gedasymbols);
 }
 
 void fp_gedasymbols_init(void)
@@ -193,5 +193,5 @@
 	fp_gedasymbols.fopen = fp_gedasymbols_fopen;
 	fp_gedasymbols.fclose = fp_gedasymbols_fclose;
 
-	HOOK_REGISTER(plug_fp_t, plug_fp_chain, &fp_gedasymbols);
+	HOOK_REGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_gedasymbols);
 }
Index: trunk/src_plugins/fp_wget/gedasymbols.h
===================================================================
--- trunk/src_plugins/fp_wget/gedasymbols.h	(revision 4797)
+++ trunk/src_plugins/fp_wget/gedasymbols.h	(revision 4798)
@@ -1,7 +1,7 @@
 #include "plug_footprint.h"
-int fp_gedasymbols_load_dir(plug_fp_t *ctx, const char *path);
-FILE *fp_gedasymbols_fopen(plug_fp_t *ctx, const char *path, const char *name, fp_fopen_ctx_t *fctx);
-void fp_gedasymbols_fclose(plug_fp_t *ctx, FILE * f, fp_fopen_ctx_t *fctx);
+int fp_gedasymbols_load_dir(pcb_plug_fp_t *ctx, const char *path);
+FILE *fp_gedasymbols_fopen(pcb_plug_fp_t *ctx, const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx);
+void fp_gedasymbols_fclose(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx);
 void fp_gedasymbols_init(void);
 void fp_gedasymbols_uninit(void);
 
Index: trunk/src_plugins/fp_wget/tester.c
===================================================================
--- trunk/src_plugins/fp_wget/tester.c	(revision 4797)
+++ trunk/src_plugins/fp_wget/tester.c	(revision 4798)
@@ -6,7 +6,7 @@
 #undef strdup
 char *pcb_strdup(const char *s) { return strdup(s); }
 
-plug_fp_t *plug_fp_chain = NULL;
+pcb_plug_fp_t *plug_fp_chain = NULL;
 
 library_t ltmp;
 library_t *fp_mkdir_p(const char *path)
@@ -23,7 +23,7 @@
 
 int main()
 {
-	fp_fopen_ctx_t fctx;
+	pcb_fp_fopen_ctx_t fctx;
 	FILE *f;
 	char line[1024];
 
Index: trunk/src_plugins/io_pcb/parse_l.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.c	(revision 4797)
+++ trunk/src_plugins/io_pcb/parse_l.c	(revision 4798)
@@ -2459,7 +2459,7 @@
 {
 	FILE *f;
 	int ret;
-	fp_fopen_ctx_t st;
+	pcb_fp_fopen_ctx_t st;
 
 	yy_settings_dest = CFR_invalid;
 	yyPCB = NULL;
Index: trunk/src_plugins/io_pcb/parse_l.l
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.l	(revision 4797)
+++ trunk/src_plugins/io_pcb/parse_l.l	(revision 4798)
@@ -318,7 +318,7 @@
 {
 	FILE *f;
 	int ret;
-	fp_fopen_ctx_t st;
+	pcb_fp_fopen_ctx_t st;
 
 	yy_settings_dest = CFR_invalid;
 	yyPCB = NULL;
Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 4797)
+++ trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 4798)
@@ -744,7 +744,7 @@
 	int total, paren_level = 0;
 	int skipping = FALSE;
 	int dpcb;
-	fp_fopen_ctx_t fctx;
+	pcb_fp_fopen_ctx_t fctx;
 
 	if ((f_in = fopen(pcb_file, "r")) == NULL)
 		return 0;