Index: trunk/src/box.c
===================================================================
--- trunk/src/box.c	(revision 4761)
+++ trunk/src/box.c	(revision 4762)
@@ -34,7 +34,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a box, allocates memory if necessary
  */
-pcb_box_t *GetBoxMemory(BoxListTypePtr Boxes)
+pcb_box_t *GetBoxMemory(pcb_box_list_t *Boxes)
 {
 	pcb_box_t *box = Boxes->Box;
 
@@ -51,11 +51,11 @@
 /* ---------------------------------------------------------------------------
  * frees memory used by a box list
  */
-void FreeBoxListMemory(BoxListTypePtr Boxlist)
+void FreeBoxListMemory(pcb_box_list_t *Boxlist)
 {
 	if (Boxlist) {
 		free(Boxlist->Box);
-		memset(Boxlist, 0, sizeof(BoxListType));
+		memset(Boxlist, 0, sizeof(pcb_box_list_t));
 	}
 }
 
Index: trunk/src/box.h
===================================================================
--- trunk/src/box.h	(revision 4761)
+++ trunk/src/box.h	(revision 4762)
@@ -42,7 +42,7 @@
 #include "move.h"
 #include "obj_common.h"
 
-struct pcb_boxlist_s {
+struct pcb_box_list_s {
 	pcb_cardinal_t BoxN,								/* the number of boxes contained */
 	  BoxMax;											/* max boxes from malloc */
 	pcb_box_t *Box;
@@ -221,8 +221,8 @@
 	return Distance(r.X, r.Y, p->X, p->Y);
 }
 
-pcb_box_t *GetBoxMemory(BoxListTypePtr);
-void FreeBoxListMemory(BoxListTypePtr);
+pcb_box_t *GetBoxMemory(pcb_box_list_t *);
+void FreeBoxListMemory(pcb_box_list_t *);
 void SetPointBoundingBox(PointTypePtr Pnt);
 
 #endif /* __BOX_H_INCLUDED__ */
Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 4761)
+++ trunk/src/global_typedefs.h	(revision 4762)
@@ -32,7 +32,7 @@
 typedef struct pcb_net_s pcb_net_t;
 typedef struct pcb_connection_s pcb_connection_t;
 typedef struct pcb_box_s pcb_box_t;
-typedef struct pcb_boxlist_s  BoxListType, *BoxListTypePtr;
+typedef struct pcb_box_list_s pcb_box_list_t;
 typedef struct pcb_font_s  FontType, *FontTypePtr;
 typedef struct pcb_line_s LineType, *LineTypePtr;
 typedef struct pcb_arc_s ArcType, *ArcTypePtr;
Index: trunk/src/intersect.c
===================================================================
--- trunk/src/intersect.c	(revision 4761)
+++ trunk/src/intersect.c	(revision 4762)
@@ -67,7 +67,7 @@
 /* ---------------------------------------------------------------------------
  * Create a sorted list of unique y coords from a BoxList.
  */
-static LocationList createSortedYList(BoxListTypePtr boxlist)
+static LocationList createSortedYList(pcb_box_list_t *boxlist)
 {
 	LocationList yCoords;
 	Coord last;
@@ -162,7 +162,7 @@
  * etc.).
  * Runs in O(N ln N) time.
  */
-double ComputeIntersectionArea(BoxListTypePtr boxlist)
+double ComputeIntersectionArea(pcb_box_list_t *boxlist)
 {
 	pcb_cardinal_t i;
 	double area = 0.0;
@@ -177,7 +177,7 @@
  * Compute the area of the union of the given rectangles.
  * O(N ln N) time.
  */
-double ComputeUnionArea(BoxListTypePtr boxlist)
+double ComputeUnionArea(pcb_box_list_t *boxlist)
 {
 	pcb_box_t **rectLeft, **rectRight;
 	pcb_cardinal_t i, j;
Index: trunk/src/intersect.h
===================================================================
--- trunk/src/intersect.h	(revision 4761)
+++ trunk/src/intersect.h	(revision 4762)
@@ -37,7 +37,7 @@
 
 #include "global_typedefs.h"
 
-double ComputeIntersectionArea(BoxListTypePtr boxlist);	/* will sort boxlist */
-double ComputeUnionArea(BoxListTypePtr boxlist);
+double ComputeIntersectionArea(pcb_box_list_t *boxlist);	/* will sort boxlist */
+double ComputeUnionArea(pcb_box_list_t *boxlist);
 
 #endif
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 4761)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 4762)
@@ -190,7 +190,7 @@
 
 #if 0														/* only for debugging box lists */
 /* makes a line on the solder layer surrounding all boxes in blist */
-static void showboxes(BoxListTypePtr blist)
+static void showboxes(pcb_box_list_t *blist)
 {
 	pcb_cardinal_t i;
 	pcb_layer_t *SLayer = &(PCB->Data->Layer[solder_silk_layer]);
@@ -304,9 +304,9 @@
 	Coord minx, maxx, miny, maxy;
 	pcb_bool allpads, allsameside;
 	pcb_cardinal_t thegroup;
-	BoxListType bounds = { 0, 0, NULL };	/* save bounding rectangles here */
-	BoxListType solderside = { 0, 0, NULL };	/* solder side component bounds */
-	BoxListType componentside = { 0, 0, NULL };	/* component side bounds */
+	pcb_box_list_t bounds = { 0, 0, NULL };	/* save bounding rectangles here */
+	pcb_box_list_t solderside = { 0, 0, NULL };	/* solder side component bounds */
+	pcb_box_list_t componentside = { 0, 0, NULL };	/* component side bounds */
 	/* make sure the NetList have the proper updated X and Y coords */
 	UpdateXY(Nets);
 	/* wire length term.  approximated by half-perimeter of minimum
@@ -358,8 +358,8 @@
 
 	ELEMENT_LOOP(PCB->Data);
 	{
-		BoxListTypePtr thisside;
-		BoxListTypePtr otherside;
+		pcb_box_list_t *thisside;
+		pcb_box_list_t *otherside;
 		pcb_box_t *box;
 		pcb_box_t *lastbox = NULL;
 		Coord thickness;