Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 4758)
+++ trunk/src/global_typedefs.h	(revision 4759)
@@ -29,7 +29,7 @@
 typedef struct pcb_layer_group_s pcb_layer_group_t;
 typedef struct pcb_layer_s pcb_layer_t;
 typedef struct pcb_buffer_s pcb_buffer_t;
-typedef struct pcb_net_s NetType, *NetTypePtr;
+typedef struct pcb_net_s pcb_net_t;
 typedef struct pcb_connection_s  ConnectionType, *ConnectionTypePtr;
 typedef struct pcb_box_s BoxType, *BoxTypePtr;
 typedef struct pcb_boxlist_s  BoxListType, *BoxListTypePtr;
Index: trunk/src/netlist.c
===================================================================
--- trunk/src/netlist.c	(revision 4758)
+++ trunk/src/netlist.c	(revision 4759)
@@ -255,16 +255,16 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a subnet, allocates memory if necessary
  */
-NetTypePtr GetNetMemory(NetListTypePtr Netlist)
+pcb_net_t *GetNetMemory(NetListTypePtr Netlist)
 {
-	NetTypePtr net = Netlist->Net;
+	pcb_net_t *net = Netlist->Net;
 
 	/* realloc new memory if necessary and clear it */
 	if (Netlist->NetN >= Netlist->NetMax) {
 		Netlist->NetMax += STEP_POINT;
-		net = (NetTypePtr) realloc(net, Netlist->NetMax * sizeof(NetType));
+		net = (pcb_net_t *) realloc(net, Netlist->NetMax * sizeof(pcb_net_t));
 		Netlist->Net = net;
-		memset(net + Netlist->NetN, 0, STEP_POINT * sizeof(NetType));
+		memset(net + Netlist->NetN, 0, STEP_POINT * sizeof(pcb_net_t));
 	}
 	return (net + Netlist->NetN++);
 }
@@ -321,10 +321,10 @@
 /* ---------------------------------------------------------------------------
  * frees memory used by a subnet
  */
-void FreeNetMemory(NetTypePtr Net)
+void FreeNetMemory(pcb_net_t *Net)
 {
 	if (Net) {
 		free(Net->Connection);
-		memset(Net, 0, sizeof(NetType));
+		memset(Net, 0, sizeof(pcb_net_t));
 	}
 }
Index: trunk/src/netlist.h
===================================================================
--- trunk/src/netlist.h	(revision 4758)
+++ trunk/src/netlist.h	(revision 4759)
@@ -42,7 +42,7 @@
 typedef struct {								/* holds a list of nets */
 	pcb_cardinal_t NetN,								/* the number of subnets contained */
 	  NetMax;											/* max subnets from malloc */
-	NetTypePtr Net;
+	pcb_net_t *Net;
 } NetListType, *NetListTypePtr;
 
 typedef struct {								/* holds a list of net lists */
@@ -87,11 +87,11 @@
 
 #define PCB_NETLIST_INVALID_INDEX ((pcb_cardinal_t)(-1))
 
-NetTypePtr GetNetMemory(NetListTypePtr);
+pcb_net_t *GetNetMemory(NetListTypePtr);
 NetListTypePtr GetNetListMemory(NetListListTypePtr);
 void FreeNetListListMemory(NetListListTypePtr);
 void FreeNetListMemory(NetListTypePtr);
-void FreeNetMemory(NetTypePtr);
+void FreeNetMemory(pcb_net_t *);
 
 #define NETLIST_LOOP(top) do   {                         \
         pcb_cardinal_t        n;                                      \
@@ -102,7 +102,7 @@
 
 #define NET_LOOP(top) do   {                             \
         pcb_cardinal_t        n;                                      \
-        NetTypePtr   net;                                       \
+        pcb_net_t *  net;                                       \
         for (n = (top)->NetN-1; n != -1; n--)                   \
         {                                                       \
                 net = &(top)->Net[n]
Index: trunk/src/obj_any.h
===================================================================
--- trunk/src/obj_any.h	(revision 4758)
+++ trunk/src/obj_any.h	(revision 4759)
@@ -88,7 +88,7 @@
 		PinType      *pin;
 		PinType      *via;
 		ElementType  *element;
-		NetType      *net;
+		pcb_net_t      *net;
 		pcb_layer_t    *layer;
 	} data;
 
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 4758)
+++ trunk/src/rats.c	(revision 4759)
@@ -65,7 +65,7 @@
 														 void (*)(register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr));
 static pcb_bool GatherSubnets(NetListTypePtr, pcb_bool, pcb_bool);
 static pcb_bool CheckShorts(LibraryMenuTypePtr);
