Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 4776)
+++ trunk/src/data.h	(revision 4777)
@@ -48,7 +48,7 @@
 	 *rat_tree;
 	pcb_board_t *pcb;
 	pcb_layer_t Layer[MAX_LAYER + 2];    /* add 2 silkscreen layers */
-	plug_io_t *loader;
+	pcb_plug_io_t *loader;
 	ratlist_t Rat;
 };
 
Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 4776)
+++ trunk/src/global_typedefs.h	(revision 4777)
@@ -47,7 +47,7 @@
 typedef struct pcb_element_s pcb_element_t;
 typedef struct pcb_text_s pcb_text_t;
 
-typedef struct plug_io_s plug_io_t;
+typedef struct pcb_plug_io_s pcb_plug_io_t;
 
 typedef unsigned int pcb_cardinal_t;
 typedef unsigned char pcb_uint8_t;   /* Don't use in new code. */
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 4776)
+++ trunk/src/plug_io.c	(revision 4777)
@@ -68,7 +68,7 @@
 /* for opendir */
 #include "compat_inc.h"
 
-plug_io_t *plug_io_chain = NULL;
+pcb_plug_io_t *plug_io_chain = NULL;
 int pcb_io_err_inhibit = 0;
 
 static void plug_io_err(int res, const char *what, const char *filename)
@@ -131,7 +131,7 @@
 		}
 	}
 	else /* try all parsers until we find one that works */
-		HOOK_CALL_DO(plug_io_t, plug_io_chain, parse_pcb, res, == 0, (self, Ptr, Filename, load_settings), if (Ptr->Data->loader == NULL) Ptr->Data->loader = self);
+		HOOK_CALL_DO(pcb_plug_io_t, plug_io_chain, parse_pcb, res, == 0, (self, Ptr, Filename, load_settings), if (Ptr->Data->loader == NULL) Ptr->Data->loader = self);
 
 	if ((res == 0) && (load_settings))
 		conf_load_project(NULL, Filename);
@@ -148,7 +148,7 @@
 	int res = -1;
 
 	Ptr->loader = NULL;
-	HOOK_CALL_DO(plug_io_t, plug_io_chain, parse_element, res, == 0, (self, Ptr, name), Ptr->loader = self);
+	HOOK_CALL_DO(pcb_plug_io_t, plug_io_chain, parse_element, res, == 0, (self, Ptr, name), Ptr->loader = self);
 
 	plug_io_err(res, "load element", name);
 	return res;
@@ -157,7 +157,7 @@
 int ParseFont(pcb_font_t *Ptr, char *Filename)
 {
 	int res = -1;
-	HOOK_CALL(plug_io_t, plug_io_chain, parse_font, res, == 0, (self, Ptr, Filename));
+	HOOK_CALL(pcb_plug_io_t, plug_io_chain, parse_font, res, == 0, (self, Ptr, Filename));
 
 	plug_io_err(res, "load font", Filename);
 	return res;
@@ -188,7 +188,7 @@
 		} \
 	} while(0)
 
-	HOOK_CALL_ALL(plug_io_t, plug_io_chain, fmt_support_prio, cb_append, (self, typ, is_wr, (fmt == NULL ? self->default_fmt : fmt)));
+	HOOK_CALL_ALL(pcb_plug_io_t, plug_io_chain, fmt_support_prio, cb_append, (self, typ, is_wr, (fmt == NULL ? self->default_fmt : fmt)));
 
 	if (len > 0)
 		qsort(available, len, sizeof(available[0]), find_prio_cmp);
@@ -198,7 +198,7 @@
 }
 
 /* Find the plugin that offers the highest write prio for the format */
