Index: trunk/src/plug_import.c
===================================================================
--- trunk/src/plug_import.c	(revision 4798)
+++ trunk/src/plug_import.c	(revision 4799)
@@ -41,15 +41,15 @@
 #include "error.h"
 
 
-plug_import_t *plug_import_chain = NULL;
+pcb_plug_import_t *plug_import_chain = NULL;
 
 typedef struct {
-	plug_import_t *plug;
+	pcb_plug_import_t *plug;
 	int prio;
 } find_t;
 
 /* Find the plugin that offers the highest write prio for the format */
-static plug_import_t *find_importer(unsigned int aspects, FILE *f, const char *filename)
+static pcb_plug_import_t *find_importer(unsigned int aspects, FILE *f, const char *filename)
 {
 	find_t available[32]; /* wish we had more than 32 import plugins... */
 	int n, len = 0, best = 0, bestidx = -1;
@@ -64,7 +64,7 @@
 		} \
 	} while(0)
 
-	HOOK_CALL_ALL(plug_import_t, plug_import_chain, fmt_support_prio, cb_append,   (self, aspects, f, filename));
+	HOOK_CALL_ALL(pcb_plug_import_t, plug_import_chain, fmt_support_prio, cb_append,   (self, aspects, f, filename));
 	if (len == 0)
 		return NULL;
 
@@ -85,7 +85,7 @@
 
 int pcb_import(char *filename, unsigned int aspect)
 {
-	plug_import_t *plug;
+	pcb_plug_import_t *plug;
 	FILE *fp;
 
 	if (!filename) {
Index: trunk/src/plug_import.h
===================================================================
--- trunk/src/plug_import.h	(revision 4798)
+++ trunk/src/plug_import.h	(revision 4799)
@@ -33,13 +33,13 @@
 
 /**************************** API definition *********************************/
 
-typedef enum plug_import_aspect_e { /* bitfield of aspects that can be imported */
+typedef enum pcb_plug_import_aspect_e { /* bitfield of aspects that can be imported */
 	IMPORT_ASPECT_NETLIST = 1
-} plug_import_aspect_t;
+} pcb_plug_import_aspect_t;
 
-typedef struct plug_import_s plug_import_t;
-struct plug_import_s {
-	plug_import_t *next;
+typedef struct pcb_plug_import_s pcb_plug_import_t;
+struct pcb_plug_import_s {
+	pcb_plug_import_t *next;
 	void *plugin_data;
 
 	/* Check if the plugin supports format fmt. Return 0 if not supported or
@@ -46,13 +46,13 @@
 	   an integer priority if supported. The higher the prio is the more likely
 	   the plugin gets the next operation on the file. Base prio should be 100
 	   for native formats. Return non-0 only if all aspects are supported. */
-	int (*fmt_support_prio)(plug_import_t *ctx, unsigned int aspects, FILE *f, const char *filename);
+	int (*fmt_support_prio)(pcb_plug_import_t *ctx, unsigned int aspects, FILE *f, const char *filename);
 
 	/* Perform the import; return 0 on success */
-	int (*import)(plug_import_t *ctx, unsigned int aspects, const char *fn);
+	int (*import)(pcb_plug_import_t *ctx, unsigned int aspects, const char *fn);
 };
 
-extern plug_import_t *plug_import_chain;
+extern pcb_plug_import_t *plug_import_chain;
 
 /********** hook wrappers **********/
 int pcb_import(char *filename, unsigned int aspect);
Index: trunk/src_plugins/import_edif/import_edif.c
===================================================================
--- trunk/src_plugins/import_edif/import_edif.c	(revision 4798)
+++ trunk/src_plugins/import_edif/import_edif.c	(revision 4799)
@@ -35,9 +35,9 @@
 #include "plug_io.h"
 
 
-static plug_import_t import_edif;
+static pcb_plug_import_t import_edif;
 
-int edif_support_prio(plug_import_t *ctx, unsigned int aspects, FILE *fp, const char *filename)
+int edif_support_prio(pcb_plug_import_t *ctx, unsigned int aspects, FILE *fp, const char *filename)
 {
 	char buf[65];
 	int len;
@@ -63,7 +63,7 @@
 
 
 extern int ReadEdifNetlist(char *filename);
-static int edif_import(plug_import_t *ctx, unsigned int aspects, const char *fn)
+static int edif_import(pcb_plug_import_t *ctx, unsigned int aspects, const char *fn)
 {
 	int ret = ReadEdifNetlist((char *)fn);
 	if (ret == 0) {
@@ -86,7 +86,7 @@
 	import_edif.fmt_support_prio = edif_support_prio;
 	import_edif.import           = edif_import;
 
-	HOOK_REGISTER(plug_import_t, plug_import_chain, &import_edif);
+	HOOK_REGISTER(pcb_plug_import_t, plug_import_chain, &import_edif);
 
 	return hid_import_edif_uninit;
 }
Index: trunk/src_plugins/import_netlist/import_netlist.c
===================================================================
--- trunk/src_plugins/import_netlist/import_netlist.c	(revision 4798)
+++ trunk/src_plugins/import_netlist/import_netlist.c	(revision 4799)
@@ -38,7 +38,7 @@
 #include "compat_nls.h"
 #include "paths.h"
 
-static plug_import_t import_netlist;
+static pcb_plug_import_t import_netlist;
 
 
 #define BLANK(x) ((x) == ' ' || (x) == '\t' || (x) == '\n' \
@@ -158,7 +158,7 @@
 	return (0);
 }
 
-int netlist_support_prio(plug_import_t *ctx, unsigned int aspects, FILE *fp, const char *filename)
+int netlist_support_prio(pcb_plug_import_t *ctx, unsigned int aspects, FILE *fp, const char *filename)
 {
 	if (aspects != IMPORT_ASPECT_NETLIST)
 		return 0; /* only pure netlist import is supported */
@@ -168,7 +168,7 @@
 }
 
 
-static int netlist_import(plug_import_t *ctx, unsigned int aspects, const char *fn)
+static int netlist_import(pcb_plug_import_t *ctx, unsigned int aspects, const char *fn)
 {
 	return ReadNetlist(fn);
 }
@@ -186,7 +186,7 @@
 	import_netlist.fmt_support_prio = netlist_support_prio;
 	import_netlist.import           = netlist_import;
 
-	HOOK_REGISTER(plug_import_t, plug_import_chain, &import_netlist);
+	HOOK_REGISTER(pcb_plug_import_t, plug_import_chain, &import_netlist);
 
 	return hid_import_netlist_uninit;
 }