Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5027)
+++ trunk/doc-rnd/hacking/renames	(revision 5028)
@@ -942,3 +942,6 @@
 INSERT_TYPES -> PCB_INSERT_TYPES
 COPY_TYPES -> PCB_COPY_TYPES
 REMOVE_TYPES -> PCB_REMOVE_TYPES
+NETLIST_INPUT -> PCB_NETLIST_INPUT
+NETLIST_EDITED -> PCB_NETLIST_EDITED
+NUM_NETLISTS -> PCB_NUM_NETLISTS
Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 5027)
+++ trunk/src/board.c	(revision 5028)
@@ -53,7 +53,7 @@
 	/* release font symbols */
 	for (i = 0; i <= MAX_FONTPOSITION; i++)
 		free(pcb->Font.Symbol[i].Line);
-	for (i = 0; i < NUM_NETLISTS; i++)
+	for (i = 0; i < PCB_NUM_NETLISTS; i++)
 		pcb_lib_free(&(pcb->NetlistLib[i]));
 	vtroutestyle_uninit(&pcb->RouteStyle);
 	pcb_attribute_free(&pcb->Attributes);
Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 5027)
+++ trunk/src/board.h	(revision 5028)
@@ -32,9 +32,9 @@
 #include "config.h"
 
 enum {
-	NETLIST_INPUT = 0,						/* index of the original netlist as imported */
-	NETLIST_EDITED = 1,						/* index of the netlist produced by applying netlist patches on [NETLIST_INPUT] */
-	NUM_NETLISTS									/* so that we know how many netlists we are dealing with */
+	PCB_NETLIST_INPUT  = 0,  /* index of the original netlist as imported */
+	PCB_NETLIST_EDITED = 1,  /* index of the netlist produced by applying netlist patches on [PCB_NETLIST_INPUT] */
+	PCB_NUM_NETLISTS         /* so that we know how many netlists we are dealing with */
 };
 
 #include "const.h"
@@ -97,7 +97,7 @@
 	pcb_font_t Font;
 	pcb_layer_group_t LayerGroups;
 	vtroutestyle_t RouteStyle;
-	pcb_lib_t NetlistLib[NUM_NETLISTS];
+	pcb_lib_t NetlistLib[PCB_NUM_NETLISTS];
 	pcb_ratspatch_line_t *NetlistPatches, *NetlistPatchLast;
 	pcb_attribute_list_t Attributes;
 	pcb_data_t *Data;							/* entire database */
Index: trunk/src/file_act.c
===================================================================
--- trunk/src/file_act.c	(revision 5027)
+++ trunk/src/file_act.c	(revision 5028)
@@ -141,7 +141,7 @@
 		PCB->Netlistname = pcb_strdup_strip_wspace(name);
 		{
 			int i;
-			for (i = 0; i < NUM_NETLISTS; i++)
+			for (i = 0; i < PCB_NUM_NETLISTS; i++)
 				pcb_lib_free(&(PCB->NetlistLib[i]));
 		}
 		if (!pcb_import_netlist(PCB->Netlistname))
Index: trunk/src/netlist.c
===================================================================
--- trunk/src/netlist.c	(revision 5027)
+++ trunk/src/netlist.c	(revision 5028)
@@ -70,11 +70,11 @@
 {
 	int i, j;
 	/*printf("nodename [%s]\n", nodename); */
-	for (i = 0; i < PCB->NetlistLib[NETLIST_EDITED].MenuN; i++) {
-		for (j = 0; j < PCB->NetlistLib[NETLIST_EDITED].Menu[i].EntryN; j++) {
-			if (strcmp(PCB->NetlistLib[NETLIST_EDITED].Menu[i].Entry[j].ListEntry, nodename) == 0) {
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+		for (j = 0; j < PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].EntryN; j++) {
+			if (strcmp(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].Entry[j].ListEntry, nodename) == 0) {
 				/*printf(" in [%s]\n", PCB->NetlistLib.Menu[i].Name); */
-				return &(PCB->NetlistLib[NETLIST_EDITED].Menu[i]);
+				return &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i]);
 			}
 		}
 	}
@@ -89,9 +89,9 @@
 		/* Looks like we were passed an internal netname, skip the prefix */
 		netname += 2;
 	}
-	for (i = 0; i < PCB->NetlistLib[NETLIST_EDITED].MenuN; i++) {
-		if (strcmp(PCB->NetlistLib[NETLIST_EDITED].Menu[i].Name + 2, netname) == 0) {
-			return &(PCB->NetlistLib[NETLIST_EDITED].Menu[i]);
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+		if (strcmp(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].Name + 2, netname) == 0) {
+			return &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i]);
 		}
 	}
 	return 0;
