Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 4759)
+++ trunk/src/global_typedefs.h	(revision 4760)
@@ -30,7 +30,7 @@
 typedef struct pcb_layer_s pcb_layer_t;
 typedef struct pcb_buffer_s pcb_buffer_t;
 typedef struct pcb_net_s pcb_net_t;
-typedef struct pcb_connection_s  ConnectionType, *ConnectionTypePtr;
+typedef struct pcb_connection_s pcb_connection_t;
 typedef struct pcb_box_s BoxType, *BoxTypePtr;
 typedef struct pcb_boxlist_s  BoxListType, *BoxListTypePtr;
 typedef struct pcb_font_s  FontType, *FontTypePtr;
Index: trunk/src/netlist.c
===================================================================
--- trunk/src/netlist.c	(revision 4759)
+++ trunk/src/netlist.c	(revision 4760)
@@ -99,7 +99,7 @@
 
 int pcb_pin_name_to_xy(LibraryEntryType * pin, Coord *x, Coord *y)
 {
-	ConnectionType conn;
+	pcb_connection_t conn;
 	if (!SeekPad(pin, &conn, pcb_false))
 		return 1;
 	switch (conn.type) {
Index: trunk/src/netlist.h
===================================================================
--- trunk/src/netlist.h	(revision 4759)
+++ trunk/src/netlist.h	(revision 4760)
@@ -35,7 +35,7 @@
 struct pcb_net_s {								/* holds a net of connections */
 	pcb_cardinal_t ConnectionN,					/* the number of connections contained */
 	  ConnectionMax;							/* max connections from malloc */
-	ConnectionTypePtr Connection;
+	pcb_connection_t *Connection;
 	RouteStyleTypePtr Style;
 };
 
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 4759)
+++ trunk/src/rats.c	(revision 4760)
@@ -59,10 +59,10 @@
 /* ---------------------------------------------------------------------------
  * some forward declarations
  */
-static pcb_bool FindPad(const char *, const char *, ConnectionType *, pcb_bool);
+static pcb_bool FindPad(const char *, const char *, pcb_connection_t *, pcb_bool);
 static pcb_bool ParseConnection(const char *, char *, char *);
 static pcb_bool DrawShortestRats(NetListTypePtr,
-														 void (*)(register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr));
+														 void (*)(register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr));
 static pcb_bool GatherSubnets(NetListTypePtr, pcb_bool, pcb_bool);
 static pcb_bool CheckShorts(LibraryMenuTypePtr);
 static void TransferNet(NetListTypePtr, pcb_net_t *, pcb_net_t *);
@@ -105,7 +105,7 @@
 /* ---------------------------------------------------------------------------
  * Find a particular pad from an element name and pin number
  */
