Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 4821)
+++ trunk/src/plug_io.c	(revision 4822)
@@ -171,7 +171,7 @@
 	return -1;
 }
 
-int pcb_find_io(pcb_find_io_t *available, int avail_len, plug_iot_t typ, int is_wr, const char *fmt)
+int pcb_find_io(pcb_find_io_t *available, int avail_len, pcb_plug_iot_t typ, int is_wr, const char *fmt)
 {
 	int len = 0;
 
@@ -198,7 +198,7 @@
 }
 
 /* Find the plugin that offers the highest write prio for the format */
-static pcb_plug_io_t *find_writer(plug_iot_t typ, const char *fmt)
+static pcb_plug_io_t *find_writer(pcb_plug_iot_t typ, const char *fmt)
 {
 	pcb_find_io_t available[PCB_IO_MAX_FORMATS];
 	int len;
@@ -837,7 +837,7 @@
 }
 
 
-int pcb_io_list(pcb_io_formats_t *out, plug_iot_t typ, int wr, int do_digest)
+int pcb_io_list(pcb_io_formats_t *out, pcb_plug_iot_t typ, int wr, int do_digest)
 {
 	pcb_find_io_t available[PCB_IO_MAX_FORMATS];
 	int n;
Index: trunk/src/plug_io.h
===================================================================
--- trunk/src/plug_io.h	(revision 4821)
+++ trunk/src/plug_io.h	(revision 4822)
@@ -37,7 +37,7 @@
 	PCB_IOT_FOOTPRINT  = 2,
 	PCB_IOT_FONT       = 4,
 	PCB_IOT_BUFFER     = 8
-} plug_iot_t;
+} pcb_plug_iot_t;
 
 /**************************** API definition *********************************/
 struct pcb_plug_io_s {
@@ -53,7 +53,7 @@
 	         one; for ordering plugins in that case, the format-neutral
 	         save_preference_prio field is used.
 	   */
-	int (*fmt_support_prio)(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt);
+	int (*fmt_support_prio)(pcb_plug_io_t *ctx, pcb_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
@@ -137,7 +137,7 @@
    list in out. If do_digest is non-zero, fill in the digest field. Returns
    number of suitable io plugins. Call pcb_io_list_free() on out when it is not
    needed anymore. */
-int pcb_io_list(pcb_io_formats_t *out, plug_iot_t typ, int wr, int do_digest);
+int pcb_io_list(pcb_io_formats_t *out, pcb_plug_iot_t typ, int wr, int do_digest);
 void pcb_io_list_free(pcb_io_formats_t *out);
 
 extern int pcb_io_err_inhibit;
@@ -155,6 +155,6 @@
 	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);
+int pcb_find_io(pcb_find_io_t *available, int avail_len, pcb_plug_iot_t typ, int is_wr, const char *fmt);
 
 #endif
Index: trunk/src_plugins/io_kicad/io_kicad.c
===================================================================
--- trunk/src_plugins/io_kicad/io_kicad.c	(revision 4821)
+++ trunk/src_plugins/io_kicad/io_kicad.c	(revision 4822)
@@ -31,7 +31,7 @@
 
 static pcb_plug_io_t io_kicad;
 
-int io_kicad_fmt(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
+int io_kicad_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
 {
 	if (strcmp(ctx->description, fmt) == 0)
 		return 200;
Index: trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c
===================================================================
--- trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c	(revision 4821)
+++ trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c	(revision 4822)
@@ -30,7 +30,7 @@
 
 static pcb_plug_io_t io_kicad_legacy;
 
-int io_kicad_legacy_fmt(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
+int io_kicad_legacy_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
 {
 	if (strcmp(ctx->description, fmt) == 0)
 		return 200;
Index: trunk/src_plugins/io_lihata/io_lihata.c
===================================================================
--- trunk/src_plugins/io_lihata/io_lihata.c	(revision 4821)
+++ trunk/src_plugins/io_lihata/io_lihata.c	(revision 4822)
@@ -30,7 +30,7 @@
 static pcb_plug_io_t io_lihata;
 conf_io_lihata_t conf_io_lihata;
 
-int io_lihata_fmt(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
+int io_lihata_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
 {
 	if (strcmp(ctx->description, fmt) == 0)
 		return 200;
Index: trunk/src_plugins/io_pcb/io_pcb.c
===================================================================
--- trunk/src_plugins/io_pcb/io_pcb.c	(revision 4821)
+++ trunk/src_plugins/io_pcb/io_pcb.c	(revision 4822)
@@ -31,7 +31,7 @@
 static pcb_plug_io_t io_pcb[3];
 static io_pcb_ctx_t ctx[3];
 
-int io_pcb_fmt(pcb_plug_io_t *ctx, plug_iot_t typ, int wr, const char *fmt)
+int io_pcb_fmt(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, int wr, const char *fmt)
 {
 	if (strcmp(ctx->description, fmt) == 0)
 		return 200;