@@ -155,7 +155,7 @@
 
 	if (net == 0) {
 		/* Clear the entire netlist. */
-		for (ni = 0; ni < NUM_NETLISTS; ni++)
+		for (ni = 0; ni < PCB_NUM_NETLISTS; ni++)
 			pcb_lib_free(&(PCB->NetlistLib[ni]));
 	}
 	else if (pin == 0) {
@@ -193,8 +193,8 @@
 {
 	int n;
 
-	for (n = 0; n < pcb->NetlistLib[NETLIST_EDITED].MenuN; n++) {
-		pcb_lib_menu_t *menu = &pcb->NetlistLib[NETLIST_EDITED].Menu[n];
+	for (n = 0; n < pcb->NetlistLib[PCB_NETLIST_EDITED].MenuN; n++) {
+		pcb_lib_menu_t *menu = &pcb->NetlistLib[PCB_NETLIST_EDITED].Menu[n];
 		int p;
 		for (p = 0; p < menu->EntryN; p++) {
 			pcb_lib_entry_t *entry = &menu->Entry[p];
@@ -243,8 +243,8 @@
 
 pcb_cardinal_t pcb_netlist_net_idx(pcb_board_t *pcb, pcb_lib_menu_t *net)
 {
-	pcb_lib_menu_t *first = &pcb->NetlistLib[NETLIST_EDITED].Menu[0];
-	pcb_lib_menu_t *last  = &pcb->NetlistLib[NETLIST_EDITED].Menu[pcb->NetlistLib[NETLIST_EDITED].MenuN-1];
+	pcb_lib_menu_t *first = &pcb->NetlistLib[PCB_NETLIST_EDITED].Menu[0];
+	pcb_lib_menu_t *last  = &pcb->NetlistLib[PCB_NETLIST_EDITED].Menu[pcb->NetlistLib[PCB_NETLIST_EDITED].MenuN-1];
 	
 	if ((net < first) || (net > last))
 		return PCB_NETLIST_INVALID_INDEX;
Index: trunk/src/netlist_act.c
===================================================================
--- trunk/src/netlist_act.c	(revision 5027)
+++ trunk/src/netlist_act.c	(revision 5028)
@@ -113,7 +113,7 @@
 static int pcb_netlist_add(const char *netname, const char *pinname)
 {
 	int ni, pi;
-	pcb_lib_t *netlist = &PCB->NetlistLib[NETLIST_EDITED];
+	pcb_lib_t *netlist = &PCB->NetlistLib[PCB_NETLIST_EDITED];
 	pcb_lib_menu_t *net = NULL;
 	pcb_lib_entry_t *pin = NULL;
 
@@ -271,8 +271,8 @@
 
 	if (argc > 1) {
 		use_re = 1;
-		for (i = 0; i < PCB->NetlistLib[NETLIST_EDITED].MenuN; i++) {
-			net = PCB->NetlistLib[NETLIST_EDITED].Menu + i;
+		for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+			net = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + i;
 			if (strcasecmp(argv[1], net->Name + 2) == 0)
 				use_re = 0;
 		}
@@ -286,8 +286,8 @@
 		}
 	}
 
-	for (i = PCB->NetlistLib[NETLIST_EDITED].MenuN - 1; i >= 0; i--) {
-		net = PCB->NetlistLib[NETLIST_EDITED].Menu + i;
+	for (i = PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN - 1; i >= 0; i--) {
+		net = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + i;
 
 		if (argc > 1) {
 			if (use_re) {
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 5027)
+++ trunk/src/plug_io.c	(revision 5028)
@@ -469,7 +469,7 @@
 void pcb_sort_netlist()
 {
 	netlist_sort_offset = 2;
-	pcb_library_sort(&(PCB->NetlistLib[NETLIST_INPUT]));
+	pcb_library_sort(&(PCB->NetlistLib[PCB_NETLIST_INPUT]));
 	netlist_sort_offset = 0;
 }
 
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 5027)
+++ trunk/src/rats.c	(revision 5028)
@@ -657,7 +657,7 @@
 	 * structure the way the final routing
 	 * is supposed to look
 	 */
-	Wantlist = pcb_rat_proc_netlist(&(PCB->NetlistLib[NETLIST_EDITED]));
+	Wantlist = pcb_rat_proc_netlist(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
 	if (!Wantlist) {
 		pcb_message(PCB_MSG_DEFAULT, _("Can't add rat lines because no netlist is loaded.\n"));
 		return (pcb_false);
@@ -743,7 +743,7 @@
 	 * structure the way the final routing
 	 * is supposed to look
 	 */
-	Wantlist = pcb_rat_proc_netlist(&(PCB->NetlistLib[NETLIST_EDITED]));
+	Wantlist = pcb_rat_proc_netlist(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
 	if (!Wantlist) {
 		pcb_message(PCB_MSG_DEFAULT, _("Can't add rat lines because no netlist is loaded.\n"));
 		return result;
@@ -794,7 +794,7 @@
 	if (name == NULL)
 		return -1;
 
-	MENU_LOOP(&(PCB->NetlistLib[NETLIST_EDITED]));
+	MENU_LOOP(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
 	{
 		if (menu->Name && (strcmp(menu->Name, name) == 0))
 			return 1;
@@ -884,7 +884,7 @@
 		sprintf(ratname, "  ratDrawn%i", ++ratDrawn);
 	}
 
-	menu = pcb_lib_menu_new(&(PCB->NetlistLib[NETLIST_EDITED]), NULL);
+	menu = pcb_lib_menu_new(&(PCB->NetlistLib[PCB_NETLIST_EDITED]), NULL);
 	menu->Name = pcb_strdup(ratname);
 	entry = pcb_lib_entry_new(menu);
 	entry->ListEntry = pcb_strdup(name1);
Index: trunk/src/rats_patch.c
===================================================================
--- trunk/src/rats_patch.c	(revision 5027)
+++ trunk/src/rats_patch.c	(revision 5028)
@@ -36,7 +36,7 @@
 
 static void rats_patch_remove(pcb_board_t *pcb, pcb_ratspatch_line_t * n, int do_free);
 
-const char *pcb_netlist_names[NUM_NETLISTS] = {
+const char *pcb_netlist_names[PCB_NUM_NETLISTS] = {
 	"input",
 	"edited"
 };
@@ -202,8 +202,8 @@
 {
 	int n;
 
-	for (n = 0; n < pcb->NetlistLib[NETLIST_EDITED].MenuN; n++) {
-		pcb_lib_menu_t *menu = &pcb->NetlistLib[NETLIST_EDITED].Menu[n];
+	for (n = 0; n < pcb->NetlistLib[PCB_NETLIST_EDITED].MenuN; n++) {
+		pcb_lib_menu_t *menu = &pcb->NetlistLib[PCB_NETLIST_EDITED].Menu[n];
 		if (strcmp(menu->Name + 2, patch->arg1.net_name) == 0) {
 			int p;
 			for (p = 0; p < menu->EntryN; p++) {
@@ -233,7 +233,7 @@
 	/* couldn't find the net: create it */
 	{
 		pcb_lib_menu_t *net = NULL;
-		net = pcb_lib_net_new(&pcb->NetlistLib[NETLIST_EDITED], patch->arg1.net_name, NULL);
+		net = pcb_lib_net_new(&pcb->NetlistLib[PCB_NETLIST_EDITED], patch->arg1.net_name, NULL);
 		if (net == NULL)
 			return 1;
 		pcb_lib_conn_new(net, (char *) patch->id);
@@ -260,8 +260,8 @@
 {
 	pcb_ratspatch_line_t *n;
 
-	netlist_free(&(pcb->NetlistLib[NETLIST_EDITED]));
-	netlist_copy(&(pcb->NetlistLib[NETLIST_EDITED]), &(pcb->NetlistLib[NETLIST_INPUT]));
+	netlist_free(&(pcb->NetlistLib[PCB_NETLIST_EDITED]));
+	netlist_copy(&(pcb->NetlistLib[PCB_NETLIST_EDITED]), &(pcb->NetlistLib[PCB_NETLIST_INPUT]));
 	for (n = pcb->NetlistPatches; n != NULL; n = n->next)
 		pcb_ratspatch_apply(pcb, n);
 }
@@ -295,7 +295,7 @@
 					pcb_lib_menu_t *net;
 					int p;
 
-					net = rats_patch_find_net(pcb, n->arg1.net_name, NETLIST_INPUT);
+					net = rats_patch_find_net(pcb, n->arg1.net_name, PCB_NETLIST_INPUT);
 /*					printf("net: '%s' %p\n", n->arg1.net_name, (void *)net);*/
 					if (net != NULL) {
 						htsp_set(seen, n->arg1.net_name, net);
Index: trunk/src/rats_patch.h
===================================================================
--- trunk/src/rats_patch.h	(revision 5027)
+++ trunk/src/rats_patch.h	(revision 5028)
@@ -52,7 +52,7 @@
 
 
 /* Single-word netlist class names */
-const char *pcb_netlist_names[NUM_NETLISTS];
+const char *pcb_netlist_names[PCB_NUM_NETLISTS];
 
 /* Allocate and append a patch line to the patch list */
 void pcb_ratspatch_append(pcb_board_t *pcb, pcb_rats_patch_op_t op, const char *id, const char *a1, const char *a2);
@@ -64,10 +64,10 @@
    redundant entries are removed */
 void pcb_ratspatch_append_optimize(pcb_board_t *pcb, pcb_rats_patch_op_t op, const char *id, const char *a1, const char *a2);
 
-/* Create [NETLIST_EDITED] from [NETLIST_INPUT] applying the patch */
+/* Create [PCB_NETLIST_EDITED] from [PCB_NETLIST_INPUT] applying the patch */
 void pcb_ratspatch_make_edited(pcb_board_t *pcb);
 
-/* apply a single patch record on [NETLIST_EDITED]; returns non-zero on failure */
+/* apply a single patch record on [PCB_NETLIST_EDITED]; returns non-zero on failure */
 int pcb_ratspatch_apply(pcb_board_t *pcb, pcb_ratspatch_line_t * patch);
 
 /**** exporter ****/
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 5027)
+++ trunk/src/select.c	(revision 5028)
@@ -978,7 +978,7 @@
 		pcb_conn_lookup_init();
 		changed = pcb_reset_conns(pcb_true) || changed;
 
-		MENU_LOOP(&(PCB->NetlistLib[NETLIST_EDITED]));
+		MENU_LOOP(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
 		{
 			pcb_cardinal_t i;
 			pcb_lib_entry_t *entry;
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 5027)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 5028)
@@ -685,7 +685,7 @@
 	 * structure the way the final routing
 	 * is supposed to look
 	 */
-	Nets = pcb_rat_proc_netlist(&(PCB->NetlistLib[NETLIST_EDITED]));
+	Nets = pcb_rat_proc_netlist(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
 	if (!Nets) {
 		pcb_message(PCB_MSG_DEFAULT, _("Can't add rat lines because no netlist is loaded.\n"));
 		goto done;
Index: trunk/src_plugins/export_dsn/dsn.c
===================================================================
--- trunk/src_plugins/export_dsn/dsn.c	(revision 5027)
+++ trunk/src_plugins/export_dsn/dsn.c	(revision 5028)
@@ -216,9 +216,9 @@
 		char *layeropts = pcb_strdup("(type signal)");
 		/* see if layer has same name as a net and make it a power layer */
 		/* loop thru all nets */
-		for (int ni = 0; ni < PCB->NetlistLib[NETLIST_EDITED].MenuN; ni++) {
+		for (int ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++) {
 			char *nname;
-			nname = PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Name + 2;
+			nname = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2;
 			if (!strcmp(layer->Name, nname)) {
 				g_free(layeropts);
 				layeropts = pcb_strdup_printf("(type power) (use_net \"%s\")", layer->Name);
@@ -429,18 +429,18 @@
 {
 	int ni, nei;
 	fprintf(fp, "  (network\n");
-	for (ni = 0; ni < PCB->NetlistLib[NETLIST_EDITED].MenuN; ni++) {
-		fprintf(fp, "    (net \"%s\"\n", PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Name + 2);
+	for (ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++) {
+		fprintf(fp, "    (net \"%s\"\n", PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2);
 		fprintf(fp, "      (pins");
-		for (nei = 0; nei < PCB->NetlistLib[NETLIST_EDITED].Menu[ni].EntryN; nei++)
-			print_quoted_pin(fp, PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Entry[nei].ListEntry);
+		for (nei = 0; nei < PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].EntryN; nei++)
+			print_quoted_pin(fp, PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Entry[nei].ListEntry);
 		fprintf(fp, ")\n");
 		fprintf(fp, "    )\n");
 	}
 
 	fprintf(fp, "    (class geda_default");
-	for (ni = 0; ni < PCB->NetlistLib[NETLIST_EDITED].MenuN; ni++) {
-		fprintf(fp, " \"%s\"", PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Name + 2);
+	for (ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++) {
+		fprintf(fp, " \"%s\"", PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2);
 	}
 	pcb_fprintf(fp, "\n");
 	pcb_fprintf(fp, "      (circuit\n");
Index: trunk/src_plugins/export_ipcd356/ipcd356.c
===================================================================
--- trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 5027)
+++ trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 5028)
@@ -511,8 +511,8 @@
 
 	index = 1;
 
-	for (i = 0; i < PCB->NetlistLib[NETLIST_EDITED].MenuN; i++) {
-		if (strlen(PCB->NetlistLib[NETLIST_EDITED].Menu[i].Name + 2) > 14) {
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+		if (strlen(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].Name + 2) > 14) {
 			if (index == 1) {
 				fprintf(fd, "C  Netname Aliases Section\n");
 			}
@@ -521,7 +521,7 @@
 				return 1;
 			}
 			sprintf(aliaslist->Alias[index].NName, "NNAME%-5.5d", index);
-			strcpy(aliaslist->Alias[index].NetName, PCB->NetlistLib[NETLIST_EDITED].Menu[i].Name + 2);
+			strcpy(aliaslist->Alias[index].NetName, PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].Name + 2);
 
 			fprintf(fd, "P  %s  %-58.58s\n", aliaslist->Alias[index].NName, aliaslist->Alias[index].NetName);
 			index++;
Index: trunk/src_plugins/export_nelma/nelma.c
===================================================================
--- trunk/src_plugins/export_nelma/nelma.c	(revision 5027)
+++ trunk/src_plugins/export_nelma/nelma.c	(revision 5028)
@@ -305,7 +305,7 @@
 
 	const char *ext;
 
-	netlist = PCB->NetlistLib[NETLIST_EDITED];
+	netlist = PCB->NetlistLib[PCB_NETLIST_EDITED];
 
 	fprintf(out, "\n/* **** Nets **** */\n\n");
 
@@ -354,7 +354,7 @@
 
 	if (full) {
 		fprintf(out, "\tobjects = {\n");
-		netlist = PCB->NetlistLib[NETLIST_EDITED];
+		netlist = PCB->NetlistLib[PCB_NETLIST_EDITED];
 
 		for (n = 0; n < netlist.MenuN; n++) {
 			net = &netlist.Menu[n];
@@ -457,7 +457,7 @@
 
 	int n, m;
 
-	netlist = PCB->NetlistLib[NETLIST_EDITED];
+	netlist = PCB->NetlistLib[PCB_NETLIST_EDITED];
 
 	fprintf(out, "\n/* **** Objects **** */\n\n");
 
Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-netlist-window.c	(revision 5027)
+++ trunk/src_plugins/hid_gtk/gui-netlist-window.c	(revision 5028)
@@ -333,7 +333,7 @@
 	prefix_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)
 																			gtk_tree_row_reference_free);
 
-	MENU_LOOP(&PCB->NetlistLib[NETLIST_EDITED]);
+	MENU_LOOP(&PCB->NetlistLib[PCB_NETLIST_EDITED]);
 	{
 		if (!menu->Name)
 			continue;
@@ -649,7 +649,7 @@
 
 	/* No point in putting up the window if no netlist is loaded.
 	 */
-	if (!PCB->NetlistLib[NETLIST_EDITED].MenuN)
+	if (!PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN)
 		return;
 
 	if (netlist_window)
@@ -914,7 +914,7 @@
 
 	/* XXX Check if the select callback does this for us */
 	if (init_nodes)
-		node_model_update((&PCB->NetlistLib[NETLIST_EDITED])->Menu);
+		node_model_update((&PCB->NetlistLib[PCB_NETLIST_EDITED])->Menu);
 }
 
 static gint GhidNetlistChanged(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
Index: trunk/src_plugins/hid_gtk/gui-output-events.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-output-events.c	(revision 5027)
+++ trunk/src_plugins/hid_gtk/gui-output-events.c	(revision 5028)
@@ -319,7 +319,7 @@
 		return NULL;
 
 	/* Find netlist entry */
-	MENU_LOOP(&PCB->NetlistLib[NETLIST_EDITED]);
+	MENU_LOOP(&PCB->NetlistLib[PCB_NETLIST_EDITED]);
 	{
 		if (!menu->Name)
 			continue;
Index: trunk/src_plugins/hid_lesstif/netlist.c
===================================================================
--- trunk/src_plugins/hid_lesstif/netlist.c	(revision 5027)
+++ trunk/src_plugins/hid_lesstif/netlist.c	(revision 5028)
@@ -36,7 +36,7 @@
 
 static void pick_net(int pick)
 {
-	pcb_lib_menu_t *menu = PCB->NetlistLib[NETLIST_EDITED].Menu + pick;
+	pcb_lib_menu_t *menu = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + pick;
 	int i;
 
 	if (pick == last_pick)
@@ -59,7 +59,7 @@
 {
 	XmString str;
 	int pos = cbs->item_position;
-	pcb_lib_menu_t *net = &(PCB->NetlistLib[NETLIST_EDITED].Menu[pos - 1]);
+	pcb_lib_menu_t *net = &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[pos - 1]);
 	char *name = net->Name;
 	if (name[0] == ' ') {
 		name[0] = '*';
@@ -154,7 +154,7 @@
 	if (v == nbcb_find)
 		pcb_hid_actionl("connection", "reset", NULL);
 	for (i = 0; i < posc; i++) {
-		pcb_lib_menu_t *net = &(PCB->NetlistLib[NETLIST_EDITED].Menu[posl[i] - 1]);
+		pcb_lib_menu_t *net = &(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[posl[i] - 1]);
 		v(net, posl[i]);
 	}
 	stdarg_n = 0;
@@ -198,7 +198,7 @@
 
 static void netnode_browse(Widget w, XtPointer v, XmListCallbackStruct * cbs)
 {
-	pcb_lib_menu_t *menu = PCB->NetlistLib[NETLIST_EDITED].Menu + last_pick;
+	pcb_lib_menu_t *menu = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + last_pick;
 	const char *name = menu->Entry[cbs->item_position - 1].ListEntry;
 	char *ename, *pname;
 
@@ -346,7 +346,7 @@
 static int LesstifNetlistChanged(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
 	int i;
-	if (!PCB->NetlistLib[NETLIST_EDITED].MenuN)
+	if (!PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN)
 		return 0;
 	if (build_netlist_dialog())
 		return 0;
@@ -353,12 +353,12 @@
 	last_pick = -1;
 	if (netlist_strings)
 		free(netlist_strings);
-	netlist_strings = (XmString *) malloc(PCB->NetlistLib[NETLIST_EDITED].MenuN * sizeof(XmString));
-	for (i = 0; i < PCB->NetlistLib[NETLIST_EDITED].MenuN; i++)
-		netlist_strings[i] = XmStringCreatePCB(PCB->NetlistLib[NETLIST_EDITED].Menu[i].Name);
+	netlist_strings = (XmString *) malloc(PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN * sizeof(XmString));
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++)
+		netlist_strings[i] = XmStringCreatePCB(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[i].Name);
 	stdarg_n = 0;
 	stdarg(XmNitems, netlist_strings);
-	stdarg(XmNitemCount, PCB->NetlistLib[NETLIST_EDITED].MenuN);
+	stdarg(XmNitemCount, PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN);
 	XtSetValues(netlist_list, stdarg_args, stdarg_n);
 	pick_net(0);
 	return 0;
Index: trunk/src_plugins/import_edif/edif.c
===================================================================
--- trunk/src_plugins/import_edif/edif.c	(revision 5027)
+++ trunk/src_plugins/import_edif/edif.c	(revision 5028)
@@ -180,7 +180,7 @@
      char* buf;
      char* p;
      pcb_lib_entry_t *entry;
-     pcb_lib_menu_t *menu = pcb_lib_menu_new(&PCB->NetlistLib[NETLIST_INPUT], NULL);
+     pcb_lib_menu_t *menu = pcb_lib_menu_new(&PCB->NetlistLib[PCB_NETLIST_INPUT], NULL);
 
      if ( !name->str1 )
      {
Index: trunk/src_plugins/import_edif/edif.y
===================================================================
--- trunk/src_plugins/import_edif/edif.y	(revision 5027)
+++ trunk/src_plugins/import_edif/edif.y	(revision 5028)
@@ -107,7 +107,7 @@
      char* buf;
      char* p;
      pcb_lib_entry_t *entry;
-     pcb_lib_menu_t *menu = pcb_lib_menu_new(&PCB->NetlistLib[NETLIST_INPUT], NULL);
+     pcb_lib_menu_t *menu = pcb_lib_menu_new(&PCB->NetlistLib[PCB_NETLIST_INPUT], NULL);
 
      if ( !name->str1 )
      {
Index: trunk/src_plugins/import_netlist/import_netlist.c
===================================================================
--- trunk/src_plugins/import_netlist/import_netlist.c	(revision 5027)
+++ trunk/src_plugins/import_netlist/import_netlist.c	(revision 5028)
@@ -124,7 +124,7 @@
 			while (inputline[i] != '\0' && BLANK(inputline[i]))
 				i++;
 			if (kind == 0) {
-				menu = pcb_lib_menu_new(&PCB->NetlistLib[NETLIST_INPUT], NULL);
+				menu = pcb_lib_menu_new(&PCB->NetlistLib[PCB_NETLIST_INPUT], NULL);
 				menu->Name = pcb_strdup(temp);
 				menu->flag = 1;
 				kind++;
Index: trunk/src_plugins/io_kicad/write.c
===================================================================
--- trunk/src_plugins/io_kicad/write.c	(revision 5027)
+++ trunk/src_plugins/io_kicad/write.c	(revision 5028)
@@ -1008,8 +1008,8 @@
 	fprintf(FP, "\n%*s(net 0 \"\")\n", indentation, "");
 
 	/* now we step through any available netlists and generate descriptors */
-        for (n = 0, netNumber = 1; n < Layout->NetlistLib[NETLIST_EDITED].MenuN; n++, netNumber ++) {
-                menu = &Layout->NetlistLib[NETLIST_EDITED].Menu[n];
+        for (n = 0, netNumber = 1; n < Layout->NetlistLib[PCB_NETLIST_EDITED].MenuN; n++, netNumber ++) {
+                menu = &Layout->NetlistLib[PCB_NETLIST_EDITED].Menu[n];
 		netlist = &menu->Entry[0];
 		if (netlist != NULL) {
 			fprintf(FP, "%*s(net %d %s)\n", indentation, "", netNumber, pcb_netlist_name(menu));  /* netlist 0 was used for unconnected pads  */
Index: trunk/src_plugins/io_kicad_legacy/write.c
===================================================================
--- trunk/src_plugins/io_kicad_legacy/write.c	(revision 5027)
+++ trunk/src_plugins/io_kicad_legacy/write.c	(revision 5028)
@@ -971,8 +971,8 @@
 	fputs("$EndEQUIPOT\n",FP);
 
 	/* now we step through any available netlists and generate descriptors */
-        for (n = 0, netNumber = 1; n < Layout->NetlistLib[NETLIST_EDITED].MenuN; n++, netNumber ++) {
-                menu = &Layout->NetlistLib[NETLIST_EDITED].Menu[n];
+        for (n = 0, netNumber = 1; n < Layout->NetlistLib[PCB_NETLIST_EDITED].MenuN; n++, netNumber ++) {
+                menu = &Layout->NetlistLib[PCB_NETLIST_EDITED].Menu[n];
 		netlist = &menu->Entry[0];
 		if (netlist != NULL) {
 			fputs("$EQUIPOT\n",FP);
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 5027)
+++ trunk/src_plugins/io_lihata/read.c	(revision 5028)
@@ -930,7 +930,7 @@
 		return -1;
 
 	sub = lht_dom_hash_get(netlists, "input");
-	if ((sub != NULL) && (parse_netlist_input(pcb->NetlistLib+NETLIST_INPUT, sub) != 0))
+	if ((sub != NULL) && (parse_netlist_input(pcb->NetlistLib+PCB_NETLIST_INPUT, sub) != 0))
 		return -1;
 
 	sub = lht_dom_hash_get(netlists, "netlist_patch");
Index: trunk/src_plugins/io_lihata/write.c
===================================================================
--- trunk/src_plugins/io_lihata/write.c	(revision 5027)
+++ trunk/src_plugins/io_lihata/write.c	(revision 5028)
@@ -687,7 +687,7 @@
 	lht_node_t *nls;
 	int n, nonempty = 0;
 
-	if (num_netlists > NUM_NETLISTS)
+	if (num_netlists > PCB_NUM_NETLISTS)
 		return dummy_node("netlists");
 
 	nls = lht_dom_node_alloc(LHT_HASH, "netlists");
@@ -694,7 +694,7 @@
 
 	for(n = 0; n < num_netlists; n++) {
 		lht_node_t *nl;
-		if (n == NETLIST_EDITED)
+		if (n == PCB_NETLIST_EDITED)
 			nl = build_net_patch(pcb, pat, &nonempty);
 		else
 			nl = build_netlist(netlists+n, pcb_netlist_names[n], &nonempty);
@@ -720,7 +720,7 @@
 	lht_dom_hash_put(brd->root, build_attributes(&pcb->Attributes));
 	lht_dom_hash_put(brd->root, build_font(&pcb->Font));
 	lht_dom_hash_put(brd->root, build_styles(&pcb->RouteStyle));
-	lht_dom_hash_put(brd->root, build_netlists(pcb, pcb->NetlistLib, pcb->NetlistPatches, NUM_NETLISTS));
+	lht_dom_hash_put(brd->root, build_netlists(pcb, pcb->NetlistLib, pcb->NetlistPatches, PCB_NUM_NETLISTS));
 	return brd;
 }
 
Index: trunk/src_plugins/io_pcb/file.c
===================================================================
--- trunk/src_plugins/io_pcb/file.c	(revision 5027)
+++ trunk/src_plugins/io_pcb/file.c	(revision 5028)
@@ -327,12 +327,12 @@
 static void WritePCBNetlistData(FILE * FP)
 {
 	/* write out the netlist if it exists */
-	if (PCB->NetlistLib[NETLIST_INPUT].MenuN) {
+	if (PCB->NetlistLib[PCB_NETLIST_INPUT].MenuN) {
 		int n, p;
 		fprintf(FP, "NetList()\n(\n");
 
-		for (n = 0; n < PCB->NetlistLib[NETLIST_INPUT].MenuN; n++) {
-			pcb_lib_menu_t *menu = &PCB->NetlistLib[NETLIST_INPUT].Menu[n];
+		for (n = 0; n < PCB->NetlistLib[PCB_NETLIST_INPUT].MenuN; n++) {
+			pcb_lib_menu_t *menu = &PCB->NetlistLib[PCB_NETLIST_INPUT].Menu[n];
 			fprintf(FP, "\tNet(");
 			pcb_print_quoted_string(FP, &menu->Name[2]);
 			fprintf(FP, " ");
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 5027)
+++ trunk/src_plugins/report/report.c	(revision 5028)
@@ -562,9 +562,9 @@
 	pcb_reset_conns(pcb_true);
 	pcb_undo_inc_serial();
 
-	for (ni = 0; ni < PCB->NetlistLib[NETLIST_EDITED].MenuN; ni++) {
-		const char *netname = PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Name + 2;
-		const char *list_entry = PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Entry[0].ListEntry;
+	for (ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++) {
+		const char *netname = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2;
+		const char *list_entry = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Entry[0].ListEntry;
 		char *ename;
 		char *pname;
 		pcb_bool got_one = 0;
@@ -668,10 +668,10 @@
 
 				if (ename && pname) {
 					n = pcb_concat(ename, "-", pname, NULL);
-					for (ni = 0; ni < PCB->NetlistLib[NETLIST_EDITED].MenuN; ni++)
-						for (nei = 0; nei < PCB->NetlistLib[NETLIST_EDITED].Menu[ni].EntryN; nei++) {
-							if (strcmp(PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Entry[nei].ListEntry, n) == 0) {
-								netname = PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Name + 2;
+					for (ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++)
+						for (nei = 0; nei < PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].EntryN; nei++) {
+							if (strcmp(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Entry[nei].ListEntry, n) == 0) {
+								netname = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2;
 								goto got_net_name;	/* four for loops deep */
 							}
 						}
@@ -689,10 +689,10 @@
 
 				if (ename && pname) {
 					n = pcb_concat(ename, "-", pname, NULL);
-					for (ni = 0; ni < PCB->NetlistLib[NETLIST_EDITED].MenuN; ni++)
-						for (nei = 0; nei < PCB->NetlistLib[NETLIST_EDITED].Menu[ni].EntryN; nei++) {
-							if (strcmp(PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Entry[nei].ListEntry, n) == 0) {
-								netname = PCB->NetlistLib[NETLIST_EDITED].Menu[ni].Name + 2;
+					for (ni = 0; ni < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; ni++)
+						for (nei = 0; nei < PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].EntryN; nei++) {
+							if (strcmp(PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Entry[nei].ListEntry, n) == 0) {
+								netname = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu[ni].Name + 2;
 								goto got_net_name;	/* four for loops deep */
 							}
 						}
@@ -738,8 +738,8 @@
 		return 1;
 
 	use_re = 1;
-	for (i = 0; i < PCB->NetlistLib[NETLIST_EDITED].MenuN; i++) {
-		net = PCB->NetlistLib[NETLIST_EDITED].Menu + i;
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+		net = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + i;
 		if (strcasecmp(tofind, net->Name + 2) == 0)
 			use_re = 0;
 	}
@@ -752,8 +752,8 @@
 		}
 	}
 
-	for (i = 0; i < PCB->NetlistLib[NETLIST_EDITED].MenuN; i++) {
-		net = PCB->NetlistLib[NETLIST_EDITED].Menu + i;
+	for (i = 0; i < PCB->NetlistLib[PCB_NETLIST_EDITED].MenuN; i++) {
+		net = PCB->NetlistLib[PCB_NETLIST_EDITED].Menu + i;
 
 		if (use_re) {
 			if (re_sei_exec(regex, net->Name + 2) == 0)