-static pcb_bool FindPad(const char *ElementName, const char *PinNum, ConnectionType * conn, pcb_bool Same)
+static pcb_bool FindPad(const char *ElementName, const char *PinNum, pcb_connection_t * conn, pcb_bool Same)
 {
 	ElementTypePtr element;
 	gdl_iterator_t it;
@@ -153,7 +153,7 @@
  * parse a netlist menu entry and locate the corresponding pad
  * returns pcb_true if found, and fills in Connection information
  */
-pcb_bool SeekPad(LibraryEntryType * entry, ConnectionType * conn, pcb_bool Same)
+pcb_bool SeekPad(LibraryEntryType * entry, pcb_connection_t * conn, pcb_bool Same)
 {
 	int j;
 	char ElementName[256];
@@ -186,8 +186,8 @@
 
 NetListTypePtr ProcNetlist(LibraryTypePtr net_menu)
 {
-	ConnectionTypePtr connection;
-	ConnectionType LastPoint;
+	pcb_connection_t *connection;
+	pcb_connection_t LastPoint;
 	pcb_net_t *net;
 	static NetListTypePtr Wantlist = NULL;
 
@@ -291,7 +291,7 @@
  */
 static void TransferNet(NetListTypePtr Netl, pcb_net_t *SourceNet, pcb_net_t *DestNet)
 {
-	ConnectionTypePtr conn;
+	pcb_connection_t *conn;
 
 	/* It would be worth checking if SourceNet is NULL here to avoid a segfault. Seb James. */
 	CONNECTION_LOOP(SourceNet);
@@ -396,7 +396,7 @@
 static pcb_bool GatherSubnets(NetListTypePtr Netl, pcb_bool NoWarn, pcb_bool AndRats)
 {
 	pcb_net_t *a, *b;
-	ConnectionTypePtr conn;
+	pcb_connection_t *conn;
 	pcb_cardinal_t m, n;
 	pcb_bool Warned = pcb_false;
 
@@ -492,11 +492,11 @@
 
 static pcb_bool
 DrawShortestRats(NetListTypePtr Netl,
-								 void (*funcp) (register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr))
+								 void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr))
 {
 	RatTypePtr line;
 	register float distance, temp;
-	register ConnectionTypePtr conn1, conn2, firstpoint, secondpoint;
+	register pcb_connection_t *conn1, *conn2, *firstpoint, *secondpoint;
 	PolygonTypePtr polygon;
 	pcb_bool changed = pcb_false;
 	pcb_bool havepoints;
@@ -645,11 +645,11 @@
  */
 pcb_bool
 AddAllRats(pcb_bool SelectedOnly,
-					 void (*funcp) (register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr))
+					 void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr))
 {
 	NetListTypePtr Nets, Wantlist;
 	pcb_net_t *lonesome;
-	ConnectionTypePtr onepin;
+	pcb_connection_t *onepin;
 	pcb_bool changed, Warned = pcb_false;
 
 	/* the netlist library has the text form
@@ -736,7 +736,7 @@
 	NetListListType result = { 0, 0, NULL };
 	NetListTypePtr Nets, Wantlist;
 	pcb_net_t *lonesome;
-	ConnectionTypePtr onepin;
+	pcb_connection_t *onepin;
 
 	/* the netlist library has the text form
 	 * ProcNetlist fills in the Netlist
@@ -928,16 +928,16 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a connection, allocates memory if necessary
  */
-ConnectionTypePtr GetConnectionMemory(pcb_net_t *Net)
+pcb_connection_t *GetConnectionMemory(pcb_net_t *Net)
 {
-	ConnectionTypePtr con = Net->Connection;
+	pcb_connection_t *con = Net->Connection;
 
 	/* realloc new memory if necessary and clear it */
 	if (Net->ConnectionN >= Net->ConnectionMax) {
 		Net->ConnectionMax += STEP_POINT;
-		con = (ConnectionTypePtr) realloc(con, Net->ConnectionMax * sizeof(ConnectionType));
+		con = (pcb_connection_t *) realloc(con, Net->ConnectionMax * sizeof(pcb_connection_t));
 		Net->Connection = con;
-		memset(con + Net->ConnectionN, 0, STEP_POINT * sizeof(ConnectionType));
+		memset(con + Net->ConnectionN, 0, STEP_POINT * sizeof(pcb_connection_t));
 	}
 	return (con + Net->ConnectionN++);
 }
Index: trunk/src/rats.h
===================================================================
--- trunk/src/rats.h	(revision 4759)
+++ trunk/src/rats.h	(revision 4760)
@@ -50,16 +50,16 @@
 RatTypePtr AddNet(void);
 char *ConnectionName(int, void *, void *);
 
-pcb_bool AddAllRats(pcb_bool, void (*)(register ConnectionTypePtr, register ConnectionTypePtr, register RouteStyleTypePtr));
-pcb_bool SeekPad(LibraryEntryTypePtr, ConnectionTypePtr, pcb_bool);
+pcb_bool AddAllRats(pcb_bool, void (*)(register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr));
+pcb_bool SeekPad(LibraryEntryTypePtr, pcb_connection_t *, pcb_bool);
 
 NetListTypePtr ProcNetlist(LibraryTypePtr);
 NetListListType CollectSubnets(pcb_bool);
-ConnectionTypePtr GetConnectionMemory(pcb_net_t *);
+pcb_connection_t *GetConnectionMemory(pcb_net_t *);
 
 #define CONNECTION_LOOP(net) do {                         \
         pcb_cardinal_t        n;                                      \
-        ConnectionTypePtr       connection;                     \
+        pcb_connection_t *      connection;                     \
         for (n = (net)->ConnectionN-1; n != -1; n--)            \
         {                                                       \
                 connection = & (net)->Connection[n]
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 4759)
+++ trunk/src/select.c	(revision 4760)
@@ -982,7 +982,7 @@
 		{
 			pcb_cardinal_t i;
 			LibraryEntryType *entry;
-			ConnectionType conn;
+			pcb_connection_t conn;
 
 			/* Name[0] and Name[1] are special purpose, not the actual name */
 			if (menu->Name && menu->Name[0] != '\0' && menu->Name[1] != '\0' && REGEXEC(menu->Name + 2)) {
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 4759)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 4760)
@@ -150,7 +150,7 @@
 	/* update all nets */
 	for (i = 0; i < Nets->NetN; i++) {
 		for (j = 0; j < Nets->Net[i].ConnectionN; j++) {
-			ConnectionTypePtr c = &(Nets->Net[i].Connection[j]);
+			pcb_connection_t *c = &(Nets->Net[i].Connection[j]);
 			switch (c->type) {
 			case PCB_TYPE_PAD:
 				c->group = TEST_FLAG(PCB_FLAG_ONSOLDER, (ElementTypePtr) c->ptr1)
@@ -323,7 +323,7 @@
 		allpads = (n->Connection[0].type == PCB_TYPE_PAD);
 		allsameside = pcb_true;
 		for (j = 1; j < n->ConnectionN; j++) {
-			ConnectionTypePtr c = &(n->Connection[j]);
+			pcb_connection_t *c = &(n->Connection[j]);
 			MAKEMIN(minx, c->X);
 			MAKEMAX(maxx, c->X);
 			MAKEMIN(miny, c->Y);
Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-netlist-window.c	(revision 4759)
+++ trunk/src_plugins/hid_gtk/gui-netlist-window.c	(revision 4760)
@@ -197,7 +197,7 @@
 
 static void toggle_pin_selected(LibraryEntryType * entry)
 {
-	ConnectionType conn;
+	pcb_connection_t conn;
 
 	if (!SeekPad(entry, &conn, pcb_false))
 		return;
@@ -216,7 +216,7 @@
 	GtkTreeModel *model;
 	LibraryMenuType *node_net;
 	LibraryEntryType *node;
-	ConnectionType conn;
+	pcb_connection_t conn;
 	Coord x, y;
 	static gchar *node_name;
 
@@ -491,7 +491,7 @@
 static void netlist_select_cb(GtkWidget * widget, gpointer data)
 {
 	LibraryEntryType *entry;
-	ConnectionType conn;
+	pcb_connection_t conn;
 	gint i;
 	gboolean select_flag = GPOINTER_TO_INT(data);
 
Index: trunk/src_plugins/hid_lesstif/netlist.c
===================================================================
--- trunk/src_plugins/hid_lesstif/netlist.c	(revision 4759)
+++ trunk/src_plugins/hid_lesstif/netlist.c	(revision 4760)
@@ -112,7 +112,7 @@
 static void nbcb_select_common(LibraryMenuTypePtr net, int pos, int select_flag)
 {
 	LibraryEntryType *entry;
-	ConnectionType conn;
+	pcb_connection_t conn;
 	int i;
 
 	InitConnectionLookup();
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 4759)
+++ trunk/src_plugins/report/report.c	(revision 4760)
@@ -726,7 +726,7 @@
 	int found = 0;
 	int i;
 	LibraryMenuType *net;
-	ConnectionType conn;
+	pcb_connection_t conn;
 	int net_found = 0;
 	int use_re = 0;
 	re_sei_t *regex;
Index: trunk/src_plugins/smartdisperse/smartdisperse.c
===================================================================
--- trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 4759)
+++ trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 4760)
@@ -99,7 +99,7 @@
  * \brief Return the X location of a connection's pad or pin within its
  * element.
  */
-static Coord padDX(ConnectionType * conn)
+static Coord padDX(pcb_connection_t * conn)
 {
 	ElementType *element = (ElementType *) conn->ptr1;
 	AnyLineObjectType *line = (AnyLineObjectType *) conn->ptr2;
@@ -111,7 +111,7 @@
  * \brief Return true if ea,eb would be the best order, else eb,ea,
  * based on pad loc.
  */
-static int padorder(ConnectionType * conna, ConnectionType * connb)
+static int padorder(pcb_connection_t * conna, pcb_connection_t * connb)
 {
 	Coord dxa, dxb;
 
@@ -190,7 +190,7 @@
 	 */
 	NET_LOOP(Nets);
 	{
-		ConnectionType *conna, *connb;
+		pcb_connection_t *conna, *connb;
 		ElementType *ea, *eb;
 /*    ElementType *epp;*/