Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 15737)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 15738)
@@ -151,11 +151,11 @@
 	}
 }
 
-static int count_drill_lines(DrillInfoType *AllDrills)
+static int count_drill_lines(pcb_drill_info_t *AllDrills)
 {
 	int n, ds = 0;
 	for (n = AllDrills->DrillN - 1; n >= 0; n--) {
-		DrillType *drill = &(AllDrills->Drill[n]);
+		pcb_drill_t *drill = &(AllDrills->Drill[n]);
 		if (drill->PinCount + drill->ViaCount > drill->UnplatedCount)
 			ds++;
 		if (drill->UnplatedCount)
@@ -167,7 +167,7 @@
 
 static int DrawFab_overhang(void)
 {
-	DrillInfoType *AllDrills = drill_get_info(PCB->Data);
+	pcb_drill_info_t *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)
 {
-	DrillInfoType *AllDrills;
+	pcb_drill_info_t *AllDrills;
 	int i, n, yoff, total_drills = 0, ds = 0, found;
 	char utcTime[64];
 	AllDrills = drill_get_info(PCB->Data);
@@ -202,7 +202,7 @@
 
 	for (n = AllDrills->DrillN - 1; n >= 0; n--) {
 		int plated_sym = -1, unplated_sym = -1;
-		DrillType *drill = &(AllDrills->Drill[n]);
+		pcb_drill_t *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 15737)
+++ trunk/src_plugins/report/drill.c	(revision 15738)
@@ -42,9 +42,9 @@
 #define STEP_DRILL   30
 #define STEP_POINT   100
 
-static void drill_init(DrillType *, pcb_pin_t *, pcb_element_t *);
+static void drill_init(pcb_drill_t *, pcb_pin_t *, pcb_element_t *);
 
-static void drill_fill(DrillType * Drill, pcb_any_obj_t *hole, int unplated)
+static void drill_fill(pcb_drill_t * 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(DrillType *drill, pcb_pin_t *pin, pcb_element_t *element)
+static void drill_init(pcb_drill_t *drill, pcb_pin_t *pin, pcb_element_t *element)
 {
 	void *ptr;
 
@@ -97,22 +97,22 @@
 
 static int drill_qsort_cmp(const void *va, const void *vb)
 {
-	DrillType *a = (DrillType *) va;
-	DrillType *b = (DrillType *) vb;
+	pcb_drill_t *a = (pcb_drill_t *) va;
+	pcb_drill_t *b = (pcb_drill_t *) vb;
 	return a->DrillSize - b->DrillSize;
 }
 
-DrillInfoType *drill_get_info(pcb_data_t *top)
+pcb_drill_info_t *drill_get_info(pcb_data_t *top)
 {
-	DrillInfoType *AllDrills;
-	DrillType *Drill = NULL;
-	DrillType savedrill, swapdrill;
+	pcb_drill_info_t *AllDrills;
+	pcb_drill_t *Drill = NULL;
+	pcb_drill_t savedrill, swapdrill;
 	pcb_bool DrillFound = pcb_false;
 	pcb_bool NewDrill;
 	pcb_rtree_it_t it;
 	pcb_box_t *pb;
 
-	AllDrills = (DrillInfoType *)calloc(1, sizeof(DrillInfoType));
+	AllDrills = (pcb_drill_info_t *)calloc(1, sizeof(pcb_drill_info_t));
 
 	for(pb = pcb_r_first(top->padstack_tree, &it); pb != NULL; pb = pcb_r_next(&it)) {
 		pcb_pstk_t *ps = (pcb_pstk_t *)pb;
@@ -148,13 +148,13 @@
 	}
 	pcb_r_end(&it);
 
-	qsort(AllDrills->Drill, AllDrills->DrillN, sizeof(DrillType), drill_qsort_cmp);
+	qsort(AllDrills->Drill, AllDrills->DrillN, sizeof(pcb_drill_t), drill_qsort_cmp);
 	return AllDrills;
 }
 
 #define ROUND(x,n) ((int)(((x)+(n)/2)/(n))*(n))
 
-void drill_round_info(DrillInfoType *d, int roundto)
+void drill_round_info(pcb_drill_info_t *d, int roundto)
 {
 	unsigned int i = 0;
 
@@ -194,7 +194,7 @@
 
 			d->Drill[i].DrillSize = diam1;
 
-			memmove(d->Drill + i + 1, d->Drill + i + 2, (d->DrillN - i - 2) * sizeof(DrillType));
+			memmove(d->Drill + i + 1, d->Drill + i + 2, (d->DrillN - i - 2) * sizeof(pcb_drill_t));
 			d->DrillN--;
 		}
 		else {
@@ -204,7 +204,7 @@
 	}
 }
 
-void drill_info_free(DrillInfoType *Drills)
+void drill_info_free(pcb_drill_info_t *Drills)
 {
 	DRILL_LOOP(Drills);
 	{
@@ -219,16 +219,16 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a Drill, allocates memory if necessary
  */
-DrillType *drill_info_alloc(DrillInfoType *DrillInfo)
+pcb_drill_t *drill_info_alloc(pcb_drill_info_t *DrillInfo)
 {
-	DrillType *drill = DrillInfo->Drill;
+	pcb_drill_t *drill = DrillInfo->Drill;
 
 	/* realloc new memory if necessary and clear it */
 	if (DrillInfo->DrillN >= DrillInfo->DrillMax) {
 		DrillInfo->DrillMax += STEP_DRILL;
-		drill = (DrillType *) realloc(drill, DrillInfo->DrillMax * sizeof(DrillType));
+		drill = (pcb_drill_t *) realloc(drill, DrillInfo->DrillMax * sizeof(pcb_drill_t));
 		DrillInfo->Drill = drill;
-		memset(drill + DrillInfo->DrillN, 0, STEP_DRILL * sizeof(DrillType));
+		memset(drill + DrillInfo->DrillN, 0, STEP_DRILL * sizeof(pcb_drill_t));
 	}
 	return (drill + DrillInfo->DrillN++);
 }
@@ -236,7 +236,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a DrillPoint, allocates memory if necessary
  */
-pcb_any_obj_t **drill_pin_alloc(DrillType *Drill)
+pcb_any_obj_t **drill_pin_alloc(pcb_drill_t *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(DrillType *Drill)
+pcb_any_obj_t **drill_element_alloc(pcb_drill_t *Drill)
 {
 	pcb_any_obj_t **element;
 
Index: trunk/src_plugins/report/drill.h
===================================================================
--- trunk/src_plugins/report/drill.h	(revision 15737)
+++ trunk/src_plugins/report/drill.h	(revision 15738)
@@ -41,24 +41,24 @@
 	  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;
+} pcb_drill_t;
 
 typedef struct {								/* holds a range of Drill Infos */
 	pcb_cardinal_t DrillN,							/* number of drill sizes */
 	  DrillMax;										/* max number from malloc() */
-	DrillType *Drill;						/* plated holes */
-} DrillInfoType;
+	pcb_drill_t *Drill;						/* plated holes */
+} pcb_drill_info_t;
 
-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 *);
+pcb_drill_info_t *drill_get_info(pcb_data_t *);
+void drill_info_free(pcb_drill_info_t *);
+void drill_round_info(pcb_drill_info_t *, int);
+pcb_drill_t *drill_info_alloc(pcb_drill_info_t *);
+pcb_any_obj_t **drill_pin_alloc(pcb_drill_t *);
+pcb_any_obj_t **drill_element_alloc(pcb_drill_t *);
 
 #define DRILL_LOOP(top) do             {                           \
         pcb_cardinal_t        n;                                   \
-        DrillType   *drill;                                     \
+        pcb_drill_t   *drill;                                     \
         for (n = 0; (top)->DrillN > 0 && n < (top)->DrillN; n++)   \
         {                                                          \
                 drill = &(top)->Drill[n]
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 15737)
+++ trunk/src_plugins/report/report.c	(revision 15738)
@@ -75,7 +75,7 @@
 
 static int report_drills(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	DrillInfoType *AllDrills;
+	pcb_drill_info_t *AllDrills;
 	pcb_cardinal_t n;
 	char *stringlist, *thestring;
 	int total_drills = 0;