Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 4772)
+++ trunk/src/board.h	(revision 4773)
@@ -98,7 +98,7 @@
 	pcb_layer_group_t LayerGroups;
 	vtroutestyle_t RouteStyle;
 	LibraryType NetlistLib[NUM_NETLISTS];
-	rats_patch_line_t *NetlistPatches, *NetlistPatchLast;
+	pcb_ratspatch_line_t *NetlistPatches, *NetlistPatchLast;
 	AttributeListType Attributes;
 	pcb_data_t *Data;							/* entire database */
 
Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 4772)
+++ trunk/src/global_typedefs.h	(revision 4773)
@@ -43,7 +43,7 @@
 typedef struct pad_st pcb_pad_t;
 typedef struct pin_st pcb_pin_t;
 typedef struct pcb_rtree_s pcb_rtree_t;
-typedef struct rats_patch_line_s rats_patch_line_t;
+typedef struct pcb_ratspatch_line_s pcb_ratspatch_line_t;
 typedef struct element_st ElementType, *ElementTypePtr, **ElementTypeHandle;
 typedef struct pcb_text_s  TextType, *TextTypePtr;
 
Index: trunk/src/rats_patch.c
===================================================================
--- trunk/src/rats_patch.c	(revision 4772)
+++ trunk/src/rats_patch.c	(revision 4773)
@@ -34,7 +34,7 @@
 #include "compat_misc.h"
 #include "compat_nls.h"
 