-static plug_io_t *find_writer(plug_iot_t typ, const char *fmt)
+static pcb_plug_io_t *find_writer(plug_iot_t typ, const char *fmt)
 {
 	pcb_find_io_t available[PCB_IO_MAX_FORMATS];
 	int len;
@@ -220,7 +220,7 @@
 int WriteBuffer(FILE *f, pcb_buffer_t *buff, const char *fmt)
 {
 	int res, newfmt = 0;
-	plug_io_t *p = find_writer(PCB_IOT_BUFFER, fmt);
+	pcb_plug_io_t *p = find_writer(PCB_IOT_BUFFER, fmt);
 
 	if (p != NULL) {
 		res = p->write_buffer(p, f, buff);
@@ -237,7 +237,7 @@
 int WriteElementData(FILE *f, pcb_data_t *e, const char *fmt)
 {
 	int res, newfmt = 0;
-	plug_io_t *p = e->loader;
+	pcb_plug_io_t *p = e->loader;
 
 	if ((p == NULL) || ((fmt != NULL) && (*fmt != '\0'))) {
 		p = find_writer(PCB_IOT_FOOTPRINT, fmt);
@@ -257,7 +257,7 @@
 static int pcb_write_pcb(FILE *f, const char *old_filename, const char *new_filename, const char *fmt, pcb_bool emergency)
 {
 	int res, newfmt = 0;
-	plug_io_t *p = PCB->Data->loader;
+	pcb_plug_io_t *p = PCB->Data->loader;
 
 	if ((p == NULL) || ((fmt != NULL) && (*fmt != '\0'))) {
 		p = find_writer(PCB_IOT_PCB, fmt);
Index: trunk/src/plug_io.h
===================================================================
--- trunk/src/plug_io.h	(revision 4776)
+++ trunk/src/plug_io.h	(revision 4777)
@@ -40,8 +40,8 @@
 } plug_iot_t;
 
 /**************************** API definition *********************************/
-struct plug_io_s {
-	plug_io_t *next;
+struct pcb_plug_io_s {
+	pcb_plug_io_t *next;
 	void *plugin_data;
 
 	/* Check if the plugin supports format fmt, for writing (if wr != 0) or for
@@ -53,26 +53,26 @@
 	         one; for ordering plugins in that case, the format-neutral
 	         save_preference_prio field is used.
 	   */
-	int (*fmt_support_prio)(plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt);
+	int (*fmt_support_prio)(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt);
 
 	/* Attempt to load a pcb design from Filename to Ptr.
 	   Conf subtree at settings_dest is replaced by settings loaded from the
 	   file unless it's CFR_invalid.
 	   Return 0 on success. */
-	int (*parse_pcb)(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+	int (*parse_pcb)(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
 
 	/* Attempt to load an element from Filename to Ptr. Return 0 on success. */
-	int (*parse_element)(plug_io_t *ctx, pcb_data_t *Ptr, const char *name);
+	int (*parse_element)(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name);
 
 	/* Attempt to load fonts from a file. Return 0 on success. */
-	int (*parse_font)(plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename);
+	int (*parse_font)(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename);
 
 
 	/* Write the buffer to a file. Return 0 on success. */
-	int (*write_buffer)(plug_io_t *ctx, FILE *f, pcb_buffer_t *buff);
+	int (*write_buffer)(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff);
 
 	/* Write element data to a file. Return 0 on success. */
-	int (*write_element)(plug_io_t *ctx, FILE *f, pcb_data_t *e);
+	int (*write_element)(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *e);
 
 	/* Write PCB to f; there's a copy of the file we are going to
 	   "overwrite", named in old_filename and the new file name we are
@@ -80,7 +80,7 @@
 	   into a pipe. If emergency is true, do the safest save possible,
 	   don't mind formatting and extras.
 	   Return 0 on success. */
-	int (*write_pcb)(plug_io_t *ctx, FILE *f, const char *old_filename, const char *new_filename, pcb_bool emergency);
+	int (*write_pcb)(pcb_plug_io_t *ctx, FILE *f, const char *old_filename, const char *new_filename, pcb_bool emergency);
 
 	const char *default_fmt;
 	const char *description;
@@ -87,7 +87,7 @@
 
 	int save_preference_prio; /* all available save plugins are sorted by this before presenting them to the user to choose one */
 };
-extern plug_io_t *plug_io_chain;
+extern pcb_plug_io_t *plug_io_chain;
 
 
 /********** hook wrappers **********/
@@ -129,7 +129,7 @@
 /* A list of format plugins available for a given purpose */
 typedef struct {
 	int len;
-	const plug_io_t *plug[PCB_IO_MAX_FORMATS+1];
+	const pcb_plug_io_t *plug[PCB_IO_MAX_FORMATS+1];
 	char *digest[PCB_IO_MAX_FORMATS+1];           /* string that contains the format identifier and the description */
 } pcb_io_formats_t;
 
@@ -152,7 +152,7 @@
    highest prio first. If fmt is NULL, use the default fmt for each plugin.
    Return the length of the array. */
 typedef struct {
-	plug_io_t *plug;
+	pcb_plug_io_t *plug;
 	int prio;
 } pcb_find_io_t;
 int pcb_find_io(pcb_find_io_t *available, int avail_len, plug_iot_t typ, int is_wr, const char *fmt);
Index: trunk/src_plugins/io_kicad/io_kicad.c
===================================================================
--- trunk/src_plugins/io_kicad/io_kicad.c	(revision 4776)
+++ trunk/src_plugins/io_kicad/io_kicad.c	(revision 4777)
@@ -29,9 +29,9 @@
 #include "write.h"
 #include "read.h"
 
-static plug_io_t io_kicad;
+static pcb_plug_io_t io_kicad;
 
-int io_kicad_fmt(plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
+int io_kicad_fmt(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
 {
 	if (strcmp(ctx->description, fmt) == 0)
 		return 200;
@@ -64,7 +64,7 @@
 	io_kicad.description = "Kicad, s-expression";
 	io_kicad.save_preference_prio = 92;
 
-	HOOK_REGISTER(plug_io_t, plug_io_chain, &io_kicad);
+	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &io_kicad);
 
 	/* TODO: Alloc plugin-globals here. */
 
Index: trunk/src_plugins/io_kicad/read.c
===================================================================
--- trunk/src_plugins/io_kicad/read.c	(revision 4776)
+++ trunk/src_plugins/io_kicad/read.c	(revision 4777)
@@ -2026,7 +2026,7 @@
 	return kicad_foreach_dispatch(st, st->dom.root->children, disp);
 }
 	
-int io_kicad_read_pcb(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+int io_kicad_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
 {
 	int c, readres = 0;
 	read_state_t st;
Index: trunk/src_plugins/io_kicad/read.h
===================================================================
--- trunk/src_plugins/io_kicad/read.h	(revision 4776)
+++ trunk/src_plugins/io_kicad/read.h	(revision 4777)
@@ -29,4 +29,4 @@
 #include <stdio.h>
 #include "data.h"
 
-int io_kicad_read_pcb(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+int io_kicad_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
Index: trunk/src_plugins/io_kicad/write.c
===================================================================
--- trunk/src_plugins/io_kicad/write.c	(revision 4776)
+++ trunk/src_plugins/io_kicad/write.c	(revision 4777)
@@ -55,7 +55,7 @@
 static int write_kicad_layout_via_drill_size(FILE * FP, pcb_cardinal_t indentation);
 
 /* writes the buffer to file */
-int io_kicad_write_buffer(plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff)
+int io_kicad_write_buffer(pcb_plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff)
 {
 	/*fputs("io_kicad_legacy_write_buffer()", FP); */
 
@@ -79,7 +79,7 @@
 /* ---------------------------------------------------------------------------
  * writes PCB to file
  */
-int io_kicad_write_pcb(plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+int io_kicad_write_pcb(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
 {
 	/* this is the first step in exporting a layout;
 	 * creating a kicad module containing the elements used in the layout
@@ -789,7 +789,7 @@
 /* ---------------------------------------------------------------------------
  * writes element data in kicad legacy format for use in a .mod library
  */
-int io_kicad_write_element(plug_io_t *ctx, FILE * FP, pcb_data_t *Data)
+int io_kicad_write_element(pcb_plug_io_t *ctx, FILE * FP, pcb_data_t *Data)
 {
 
 
Index: trunk/src_plugins/io_kicad/write.h
===================================================================
--- trunk/src_plugins/io_kicad/write.h	(revision 4776)
+++ trunk/src_plugins/io_kicad/write.h	(revision 4777)
@@ -29,9 +29,9 @@
 #include <stdio.h>
 #include "data.h"
 
-int io_kicad_write_element(plug_io_t *ctx, FILE * FP, pcb_data_t *Data);
-int io_kicad_write_buffer(plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff);
-int io_kicad_write_pcb(plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
+int io_kicad_write_element(pcb_plug_io_t *ctx, FILE * FP, pcb_data_t *Data);
+int io_kicad_write_buffer(pcb_plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff);
+int io_kicad_write_pcb(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
 int write_kicad_module_header(FILE * FP, pcb_cardinal_t indentation);
 int write_kicad_layout_header(FILE * FP, pcb_cardinal_t indentation);
 int write_kicad_layout_vias(FILE * FP, pcb_data_t *Data, Coord MaxWidth, 										Coord MaxHeight, pcb_cardinal_t indentation);
Index: trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c
===================================================================
--- trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c	(revision 4776)
+++ trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c	(revision 4777)
@@ -28,9 +28,9 @@
 #include "plug_io.h"
 #include "write.h"
 
-static plug_io_t io_kicad_legacy;
+static pcb_plug_io_t io_kicad_legacy;
 
-int io_kicad_legacy_fmt(plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
+int io_kicad_legacy_fmt(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
 {
 	if (strcmp(ctx->description, fmt) == 0)
 		return 200;
@@ -64,7 +64,7 @@
 	io_kicad_legacy.description = "Kicad, legacy format";
 	io_kicad_legacy.save_preference_prio = 90;
 
-	HOOK_REGISTER(plug_io_t, plug_io_chain, &io_kicad_legacy);
+	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &io_kicad_legacy);
 
 	/* TODO: Alloc plugin-globals here. */
 
Index: trunk/src_plugins/io_kicad_legacy/write.c
===================================================================
--- trunk/src_plugins/io_kicad_legacy/write.c	(revision 4776)
+++ trunk/src_plugins/io_kicad_legacy/write.c	(revision 4777)
@@ -52,7 +52,7 @@
 static int write_kicad_legacy_layout_via_drill_size(FILE * FP);
 
 /* writes the buffer to file */
-int io_kicad_legacy_write_buffer(plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff)
+int io_kicad_legacy_write_buffer(pcb_plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff)
 {
 	/*fputs("io_kicad_legacy_write_buffer()", FP); */
 
@@ -76,7 +76,7 @@
 /* ---------------------------------------------------------------------------
  * writes PCB to file
  */
-int io_kicad_legacy_write_pcb(plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+int io_kicad_legacy_write_pcb(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
 {
 	/* this is the first step in exporting a layout;
 	 * creating a kicd module containing the elements used in the layout
@@ -749,7 +749,7 @@
 /* ---------------------------------------------------------------------------
  * writes element data in kicad legacy format for use in a .mod library
  */
-int io_kicad_legacy_write_element(plug_io_t *ctx, FILE * FP, pcb_data_t *Data)
+int io_kicad_legacy_write_element(pcb_plug_io_t *ctx, FILE * FP, pcb_data_t *Data)
 {
 
 
Index: trunk/src_plugins/io_kicad_legacy/write.h
===================================================================
--- trunk/src_plugins/io_kicad_legacy/write.h	(revision 4776)
+++ trunk/src_plugins/io_kicad_legacy/write.h	(revision 4777)
@@ -29,9 +29,9 @@
 #include <stdio.h>
 #include "data.h"
 
-int io_kicad_legacy_write_element(plug_io_t *ctx, FILE * FP, pcb_data_t *Data);
-int io_kicad_legacy_write_buffer(plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff);
-int io_kicad_legacy_write_pcb(plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
+int io_kicad_legacy_write_element(pcb_plug_io_t *ctx, FILE * FP, pcb_data_t *Data);
+int io_kicad_legacy_write_buffer(pcb_plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff);
+int io_kicad_legacy_write_pcb(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
 int write_kicad_legacy_module_header(FILE * FP);
 int write_kicad_legacy_layout_header(FILE * FP);
 int write_kicad_legacy_layout_vias(FILE * FP, pcb_data_t *Data, Coord MaxWidth, Coord MaxHeight);
Index: trunk/src_plugins/io_lihata/io_lihata.c
===================================================================
--- trunk/src_plugins/io_lihata/io_lihata.c	(revision 4776)
+++ trunk/src_plugins/io_lihata/io_lihata.c	(revision 4777)
@@ -27,10 +27,10 @@
 #include "write.h"
 #include "io_lihata.h"
 
-static plug_io_t io_lihata;
+static pcb_plug_io_t io_lihata;
 conf_io_lihata_t conf_io_lihata;
 
-int io_lihata_fmt(plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
+int io_lihata_fmt(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
 {
 	if (strcmp(ctx->description, fmt) == 0)
 		return 200;
@@ -63,7 +63,7 @@
 	io_lihata.description = "lihata board";
 	io_lihata.save_preference_prio = 20;
 
-	HOOK_REGISTER(plug_io_t, plug_io_chain, &io_lihata);
+	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &io_lihata);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	conf_reg_field(conf_io_lihata, field,isarray,type_name,cpath,cname,desc,flags);
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 4776)
+++ trunk/src_plugins/io_lihata/read.c	(revision 4777)
@@ -992,7 +992,7 @@
 	return 0;
 }
 
-int io_lihata_parse_pcb(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+int io_lihata_parse_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
 {
 	int res;
 	char *errmsg;
Index: trunk/src_plugins/io_lihata/read.h
===================================================================
--- trunk/src_plugins/io_lihata/read.h	(revision 4776)
+++ trunk/src_plugins/io_lihata/read.h	(revision 4777)
@@ -20,6 +20,6 @@
  *
  */
 
-int io_lihata_parse_pcb(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+int io_lihata_parse_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
 
 
Index: trunk/src_plugins/io_lihata/write.c
===================================================================
--- trunk/src_plugins/io_lihata/write.c	(revision 4776)
+++ trunk/src_plugins/io_lihata/write.c	(revision 4777)
@@ -754,7 +754,7 @@
 }
 
 
-int io_lihata_write_pcb(plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+int io_lihata_write_pcb(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
 {
 	int res;
 	lht_doc_t *brd = build_board(PCB);
Index: trunk/src_plugins/io_lihata/write.h
===================================================================
--- trunk/src_plugins/io_lihata/write.h	(revision 4776)
+++ trunk/src_plugins/io_lihata/write.h	(revision 4777)
@@ -20,4 +20,4 @@
  *
  */
 
-int io_lihata_write_pcb(plug_io_t *ctx, FILE * FP);
+int io_lihata_write_pcb(pcb_plug_io_t *ctx, FILE * FP);
Index: trunk/src_plugins/io_pcb/file.c
===================================================================
--- trunk/src_plugins/io_pcb/file.c	(revision 4776)
+++ trunk/src_plugins/io_pcb/file.c	(revision 4777)
@@ -366,7 +366,7 @@
 /* ---------------------------------------------------------------------------
  * writes element data
  */
-int io_pcb_WriteElementData(plug_io_t *ctx, FILE * FP, pcb_data_t *Data)
+int io_pcb_WriteElementData(pcb_plug_io_t *ctx, FILE * FP, pcb_data_t *Data)
 {
 	gdl_iterator_t eit;
 	pcb_line_t *line;
@@ -499,7 +499,7 @@
 /* ---------------------------------------------------------------------------
  * writes the buffer to file
  */
-int io_pcb_WriteBuffer(plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff)
+int io_pcb_WriteBuffer(pcb_plug_io_t *ctx, FILE * FP, pcb_buffer_t *buff)
 {
 	pcb_cardinal_t i;
 
@@ -514,7 +514,7 @@
 /* ---------------------------------------------------------------------------
  * writes PCB to file
  */
-int io_pcb_WritePCB(plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
+int io_pcb_WritePCB(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency)
 {
 	pcb_cardinal_t i;
 
Index: trunk/src_plugins/io_pcb/file.h
===================================================================
--- trunk/src_plugins/io_pcb/file.h	(revision 4776)
+++ trunk/src_plugins/io_pcb/file.h	(revision 4777)
@@ -47,9 +47,9 @@
 	const char *write_coord_fmt;
 } io_pcb_ctx_t;
 
-int io_pcb_WriteBuffer(plug_io_t *ctx, FILE *f, pcb_buffer_t *buff);
-int io_pcb_WriteElementData(plug_io_t *ctx, FILE *f, pcb_data_t *);
-int io_pcb_WritePCB(plug_io_t *ctx, FILE *f, const char *old_filename, const char *new_filename, pcb_bool emergency);
+int io_pcb_WriteBuffer(pcb_plug_io_t *ctx, FILE *f, pcb_buffer_t *buff);
+int io_pcb_WriteElementData(pcb_plug_io_t *ctx, FILE *f, pcb_data_t *);
+int io_pcb_WritePCB(pcb_plug_io_t *ctx, FILE *f, const char *old_filename, const char *new_filename, pcb_bool emergency);
 
 void PreLoadElementPCB(void);
 void PostLoadElementPCB(void);
Index: trunk/src_plugins/io_pcb/io_pcb.c
===================================================================
--- trunk/src_plugins/io_pcb/io_pcb.c	(revision 4776)
+++ trunk/src_plugins/io_pcb/io_pcb.c	(revision 4777)
@@ -28,10 +28,10 @@
 #include "parse_common.h"
 #include "file.h"
 
-static plug_io_t io_pcb[3];
+static pcb_plug_io_t io_pcb[3];
 static io_pcb_ctx_t ctx[3];
 
-int io_pcb_fmt(plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
+int io_pcb_fmt(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
 {
 	if (strcmp(ctx->description, fmt) == 0)
 		return 200;
@@ -49,7 +49,7 @@
 	pcb_lex_destroy();
 
 	for(n = 0; n < 3; n++)
-		HOOK_UNREGISTER(plug_io_t, plug_io_chain, &(io_pcb[n]));
+		HOOK_UNREGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[n]));
 }
 
 pcb_uninit_t hid_io_pcb_init(void)
@@ -71,7 +71,7 @@
 	io_pcb[0].default_fmt = "pcb";
 	io_pcb[0].description = "geda/pcb - mainline (centimils)";
 	io_pcb[0].save_preference_prio = 100;
-	HOOK_REGISTER(plug_io_t, plug_io_chain, &(io_pcb[0]));
+	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[0]));
 
 	ctx[1].write_coord_fmt = pcb_printf_slot[9];
 	io_pcb[1].plugin_data = &ctx[1];
@@ -82,7 +82,7 @@
 	io_pcb[1].default_fmt = "pcb";
 	io_pcb[1].description = "geda/pcb - readable units";
 	io_pcb[1].save_preference_prio = 99;
-	HOOK_REGISTER(plug_io_t, plug_io_chain, &(io_pcb[1]));
+	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[1]));
 
 	ctx[2].write_coord_fmt = "%$$mn";
 	io_pcb[2].plugin_data = &ctx[2];
@@ -93,7 +93,7 @@
 	io_pcb[2].default_fmt = "pcb";
 	io_pcb[2].description = "geda/pcb - nanometer";
 	io_pcb[2].save_preference_prio = 98;
-	HOOK_REGISTER(plug_io_t, plug_io_chain, &(io_pcb[2]));
+	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[2]));
 
 	return hid_io_pcb_uninit;
 }
Index: trunk/src_plugins/io_pcb/parse_common.h
===================================================================
--- trunk/src_plugins/io_pcb/parse_common.h	(revision 4776)
+++ trunk/src_plugins/io_pcb/parse_common.h	(revision 4777)
@@ -34,8 +34,8 @@
 #include "config.h"
 #include "plug_io.h"
 
-int io_pcb_ParsePCB(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
-int io_pcb_ParseElement(plug_io_t *ctx, pcb_data_t *, const char *);
-int io_pcb_ParseFont(plug_io_t *ctx, pcb_font_t *, const char *);
+int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+int io_pcb_ParseElement(pcb_plug_io_t *ctx, pcb_data_t *, const char *);
+int io_pcb_ParseFont(pcb_plug_io_t *ctx, pcb_font_t *, const char *);
 
 #endif
Index: trunk/src_plugins/io_pcb/parse_l.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.c	(revision 4776)
+++ trunk/src_plugins/io_pcb/parse_l.c	(revision 4777)
@@ -2455,7 +2455,7 @@
 /* ---------------------------------------------------------------------------
  * initializes LEX and calls parser for a single element file
  */
-int io_pcb_ParseElement(plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
+int io_pcb_ParseElement(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
 {
 	FILE *f;
 	int ret;
@@ -2501,7 +2501,7 @@
 	conf_set(target, path, arr_idx, new_val, pol); \
 } while(0) \
 
-int io_pcb_ParsePCB(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
 {
 	int retval;
 	yyPCB = Ptr;
@@ -2575,7 +2575,7 @@
 /* ---------------------------------------------------------------------------
  * initializes LEX and calls parser for a font
  */
-int io_pcb_ParseFont(plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename)
+int io_pcb_ParseFont(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename)
 {
 	int r = 0;
 	yyPCB = NULL;
Index: trunk/src_plugins/io_pcb/parse_l.l
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.l	(revision 4776)
+++ trunk/src_plugins/io_pcb/parse_l.l	(revision 4777)
@@ -314,7 +314,7 @@
 /* ---------------------------------------------------------------------------
  * initializes LEX and calls parser for a single element file
  */
-int io_pcb_ParseElement(plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
+int io_pcb_ParseElement(pcb_plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
 {
 	FILE *f;
 	int ret;
@@ -360,7 +360,7 @@
 	conf_set(target, path, arr_idx, new_val, pol); \
 } while(0) \
 
-int io_pcb_ParsePCB(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
+int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
 {
 	int retval;
 	yyPCB = Ptr;
@@ -434,7 +434,7 @@
 /* ---------------------------------------------------------------------------
  * initializes LEX and calls parser for a font
  */
-int io_pcb_ParseFont(plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename)
+int io_pcb_ParseFont(pcb_plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename)
 {
 	int r = 0;
 	yyPCB = NULL;