Index: trunk/src/netlist.c
===================================================================
--- trunk/src/netlist.c	(revision 23273)
+++ trunk/src/netlist.c	(revision 23274)
@@ -90,120 +90,6 @@
 	return 0;
 }
 
-pcb_any_obj_t *pcb_pin_name_to_obj(pcb_lib_entry_t *pin)
-{
-	pcb_connection_t conn;
-	if (!pcb_rat_seek_pad(pin, &conn, pcb_false))
-		return NULL;
-	return conn.obj;
-}
-
-
-static unsigned long pcb_netlist_setclrflg(pcb_lib_menu_t *net, pcb_lib_entry_t *pin, pcb_flag_values_t setf, pcb_flag_values_t clrf)
-{
-	pcb_find_t fctx;
-	pcb_any_obj_t *o = pcb_pin_name_to_obj(pin);
-	unsigned long res;
-
-	if (o == NULL)
-		return 0;
-
-	memset(&fctx, 0, sizeof(fctx));
-	fctx.flag_set = setf;
-	fctx.flag_clr = clrf;
-	fctx.flag_chg_undoable = 1;
-	fctx.consider_rats = 1;
-	res = pcb_find_from_obj(&fctx, PCB->Data, o);
-	pcb_find_free(&fctx);
-	return res;
-}
-
-void pcb_netlist_find(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
-{
-	if (pcb_brave & PCB_BRAVE_NETLIST2)
-		pcb_net_crawl_flag(PCB, pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0), PCB_FLAG_FOUND, 0);
-	else
-		pcb_netlist_setclrflg(net, pin, PCB_FLAG_FOUND, 0);
-}
-
-void pcb_netlist_select(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
-{
-	if (pcb_brave & PCB_BRAVE_NETLIST2)
-		pcb_net_crawl_flag(PCB, pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0), PCB_FLAG_SELECTED, 0);
-	else
-		pcb_netlist_setclrflg(net, pin, PCB_FLAG_SELECTED, 0);
-}
-
-void pcb_netlist_unselect(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
-{
-	if (pcb_brave & PCB_BRAVE_NETLIST2)
-		pcb_net_crawl_flag(PCB, pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0), 0, PCB_FLAG_SELECTED);
-	else
-	pcb_netlist_setclrflg(net, pin, 0, PCB_FLAG_SELECTED);
-}
-
-void pcb_netlist_rats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
-{
-	if (pcb_brave & PCB_BRAVE_NETLIST2)
-		pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0)->inhibit_rats = 0;
-	net->Name[0] = ' ';
-	net->flag = 1;
-	pcb_netlist_changed(0);
-}
-
-void pcb_netlist_norats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
-{
-	if (pcb_brave & PCB_BRAVE_NETLIST2)
-		pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0)->inhibit_rats = 1;
-	net->Name[0] = '*';
-	net->flag = 0;
-	pcb_netlist_changed(0);
-}
-
-/* The primary purpose of this action is to remove the netlist
-   completely so that a new one can be loaded, usually via a gsch2pcb
-   style script.  */
-void pcb_netlist_clear(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
-{
-	pcb_lib_t *netlist = (pcb_lib_t *) & PCB->NetlistLib;
-	int ni, pi;
-
-	if (net == 0) {
-		/* Clear the entire netlist. */
-		for (ni = 0; ni < PCB_NUM_NETLISTS; ni++)
-			pcb_lib_free(&(PCB->NetlistLib[ni]));
-	}
-	else if (pin == 0) {
-		/* Remove a net from the netlist. */
-		ni = net - netlist->Menu;
-		if (ni >= 0 && ni < netlist->MenuN) {
-			/* if there is exactly one item, MenuN is 1 and ni is 0 */
-			if (netlist->MenuN - ni > 1)
-				memmove(net, net + 1, (netlist->MenuN - ni - 1) * sizeof(*net));
-			netlist->MenuN--;
-		}
-	}
-	else {
-		/* Remove a pin from the given net.  Note that this may leave an
-		   empty net, which is different than removing the net
-		   (above).  */
-		pi = pin - net->Entry;
-		if (pi >= 0 && pi < net->EntryN) {
-			/* if there is exactly one item, MenuN is 1 and ni is 0 */
-			if (net->EntryN - pi > 1)
-				memmove(pin, pin + 1, (net->EntryN - pi - 1) * sizeof(*pin));
-			net->EntryN--;
-		}
-	}
-	pcb_netlist_changed(0);
-}
-
-void pcb_netlist_style(pcb_lib_menu_t *net, const char *style)
-{
-	free(net->Style);
-	net->Style = pcb_strdup_null((char *) style);
-}
-
 pcb_lib_menu_t *pcb_netlist_find_net4pinname(pcb_board_t *pcb, const char *pin)
 {
 	int n;
Index: trunk/src/netlist.h
===================================================================
--- trunk/src/netlist.h	(revision 23273)
+++ trunk/src/netlist.h	(revision 23274)
@@ -62,14 +62,6 @@
 pcb_lib_menu_t *pcb_netnode_to_netname(const char *nodename);
 pcb_lib_menu_t *pcb_netname_to_netname(const char *netname);
 
-void pcb_netlist_find(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
-void pcb_netlist_select(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
-void pcb_netlist_unselect(pcb_lib_menu_t * net, pcb_lib_entry_t * pin);
-void pcb_netlist_rats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
-void pcb_netlist_norats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
-void pcb_netlist_clear(pcb_lib_menu_t *net, pcb_lib_entry_t *pin);
-void pcb_netlist_style(pcb_lib_menu_t *net, const char *style);
-
 /* Return the net entry for a pin name (slow search). The pin name is
    like "U101-5", so element's refdes, dash, pin number */
 pcb_lib_menu_t *pcb_netlist_find_net4pinname(pcb_board_t *pcb, const char *pinname);
Index: trunk/src/netlist_act.c
===================================================================
--- trunk/src/netlist_act.c	(revision 23273)
+++ trunk/src/netlist_act.c	(revision 23274)
@@ -44,10 +44,14 @@
 #include "actions.h"
 #include "compat_nls.h"
 #include "compat_misc.h"
-#include "netlist.h"
 #include "netlist2.h"
 #include "data_it.h"
+#include "find.h"
+
+TODO("netlist: remove these all with the old netlist removal")
 #include "brave.h"
+#include "netlist.h"
+#include "rats.h"
 
 static int pcb_netlist_swap()
 {
@@ -155,6 +159,122 @@
 	return 0;
 }
 
+TODO("netlist: remove with the old netlist code:")
+static pcb_any_obj_t *pcb_pin_name_to_obj(pcb_lib_entry_t *pin)
+{
+	pcb_connection_t conn;
+	if (!pcb_rat_seek_pad(pin, &conn, pcb_false))
+		return NULL;
+	return conn.obj;
+}
+
+static unsigned long pcb_netlist_setclrflg(pcb_lib_menu_t *net, pcb_lib_entry_t *pin, pcb_flag_values_t setf, pcb_flag_values_t clrf)
+{
+	pcb_find_t fctx;
+	pcb_any_obj_t *o;
+	unsigned long res;
+
+	o = pcb_pin_name_to_obj(pin);
+	if (o == NULL)
+		return 0;
+
+	memset(&fctx, 0, sizeof(fctx));
+	fctx.flag_set = setf;
+	fctx.flag_clr = clrf;
+	fctx.flag_chg_undoable = 1;
+	fctx.consider_rats = 1;
+	res = pcb_find_from_obj(&fctx, PCB->Data, o);
+	pcb_find_free(&fctx);
+	return res;
+}
+
+static void pcb_netlist_find(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
+{
+	if (pcb_brave & PCB_BRAVE_NETLIST2)
+		pcb_net_crawl_flag(PCB, pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0), PCB_FLAG_FOUND, 0);
+	else
+		pcb_netlist_setclrflg(net, pin, PCB_FLAG_FOUND, 0);
+}
+
+static void pcb_netlist_select(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
+{
+	if (pcb_brave & PCB_BRAVE_NETLIST2)
+		pcb_net_crawl_flag(PCB, pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0), PCB_FLAG_SELECTED, 0);
+	else
+		pcb_netlist_setclrflg(net, pin, PCB_FLAG_SELECTED, 0);
+}
+
+static void pcb_netlist_unselect(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
+{
+	if (pcb_brave & PCB_BRAVE_NETLIST2)
+		pcb_net_crawl_flag(PCB, pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0), 0, PCB_FLAG_SELECTED);
+	else
+	pcb_netlist_setclrflg(net, pin, 0, PCB_FLAG_SELECTED);
+}
+
+static void pcb_netlist_rats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
+{
+	if (pcb_brave & PCB_BRAVE_NETLIST2)
+		pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0)->inhibit_rats = 0;
+	net->Name[0] = ' ';
+	net->flag = 1;
+	pcb_netlist_changed(0);
+}
+
+static void pcb_netlist_norats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
+{
+	if (pcb_brave & PCB_BRAVE_NETLIST2)
+		pcb_net_get(PCB, &PCB->netlist[0], net->Name+2, 0)->inhibit_rats = 1;
+	net->Name[0] = '*';
+	net->flag = 0;
+	pcb_netlist_changed(0);
+}
+
+/* The primary purpose of this action is to remove the netlist
+   completely so that a new one can be loaded, usually via a gsch2pcb
+   style script.  */
+static void pcb_netlist_clear(pcb_lib_menu_t *net, pcb_lib_entry_t *pin)
+{
+	pcb_lib_t *netlist = (pcb_lib_t *) & PCB->NetlistLib;
+	int ni, pi;
+
+	if (net == 0) {
+		/* Clear the entire netlist. */
+		for (ni = 0; ni < PCB_NUM_NETLISTS; ni++)
+			pcb_lib_free(&(PCB->NetlistLib[ni]));
+	}
+	else if (pin == 0) {
+		/* Remove a net from the netlist. */
+		ni = net - netlist->Menu;
+		if (ni >= 0 && ni < netlist->MenuN) {
+			/* if there is exactly one item, MenuN is 1 and ni is 0 */
+			if (netlist->MenuN - ni > 1)
+				memmove(net, net + 1, (netlist->MenuN - ni - 1) * sizeof(*net));
+			netlist->MenuN--;
+		}
+	}
+	else {
+		/* Remove a pin from the given net.  Note that this may leave an
+		   empty net, which is different than removing the net
+		   (above).  */
+		pi = pin - net->Entry;
+		if (pi >= 0 && pi < net->EntryN) {
+			/* if there is exactly one item, MenuN is 1 and ni is 0 */
+			if (net->EntryN - pi > 1)
+				memmove(pin, pin + 1, (net->EntryN - pi - 1) * sizeof(*pin));
+			net->EntryN--;
+		}
+	}
+	pcb_netlist_changed(0);
+}
+
+static void pcb_netlist_style(pcb_lib_menu_t *net, const char *style)
+{
+	free(net->Style);
+	net->Style = pcb_strdup_null((char *) style);
+}
+
+
 static const char pcb_acts_Netlist[] =
 	"Net(find|select|rats|norats|clear[,net[,pin]])\n" "Net(freeze|thaw|forcethaw)\n" "Net(swap)\n" "Net(add,net,pin)";