Index: gedasymbols.c
===================================================================
--- gedasymbols.c	(revision 4797)
+++ 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: gedasymbols.h
===================================================================
--- gedasymbols.h	(revision 4797)
+++ 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: tester.c
===================================================================
--- tester.c	(revision 4797)
+++ 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];