Index: bus.c
===================================================================
--- bus.c	(revision 30902)
+++ bus.c	(revision 30903)
@@ -33,12 +33,12 @@
 	PCB_DAD_DECL_NOINIT(dlg)
 	int gui_active;
 	int width;
-	pcb_coord_t pitch;
-	pcb_coord_t thickness;
-	pcb_coord_t clearance;
+	rnd_coord_t pitch;
+	rnd_coord_t thickness;
+	rnd_coord_t clearance;
 
 	/* cache: */
-	pcb_coord_t vthickness; /* virtual thickness (edit object's) */
+	rnd_coord_t vthickness; /* virtual thickness (edit object's) */
 } bus_t;
 
 static void pcb_bus_del_pre(pcb_subc_t *subc)
@@ -97,7 +97,7 @@
 
 static int close_enough(pcb_point_t a, pcb_point_t b)
 {
-	pcb_coord_t dx = a.X - b.X, dy = a.Y - b.Y;
+	rnd_coord_t dx = a.X - b.X, dy = a.Y - b.Y;
 
 	if (dx < -1) return 0;
 	if (dx > +1) return 0;
@@ -196,8 +196,8 @@
 
 		for(n = 0; n < bus->width; n++,o-=bus->pitch) {
 			double o2 = -o;
-/*			pcb_trace(" off1: %f %f %ml = %ml\n", vx, tune1, (pcb_coord_t)o, (pcb_coord_t)(vx * tune1 * o));
-			pcb_trace(" off2: %f %f %ml = %ml\n", vx, tune2, (pcb_coord_t)o, (pcb_coord_t)(vx * tune2 * o));*/
+/*			pcb_trace(" off1: %f %f %ml = %ml\n", vx, tune1, (rnd_coord_t)o, (rnd_coord_t)(vx * tune1 * o));
+			pcb_trace(" off2: %f %f %ml = %ml\n", vx, tune2, (rnd_coord_t)o, (rnd_coord_t)(vx * tune2 * o));*/
 			pcb_line_new(tly,
 				l->Point1.X + nx * o + vx * tune1 * o2, l->Point1.Y + ny * o + vy * tune1 * o2,
 				l->Point2.X + nx * o + vx * tune2 * o2, l->Point2.Y + ny * o + vy * tune2 * o2,
@@ -227,7 +227,7 @@
 	pcb_hid_set_line_width(pcb_draw_out.fgGC, -1);
 
 	for(l = linelist_first(&ly->Line); l != NULL; l = linelist_next(l)) {
-		pcb_coord_t x, y;
+		rnd_coord_t x, y;
 		double o;
 		bus_seg_def;
 
Index: cord.c
===================================================================
--- cord.c	(revision 30902)
+++ cord.c	(revision 30903)
@@ -110,7 +110,7 @@
 
 	cord_get_ends(subc, group, &e1, &a1, &e2, &a2);
 	if ((e1 == NULL) || (e2 == NULL)) {
-		pcb_message(PCB_MSG_ERROR, "extended object cord: failed to generate cord for #%ld group %s: missing endpoint\n", subc->ID, group);
+		rnd_message(PCB_MSG_ERROR, "extended object cord: failed to generate cord for #%ld group %s: missing endpoint\n", subc->ID, group);
 		return -1;
 	}
 
@@ -133,7 +133,7 @@
 
 	if ((a1 != NULL) && (a2 != NULL)) {
 		double t, it, t2, t3, it2, it3, step = 1.0/25.0;
-		pcb_coord_t lx, ly, x, y;
+		rnd_coord_t lx, ly, x, y;
 
 		lx = e1->x; ly = e1->y;
 		for(t = step; t <= 1.0+step/2.0; t += step) {
@@ -273,10 +273,10 @@
 	return pcb_pstk_proto_insert_dup(data, &proto, 1, 0);
 }
 
-static pcb_pstk_t *endpt_pstk(pcb_subc_t *subc, const char *ptidx, pcb_cardinal_t pid, pcb_coord_t x, pcb_coord_t y, pcb_coord_t ox, pcb_coord_t oy, const char *term, const char *grp, int floater)
+static pcb_pstk_t *endpt_pstk(pcb_subc_t *subc, const char *ptidx, pcb_cardinal_t pid, rnd_coord_t x, rnd_coord_t y, rnd_coord_t ox, rnd_coord_t oy, const char *term, const char *grp, int floater)
 {
 	pcb_pstk_t *ps;
-	pcb_coord_t dx = ox-x, dy = oy-y,  cpx = x+dx/4, cpy = y+dy/4, cpr = PCB_MM_TO_COORD(0.5);
+	rnd_coord_t dx = ox-x, dy = oy-y,  cpx = x+dx/4, cpy = y+dy/4, cpr = PCB_MM_TO_COORD(0.5);
 	pcb_layer_t *ely = &subc->data->Layer[LID_EDIT];
 
 
@@ -310,7 +310,7 @@
 static void conv_pstk(pcb_subc_t *subc, pcb_pstk_t *ps, long *grp, long *term, int *has_origin)
 {
 	char sgrp[16], sterm[16];
-	pcb_coord_t d = PCB_MM_TO_COORD(0.75);
+	rnd_coord_t d = PCB_MM_TO_COORD(0.75);
 
 	sprintf(sgrp, "%ld", (*grp)++);
 
@@ -331,7 +331,7 @@
 {
 	pcb_subc_t *subc;
 	long n, grp = 1, term = 0; /* for intconn grp needs to start from 1 */
-	pcb_coord_t ox = 0, oy = 0, has_origin = 0, has_subc = 0;
+	rnd_coord_t ox = 0, oy = 0, has_origin = 0, has_subc = 0;
 	pcb_dflgmap_t layers[] = {
 		{"edit", PCB_LYT_DOC, "extobj", 0, 0},
 		{"target", PCB_LYT_SILK | PCB_LYT_TOP, NULL, 0, 0},
@@ -371,9 +371,9 @@
 
 	/* create padstack prototypes */
 	if (endpt_pstk_proto(subc->data, PCB_LYT_COPPER | PCB_LYT_TOP) != COPPER_END)
-		pcb_message(PCB_MSG_WARNING, "extended object cord: wrong pstk proto ID for copper end\n");
+		rnd_message(PCB_MSG_WARNING, "extended object cord: wrong pstk proto ID for copper end\n");
 	if (endpt_pstk_proto(subc->data, PCB_LYT_SILK | PCB_LYT_TOP) != SILK_END)
-		pcb_message(PCB_MSG_WARNING, "extended object cord: wrong pstk proto ID for silk end\n");
+		rnd_message(PCB_MSG_WARNING, "extended object cord: wrong pstk proto ID for silk end\n");
 
 	/* convert lines into 2-ended cords */
 	for(n = 0; n < objs->used; n++) {
Index: dimension.c
===================================================================
--- dimension.c	(revision 30902)
+++ dimension.c	(revision 30903)
@@ -36,7 +36,7 @@
 	int gui_active;
 
 	int style;
-	pcb_coord_t displace;
+	rnd_coord_t displace;
 	const char *fmt;
 
 	unsigned int valid:1;
@@ -133,7 +133,7 @@
 	}
 }
 
-static void draw_arrow(dimension *dim, pcb_data_t *data, pcb_layer_t *ly, pcb_coord_t x1, pcb_coord_t y1, double arrx, double arry)
+static void draw_arrow(dimension *dim, pcb_data_t *data, pcb_layer_t *ly, rnd_coord_t x1, rnd_coord_t y1, double arrx, double arry)
 {
 	pcb_poly_t *p = pcb_poly_new(ly, 0, pcb_flag_make(0));
 	pcb_poly_point_new(p, x1, y1);
@@ -151,7 +151,7 @@
 	pcb_line_t *flt;
 	double ang, deg, dispe, rotsign;
 	double arrx = PCB_MM_TO_COORD(2), arry = PCB_MM_TO_COORD(0.5);
-	pcb_coord_t x1, y1, x2, y2, x1e, y1e, x2e, y2e, tx, ty, x, y, ex, ey;
+	rnd_coord_t x1, y1, x2, y2, x1e, y1e, x2e, y2e, tx, ty, x, y, ex, ey;
 	pcb_text_t *t;
 	char ttmp[128];
 	pcb_any_obj_t *edit_obj;
@@ -214,7 +214,7 @@
 	draw_arrow(dim, subc->data, ly, x2, y2, -arrx, arry);
 
 	/* text */
-	if (pcb_safe_snprintf(ttmp, sizeof(ttmp), PCB_SAFEPRINT_COORD_ONLY | 1, dim->fmt, (pcb_coord_t)dim->len) < 0)
+	if (pcb_safe_snprintf(ttmp, sizeof(ttmp), PCB_SAFEPRINT_COORD_ONLY | 1, dim->fmt, (rnd_coord_t)dim->len) < 0)
 		strcpy(ttmp, "<invalid format>");
 	t = pcb_text_new(ly, pcb_font(PCB, 0, 0), 0, 0, 0, 100, 0, ttmp, pcb_flag_make(0));
 	tx = t->BoundingBox.X2 - t->BoundingBox.X1;
@@ -262,7 +262,7 @@
 {
 	dimension *dim;
 	pcb_line_t *fline = (pcb_line_t *)floater, bline;
-	pcb_coord_t fx, fy;
+	rnd_coord_t fx, fy;
 	double d;
 	char tmp[128];
 
@@ -288,7 +288,7 @@
 			d = -d;
 	}
 
-pcb_trace("new disp: %mm f=%mm;%mm\n", (pcb_coord_t)d, fx, fy);
+pcb_trace("new disp: %mm f=%mm;%mm\n", (rnd_coord_t)d, fx, fy);
 
 	if ((d > -PCB_MM_TO_COORD(0.1)) && (d < PCB_MM_TO_COORD(0.1)))
 		return;
@@ -297,7 +297,7 @@
 
 	dimension_clear(subc);
 	dim->displace = d;
-	pcb_snprintf(tmp, sizeof(tmp), "%.08$mH", (pcb_coord_t)d);
+	pcb_snprintf(tmp, sizeof(tmp), "%.08$mH", (rnd_coord_t)d);
 	pcb_attribute_put(&subc->Attributes, "extobj::displace", tmp);
 	dimension_gen(subc);
 }
Index: line_of_vias.c
===================================================================
--- line_of_vias.c	(revision 30902)
+++ line_of_vias.c	(revision 30903)
@@ -33,8 +33,8 @@
 typedef struct {
 	PCB_DAD_DECL_NOINIT(dlg)
 	int gui_active;
-	pcb_coord_t pitch;
-	pcb_coord_t clearance;
+	rnd_coord_t pitch;
+	rnd_coord_t clearance;
 } line_of_vias;
 
 static void pcb_line_of_vias_del_pre(pcb_subc_t *subc)
@@ -100,7 +100,7 @@
 		pcb_rtree_box_t qbox;
 		pcb_pstk_t *cl;
 		int skip = 0;
-		pcb_coord_t rx = pcb_round(x), ry = pcb_round(y);
+		rnd_coord_t rx = pcb_round(x), ry = pcb_round(y);
 
 		/* skip if there's a via too close */
 		qbox.x1 = pcb_round(rx - qbox_bloat); qbox.y1 = pcb_round(ry - qbox_bloat);
@@ -135,7 +135,7 @@
 
 	lov = subc->extobj_data;
 	if (lov->pitch < PCB_MM_TO_COORD(0.001)) {
-		pcb_message(PCB_MSG_ERROR, "line_of_vias_gen(): can not generate line-of-vias, pitch value is too small\n");
+		rnd_message(PCB_MSG_ERROR, "line_of_vias_gen(): can not generate line-of-vias, pitch value is too small\n");
 		return -1;
 	}
 
@@ -162,7 +162,7 @@
 	double arrow = PCB_MM_TO_COORD(0.2);
 	double ax, ay, ax1, ay1, ax2, ay2;
 	line_geo_def;
-	pcb_coord_t x1 = line->Point1.X, y1 = line->Point1.Y, x2 = line->Point2.X, y2 = line->Point2.Y;
+	rnd_coord_t x1 = line->Point1.X, y1 = line->Point1.Y, x2 = line->Point2.X, y2 = line->Point2.Y;
 /*	line_of_vias *lov = subc->extobj_data;*/
 
 	line_geo_calc(line);