-static void TransferNet(NetListTypePtr, NetTypePtr, NetTypePtr);
+static void TransferNet(NetListTypePtr, pcb_net_t *, pcb_net_t *);
 
 /* ---------------------------------------------------------------------------
  * some local identifiers
@@ -188,7 +188,7 @@
 {
 	ConnectionTypePtr connection;
 	ConnectionType LastPoint;
-	NetTypePtr net;
+	pcb_net_t *net;
 	static NetListTypePtr Wantlist = NULL;
 
 	if (!net_menu->MenuN)
@@ -289,7 +289,7 @@
  * copy all connections from one net into another
  * and then remove the first net from its netlist
  */
-static void TransferNet(NetListTypePtr Netl, NetTypePtr SourceNet, NetTypePtr DestNet)
+static void TransferNet(NetListTypePtr Netl, pcb_net_t *SourceNet, pcb_net_t *DestNet)
 {
 	ConnectionTypePtr conn;
 
@@ -306,7 +306,7 @@
 	/* remove SourceNet from its netlist */
 	*SourceNet = Netl->Net[--(Netl->NetN)];
 	/* zero out old garbage */
-	memset(&Netl->Net[Netl->NetN], 0, sizeof(NetType));
+	memset(&Netl->Net[Netl->NetN], 0, sizeof(pcb_net_t));
 }
 
 static pcb_bool CheckShorts(LibraryMenuTypePtr theNet)
@@ -395,7 +395,7 @@
  */
 static pcb_bool GatherSubnets(NetListTypePtr Netl, pcb_bool NoWarn, pcb_bool AndRats)
 {
-	NetTypePtr a, b;
+	pcb_net_t *a, *b;
 	ConnectionTypePtr conn;
 	pcb_cardinal_t m, n;
 	pcb_bool Warned = pcb_false;
@@ -501,7 +501,7 @@
 	pcb_bool changed = pcb_false;
 	pcb_bool havepoints;
 	pcb_cardinal_t n, m, j;
-	NetTypePtr next, subnet, theSubnet = NULL;
+	pcb_net_t *next, *subnet, *theSubnet = NULL;
 
 	/* This is just a sanity check, to make sure we're passed
 	 * *something*.
@@ -648,7 +648,7 @@
 					 void (*funcp) (register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr))
 {
 	NetListTypePtr Nets, Wantlist;
-	NetTypePtr lonesome;
+	pcb_net_t *lonesome;
 	ConnectionTypePtr onepin;
 	pcb_bool changed, Warned = pcb_false;
 
@@ -735,7 +735,7 @@
 {
 	NetListListType result = { 0, 0, NULL };
 	NetListTypePtr Nets, Wantlist;
-	NetTypePtr lonesome;
+	pcb_net_t *lonesome;
 	ConnectionTypePtr onepin;
 
 	/* the netlist library has the text form
@@ -928,7 +928,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a connection, allocates memory if necessary
  */
-ConnectionTypePtr GetConnectionMemory(NetTypePtr Net)
+ConnectionTypePtr GetConnectionMemory(pcb_net_t *Net)
 {
 	ConnectionTypePtr con = Net->Connection;
 
Index: trunk/src/rats.h
===================================================================
--- trunk/src/rats.h	(revision 4758)
+++ trunk/src/rats.h	(revision 4759)
@@ -55,7 +55,7 @@
 
 NetListTypePtr ProcNetlist(LibraryTypePtr);
 NetListListType CollectSubnets(pcb_bool);
-ConnectionTypePtr GetConnectionMemory(NetTypePtr);
+ConnectionTypePtr GetConnectionMemory(pcb_net_t *);
 
 #define CONNECTION_LOOP(net) do {                         \
         pcb_cardinal_t        n;                                      \
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 4758)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 4759)
@@ -314,7 +314,7 @@
 	 * all-SMD nets by making the rectangle a cube and weighting
 	 * the "layer height" of the net. */
 	for (i = 0; i < Nets->NetN; i++) {
-		NetTypePtr n = &Nets->Net[i];
+		pcb_net_t *n = &Nets->Net[i];
 		if (n->ConnectionN < 2)
 			continue;									/* no cost to go nowhere */
 		minx = maxx = n->Connection[0].X;