-static void rats_patch_remove(pcb_board_t *pcb, rats_patch_line_t * n, int do_free);
+static void rats_patch_remove(pcb_board_t *pcb, pcb_ratspatch_line_t * n, int do_free);
 
 const char *pcb_netlist_names[NUM_NETLISTS] = {
 	"input",
@@ -43,9 +43,9 @@
 
 void rats_patch_append(pcb_board_t *pcb, rats_patch_op_t op, const char *id, const char *a1, const char *a2)
 {
-	rats_patch_line_t *n;
+	pcb_ratspatch_line_t *n;
 
-	n = malloc(sizeof(rats_patch_line_t));
+	n = malloc(sizeof(pcb_ratspatch_line_t));
 
 	n->op = op;
 	n->id = pcb_strdup(id);
@@ -66,7 +66,7 @@
 	n->next = NULL;
 }
 
-static void rats_patch_free_fields(rats_patch_line_t *n)
+static void rats_patch_free_fields(pcb_ratspatch_line_t *n)
 {
 	if (n->id != NULL)
 		free(n->id);
@@ -78,7 +78,7 @@
 
 void rats_patch_destroy(pcb_board_t *pcb)
 {
-	rats_patch_line_t *n, *next;
+	pcb_ratspatch_line_t *n, *next;
 
 	for(n = pcb->NetlistPatches; n != NULL; n = next) {
 		next = n->next;
@@ -90,7 +90,7 @@
 void rats_patch_append_optimize(pcb_board_t *pcb, rats_patch_op_t op, const char *id, const char *a1, const char *a2)
 {
 	rats_patch_op_t seek_op;
-	rats_patch_line_t *n;
+	pcb_ratspatch_line_t *n;
 
 	switch (op) {
 	case RATP_ADD_CONN:
@@ -128,7 +128,7 @@
 }
 
 /* Unlink n from the list; if do_free is non-zero, also free fields and n */
-static void rats_patch_remove(pcb_board_t *pcb, rats_patch_line_t * n, int do_free)
+static void rats_patch_remove(pcb_board_t *pcb, pcb_ratspatch_line_t * n, int do_free)
 {
 	/* if we are the first or last... */
 	if (n == pcb->NetlistPatches)
@@ -198,7 +198,7 @@
 }
 
 
-int rats_patch_apply_conn(pcb_board_t *pcb, rats_patch_line_t * patch, int del)
+int rats_patch_apply_conn(pcb_board_t *pcb, pcb_ratspatch_line_t * patch, int del)
 {
 	int n;
 
@@ -242,7 +242,7 @@
 }
 
 
-int rats_patch_apply(pcb_board_t *pcb, rats_patch_line_t * patch)
+int rats_patch_apply(pcb_board_t *pcb, pcb_ratspatch_line_t * patch)
 {
 	switch (patch->op) {
 	case RATP_ADD_CONN:
@@ -258,7 +258,7 @@
 
 void rats_patch_make_edited(pcb_board_t *pcb)
 {
-	rats_patch_line_t *n;
+	pcb_ratspatch_line_t *n;
 
 	netlist_free(&(pcb->NetlistLib[NETLIST_EDITED]));
 	netlist_copy(&(pcb->NetlistLib[NETLIST_EDITED]), &(pcb->NetlistLib[NETLIST_INPUT]));
@@ -278,9 +278,9 @@
 	return NULL;
 }
 
-int rats_patch_export(pcb_board_t *pcb, rats_patch_line_t *pat, pcb_bool need_info_lines, void (*cb)(void *ctx, pcb_rats_patch_export_ev_t ev, const char *netn, const char *key, const char *val), void *ctx)
+int rats_patch_export(pcb_board_t *pcb, pcb_ratspatch_line_t *pat, pcb_bool need_info_lines, void (*cb)(void *ctx, pcb_rats_patch_export_ev_t ev, const char *netn, const char *key, const char *val), void *ctx)
 {
-	rats_patch_line_t *n;
+	pcb_ratspatch_line_t *n;
 
 	if (need_info_lines) {
 		htsp_t *seen;
Index: trunk/src/rats_patch.h
===================================================================
--- trunk/src/rats_patch.h	(revision 4772)
+++ trunk/src/rats_patch.h	(revision 4773)
@@ -35,7 +35,7 @@
 	RATP_CHANGE_ATTRIB
 } rats_patch_op_t;
 
-struct rats_patch_line_s {
+struct pcb_ratspatch_line_s {
 	rats_patch_op_t op;
 	char *id;
 	union {
@@ -46,7 +46,7 @@
 		char *attrib_val;
 	} arg2;
 
-	rats_patch_line_t *prev, *next;
+	pcb_ratspatch_line_t *prev, *next;
 };
 
 
@@ -68,7 +68,7 @@
 void rats_patch_make_edited(pcb_board_t *pcb);
 
 /* apply a single patch record on [NETLIST_EDITED]; returns non-zero on failure */
-int rats_patch_apply(pcb_board_t *pcb, rats_patch_line_t * patch);
+int rats_patch_apply(pcb_board_t *pcb, pcb_ratspatch_line_t * patch);
 
 /**** exporter ****/
 
@@ -92,6 +92,6 @@
 
 /* Call cb() for each item to output; PCB_PTRE_INFO* is calculated/called only
    if need_info_lines is true; the pcb pointer is used for looking up connections */
-int rats_patch_export(pcb_board_t *pcb, rats_patch_line_t *pat, pcb_bool need_info_lines, void (*cb)(void *ctx, pcb_rats_patch_export_ev_t ev, const char *netn, const char *key, const char *val), void *ctx);
+int rats_patch_export(pcb_board_t *pcb, pcb_ratspatch_line_t *pat, pcb_bool need_info_lines, void (*cb)(void *ctx, pcb_rats_patch_export_ev_t ev, const char *netn, const char *key, const char *val), void *ctx);
 
 #endif
Index: trunk/src_plugins/io_lihata/write.c
===================================================================
--- trunk/src_plugins/io_lihata/write.c	(revision 4772)
+++ trunk/src_plugins/io_lihata/write.c	(revision 4773)
@@ -662,7 +662,7 @@
 }
 
 /* Build a netlist patch so that we don't need to export a complete new set of "as built" netlist */
-static lht_node_t *build_net_patch(pcb_board_t *pcb, rats_patch_line_t *pat, int *nonempty)
+static lht_node_t *build_net_patch(pcb_board_t *pcb, pcb_ratspatch_line_t *pat, int *nonempty)
 {
 	lht_node_t *pn;
 	build_net_patch_t ctx;
@@ -682,7 +682,7 @@
 }
 
 
-static lht_node_t *build_netlists(pcb_board_t *pcb, LibraryType *netlists, rats_patch_line_t *pat, int num_netlists)
+static lht_node_t *build_netlists(pcb_board_t *pcb, LibraryType *netlists, pcb_ratspatch_line_t *pat, int num_netlists)
 {
 	lht_node_t *nls;
 	int n, nonempty = 0;