Index: drill.c
===================================================================
--- drill.c	(revision 30912)
+++ drill.c	(revision 30913)
@@ -41,7 +41,7 @@
 
 static void drill_fill(pcb_drill_t * Drill, pcb_any_obj_t *hole, int unplated)
 {
-	pcb_cardinal_t n;
+	rnd_cardinal_t n;
 	pcb_any_obj_t **pnew;
 	pcb_any_obj_t **hnew;
 
Index: drill.h
===================================================================
--- drill.h	(revision 30912)
+++ drill.h	(revision 30913)
@@ -32,7 +32,7 @@
 
 typedef struct {								/* holds drill information */
 	rnd_coord_t DrillSize;							/* this drill's diameter */
-	pcb_cardinal_t ElementN,						/* the number of elements using this drill size */
+	rnd_cardinal_t ElementN,						/* the number of elements using this drill size */
 	  ElementMax,									/* max number of elements from malloc() */
 	  PinCount,										/* number of pins drilled this size */
 	  ViaCount,										/* number of vias drilled this size */
@@ -44,7 +44,7 @@
 } pcb_drill_t;
 
 typedef struct {								/* holds a range of Drill Infos */
-	pcb_cardinal_t DrillN,							/* number of drill sizes */
+	rnd_cardinal_t DrillN,							/* number of drill sizes */
 	  DrillMax;										/* max number from malloc() */
 	pcb_drill_t *Drill;						/* plated holes */
 } pcb_drill_info_t;
@@ -57,7 +57,7 @@
 pcb_any_obj_t **drill_element_alloc(pcb_drill_t *);
 
 #define DRILL_LOOP(top) do             {                           \
-        pcb_cardinal_t        n;                                   \
+        rnd_cardinal_t        n;                                   \
         pcb_drill_t   *drill;                                     \
         for (n = 0; (top)->DrillN > 0 && n < (top)->DrillN; n++)   \
         {                                                          \
Index: report.c
===================================================================
--- report.c	(revision 30912)
+++ report.c	(revision 30913)
@@ -107,7 +107,7 @@
 static int report_drills(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	pcb_drill_info_t *AllDrills;
-	pcb_cardinal_t n;
+	rnd_cardinal_t n;
 	char *stringlist, *thestring;
 	int total_drills = 0;
 
@@ -449,7 +449,7 @@
 	pcb_board_t *pcb;
 	double length;
 	pcb_net_t *net;
-	pcb_cardinal_t terms, badterms, badobjs;
+	rnd_cardinal_t terms, badterms, badobjs;
 } net_length_t;
 
 static int net_length_cb(pcb_find_t *fctx, pcb_any_obj_t *o, pcb_any_obj_t *arrived_from, pcb_found_conn_type_t ctype)
@@ -514,7 +514,7 @@
 	pcb_find_free(&fctx);
 
 	if (nt.net != NULL) {
-		pcb_cardinal_t explen = pcb_termlist_length(&nt.net->conns);
+		rnd_cardinal_t explen = pcb_termlist_length(&nt.net->conns);
 		if (explen != nt.terms)
 			pcb_append_printf(err, "\nonly %ld terminals of the %ld on the network are connected!", (long)nt.terms, (long)explen);
 		if (nt.badterms != 0)
@@ -656,7 +656,7 @@
 		}
 
 #define MINDIST PCB_MIL_TO_COORD(40)
-		if ((pcb_distance(l->Point1.X, l->Point1.Y, x, y) < MINDIST) || (pcb_distance(l->Point2.X, l->Point2.Y, x, y) < MINDIST)) {
+		if ((rnd_distance(l->Point1.X, l->Point1.Y, x, y) < MINDIST) || (rnd_distance(l->Point2.X, l->Point2.Y, x, y) < MINDIST)) {
 			rnd_message(PCB_MSG_ERROR, "Can not split near the endpoint of a line\n");
 			return -1;
 		}