Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 15736)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 15737)
@@ -155,7 +155,7 @@
 {
 	int n, ds = 0;
 	for (n = AllDrills->DrillN - 1; n >= 0; n--) {
-		DrillTypePtr drill = &(AllDrills->Drill[n]);
+		DrillType *drill = &(AllDrills->Drill[n]);
 		if (drill->PinCount + drill->ViaCount > drill->UnplatedCount)
 			ds++;
 		if (drill->UnplatedCount)
@@ -202,7 +202,7 @@
 
 	for (n = AllDrills->DrillN - 1; n >= 0; n--) {
 		int plated_sym = -1, unplated_sym = -1;
-		DrillTypePtr drill = &(AllDrills->Drill[n]);
+		DrillType *drill = &(AllDrills->Drill[n]);
 		if (drill->PinCount + drill->ViaCount > drill->UnplatedCount)
 			plated_sym = --ds;
 		if (drill->UnplatedCount)
Index: trunk/src_plugins/report/drill.c
===================================================================
--- trunk/src_plugins/report/drill.c	(revision 15736)
+++ trunk/src_plugins/report/drill.c	(revision 15737)
@@ -42,9 +42,9 @@
 #define STEP_DRILL   30
 #define STEP_POINT   100
 
-static void drill_init(DrillTypePtr, pcb_pin_t *, pcb_element_t *);
+static void drill_init(DrillType *, pcb_pin_t *, pcb_element_t *);
 
-static void drill_fill(DrillTypePtr Drill, pcb_any_obj_t *hole, int unplated)
+static void drill_fill(DrillType * Drill, pcb_any_obj_t *hole, int unplated)
 {
 	pcb_cardinal_t n;
 	pcb_any_obj_t **pnew;
@@ -68,7 +68,7 @@
 		Drill->UnplatedCount++;
 }
 
-static void drill_init(DrillTypePtr drill, pcb_pin_t *pin, pcb_element_t *element)
+static void drill_init(DrillType *drill, pcb_pin_t *pin, pcb_element_t *element)
 {
 	void *ptr;
 
@@ -105,7 +105,7 @@
 DrillInfoType *drill_get_info(pcb_data_t *top)
 {
 	DrillInfoType *AllDrills;
-	DrillTypePtr Drill = NULL;
+	DrillType *Drill = NULL;
 	DrillType savedrill, swapdrill;
 	pcb_bool DrillFound = pcb_false;
 	pcb_bool NewDrill;
@@ -219,14 +219,14 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a Drill, allocates memory if necessary
  */
-DrillTypePtr drill_info_alloc(DrillInfoType *DrillInfo)
+DrillType *drill_info_alloc(DrillInfoType *DrillInfo)
 {
-	DrillTypePtr drill = DrillInfo->Drill;
+	DrillType *drill = DrillInfo->Drill;
 
 	/* realloc new memory if necessary and clear it */
 	if (DrillInfo->DrillN >= DrillInfo->DrillMax) {
 		DrillInfo->DrillMax += STEP_DRILL;
-		drill = (DrillTypePtr) realloc(drill, DrillInfo->DrillMax * sizeof(DrillType));
+		drill = (DrillType *) realloc(drill, DrillInfo->DrillMax * sizeof(DrillType));
 		DrillInfo->Drill = drill;
 		memset(drill + DrillInfo->DrillN, 0, STEP_DRILL * sizeof(DrillType));
 	}
@@ -236,7 +236,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a DrillPoint, allocates memory if necessary
  */
-pcb_any_obj_t **drill_pin_alloc(DrillTypePtr Drill)
+pcb_any_obj_t **drill_pin_alloc(DrillType *Drill)
 {
 	pcb_any_obj_t **pin;
 
@@ -255,7 +255,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a DrillElement, allocates memory if necessary
  */
-pcb_any_obj_t **drill_element_alloc(DrillTypePtr Drill)
+pcb_any_obj_t **drill_element_alloc(DrillType *Drill)
 {
 	pcb_any_obj_t **element;
 
Index: trunk/src_plugins/report/drill.h
===================================================================
--- trunk/src_plugins/report/drill.h	(revision 15736)
+++ trunk/src_plugins/report/drill.h	(revision 15737)
@@ -41,12 +41,12 @@
 	  PinMax;											/* max number of coordinates from malloc() */
 	pcb_any_obj_t **hole;					/* the objects that had the drill */
 	pcb_any_obj_t **parent;				/* all parents referenced by any hole above */
-} DrillType, *DrillTypePtr;
+} DrillType;
 
 typedef struct {								/* holds a range of Drill Infos */
 	pcb_cardinal_t DrillN,							/* number of drill sizes */
 	  DrillMax;										/* max number from malloc() */
-	DrillTypePtr Drill;						/* plated holes */
+	DrillType *Drill;						/* plated holes */
 } DrillInfoType;
 
 DrillInfoType *drill_get_info(pcb_data_t *);
@@ -58,7 +58,7 @@
 
 #define DRILL_LOOP(top) do             {                           \
         pcb_cardinal_t        n;                                   \
-        DrillTypePtr    drill;                                     \
+        DrillType   *drill;                                     \
         for (n = 0; (top)->DrillN > 0 && n < (top)->DrillN; n++)   \
         {                                                          \
                 drill = &(top)->Drill[n]