Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 15735)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 15736)
@@ -151,7 +151,7 @@
 	}
 }
 
-static int count_drill_lines(DrillInfoTypePtr AllDrills)
+static int count_drill_lines(DrillInfoType *AllDrills)
 {
 	int n, ds = 0;
 	for (n = AllDrills->DrillN - 1; n >= 0; n--) {
@@ -167,7 +167,7 @@
 
 static int DrawFab_overhang(void)
 {
-	DrillInfoTypePtr AllDrills = drill_get_info(PCB->Data);
+	DrillInfoType *AllDrills = drill_get_info(PCB->Data);
 	int ds = count_drill_lines(AllDrills);
 	if (ds < 4)
 		ds = 4;
@@ -176,7 +176,7 @@
 
 static void DrawFab(pcb_hid_gc_t gc, const pcb_hid_expose_ctx_t *e)
 {
-	DrillInfoTypePtr AllDrills;
+	DrillInfoType *AllDrills;
 	int i, n, yoff, total_drills = 0, ds = 0, found;
 	char utcTime[64];
 	AllDrills = drill_get_info(PCB->Data);
Index: trunk/src_plugins/report/drill.c
===================================================================
--- trunk/src_plugins/report/drill.c	(revision 15735)
+++ trunk/src_plugins/report/drill.c	(revision 15736)
@@ -102,9 +102,9 @@
 	return a->DrillSize - b->DrillSize;
 }
 
-DrillInfoTypePtr drill_get_info(pcb_data_t *top)
+DrillInfoType *drill_get_info(pcb_data_t *top)
 {
-	DrillInfoTypePtr AllDrills;
+	DrillInfoType *AllDrills;
 	DrillTypePtr Drill = NULL;
 	DrillType savedrill, swapdrill;
 	pcb_bool DrillFound = pcb_false;
@@ -112,7 +112,7 @@
 	pcb_rtree_it_t it;
 	pcb_box_t *pb;
 
-	AllDrills = (DrillInfoTypePtr) calloc(1, sizeof(DrillInfoType));
+	AllDrills = (DrillInfoType *)calloc(1, sizeof(DrillInfoType));
 
 	for(pb = pcb_r_first(top->padstack_tree, &it); pb != NULL; pb = pcb_r_next(&it)) {
 		pcb_pstk_t *ps = (pcb_pstk_t *)pb;
@@ -154,7 +154,7 @@
 
 #define ROUND(x,n) ((int)(((x)+(n)/2)/(n))*(n))
 
-void drill_round_info(DrillInfoTypePtr d, int roundto)
+void drill_round_info(DrillInfoType *d, int roundto)
 {
 	unsigned int i = 0;
 
@@ -204,7 +204,7 @@
 	}
 }
 
-void drill_info_free(DrillInfoTypePtr Drills)
+void drill_info_free(DrillInfoType *Drills)
 {
 	DRILL_LOOP(Drills);
 	{
@@ -219,7 +219,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a Drill, allocates memory if necessary
  */
-DrillTypePtr drill_info_alloc(DrillInfoTypePtr DrillInfo)
+DrillTypePtr drill_info_alloc(DrillInfoType *DrillInfo)
 {
 	DrillTypePtr drill = DrillInfo->Drill;
 
Index: trunk/src_plugins/report/drill.h
===================================================================
--- trunk/src_plugins/report/drill.h	(revision 15735)
+++ trunk/src_plugins/report/drill.h	(revision 15736)
@@ -47,14 +47,14 @@
 	pcb_cardinal_t DrillN,							/* number of drill sizes */
 	  DrillMax;										/* max number from malloc() */
 	DrillTypePtr Drill;						/* plated holes */
-} DrillInfoType, *DrillInfoTypePtr;
+} DrillInfoType;
 
-DrillInfoTypePtr drill_get_info(pcb_data_t *);
-void drill_info_free(DrillInfoTypePtr);
-void drill_round_info(DrillInfoTypePtr, int);
-DrillTypePtr drill_info_alloc(DrillInfoTypePtr);
-pcb_any_obj_t **drill_pin_alloc(DrillTypePtr);
-pcb_any_obj_t **drill_element_alloc(DrillTypePtr);
+DrillInfoType *drill_get_info(pcb_data_t *);
+void drill_info_free(DrillInfoType *);
+void drill_round_info(DrillInfoType *, int);
+DrillType *drill_info_alloc(DrillInfoType *);
+pcb_any_obj_t **drill_pin_alloc(DrillType *);
+pcb_any_obj_t **drill_element_alloc(DrillType *);
 
 #define DRILL_LOOP(top) do             {                           \
         pcb_cardinal_t        n;                                   \
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 15735)
+++ trunk/src_plugins/report/report.c	(revision 15736)
@@ -75,7 +75,7 @@
 
 static int report_drills(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	DrillInfoTypePtr AllDrills;
+	DrillInfoType *AllDrills;
 	pcb_cardinal_t n;
 	char *stringlist, *thestring;
 	int total_drills = 0;