Index: drill.c
===================================================================
--- drill.c	(revision 30902)
+++ drill.c	(revision 30903)
@@ -74,7 +74,7 @@
 {
 	pcb_drill_info_t *AllDrills;
 	pcb_drill_t *Drill = NULL;
-	pcb_bool DrillFound = pcb_false;
+	rnd_bool DrillFound = pcb_false;
 	pcb_rtree_it_t it;
 	pcb_box_t *pb;
 
Index: drill.h
===================================================================
--- drill.h	(revision 30902)
+++ drill.h	(revision 30903)
@@ -31,7 +31,7 @@
 #define PCB_DRILL_H
 
 typedef struct {								/* holds drill information */
-	pcb_coord_t DrillSize;							/* this drill's diameter */
+	rnd_coord_t DrillSize;							/* this drill's diameter */
 	pcb_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 */
Index: report.c
===================================================================
--- report.c	(revision 30902)
+++ report.c	(revision 30903)
@@ -366,7 +366,7 @@
 	int type = REPORT_TYPES;
 	char *op = NULL, *how = NULL;
 	pcb_subc_t *subc;
-	pcb_coord_t x, y;
+	rnd_coord_t x, y;
 	rnd_hid_get_coords("Click on object to report on", &x, &y, 0);
 
 	rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, reportdialog, op = argv[1].val.str);
@@ -394,7 +394,7 @@
 		case PCB_OBJ_LINE_POINT:
 		case PCB_OBJ_POLY_POINT: report_point(&tmp, type, ptr1, ptr2); break;
 		case PCB_OBJ_VOID:
-			pcb_message(PCB_MSG_INFO, "Nothing found to report on\n");
+			rnd_message(PCB_MSG_INFO, "Nothing found to report on\n");
 			RND_ACT_IRES(1);
 			return 0;
 		default: pcb_append_printf(&tmp, "Unknown\n"); break;
@@ -413,7 +413,7 @@
 
 	/* create dialog box */
 	if ((how != NULL) && (strcmp(how, "log") == 0))
-		pcb_message(PCB_MSG_INFO, "--- Report ---\n%s---\n", tmp.array);
+		rnd_message(PCB_MSG_INFO, "--- Report ---\n%s---\n", tmp.array);
 	else
 		rdialog("Report", tmp.array);
 	gds_uninit(&tmp);
@@ -498,7 +498,7 @@
 	return 0;
 }
 
-static double xy_to_net_length(pcb_coord_t x, pcb_coord_t y, int *found, gds_t *err)
+static double xy_to_net_length(rnd_coord_t x, rnd_coord_t y, int *found, gds_t *err)
 {
 	pcb_find_t fctx;
 	net_length_t nt;
@@ -546,8 +546,8 @@
 		if (term != NULL) {
 			char buf[50];
 			const char *units_name = pcbhl_conf.editor.grid_unit->suffix;
-			pcb_coord_t length;
-			pcb_coord_t x = 0, y = 0;
+			rnd_coord_t length;
+			rnd_coord_t x = 0, y = 0;
 			gds_t err;
 
 			rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Report, units_name = argv[2].val.str);
@@ -559,9 +559,9 @@
 
 			pcb_snprintf(buf, sizeof(buf), "%$m*", units_name, length);
 			if (err.used != 0)
-				pcb_message(PCB_MSG_INFO, "Net %s length %s, BUT BEWARE:%s\n", net->name, buf, err.array);
+				rnd_message(PCB_MSG_INFO, "Net %s length %s, BUT BEWARE:%s\n", net->name, buf, err.array);
 			else
-					pcb_message(PCB_MSG_INFO, "Net %s length %s\n", net->name, buf);
+					rnd_message(PCB_MSG_INFO, "Net %s length %s\n", net->name, buf);
 			gds_uninit(&err);
 		}
 	}
@@ -597,9 +597,9 @@
 	return NULL;
 }
 
-static int report_net_length_(fgw_arg_t *res, int argc, fgw_arg_t *argv, pcb_coord_t x, pcb_coord_t y)
+static int report_net_length_(fgw_arg_t *res, int argc, fgw_arg_t *argv, rnd_coord_t x, rnd_coord_t y)
 {
-	pcb_coord_t length = 0;
+	rnd_coord_t length = 0;
 	int found = 0, ret;
 	gds_t err;
 
@@ -612,17 +612,17 @@
 
 		pcb_snprintf(buf, sizeof(buf), "%$m*", pcbhl_conf.editor.grid_unit->suffix, length);
 		if (netname)
-			pcb_message(PCB_MSG_INFO, "Net \"%s\" length: %s\n", netname, buf);
+			rnd_message(PCB_MSG_INFO, "Net \"%s\" length: %s\n", netname, buf);
 		else
-			pcb_message(PCB_MSG_INFO, "Net length: %s\n", buf);
+			rnd_message(PCB_MSG_INFO, "Net length: %s\n", buf);
 
 		if (err.used != 0)
-			pcb_message(PCB_MSG_INFO, "BUT BEWARE: %s\n", err.array);
+			rnd_message(PCB_MSG_INFO, "BUT BEWARE: %s\n", err.array);
 
 		ret = 0;
 	}
 	else {
-		pcb_message(PCB_MSG_ERROR, "No net under cursor.\n");
+		rnd_message(PCB_MSG_ERROR, "No net under cursor.\n");
 		ret = 1;
 	}
 
@@ -638,13 +638,13 @@
 		pcb_line_t *l;
 		pcb_layer_t *ly;
 		int type;
-		pcb_coord_t ox, oy, x, y;
+		rnd_coord_t ox, oy, x, y;
 
 		rnd_hid_get_coords("Click on a copper line", &x, &y, 0);
 
 		type = pcb_search_screen(x, y, PCB_OBJ_LINE, &r1, &r2, &r3);
 		if (type != PCB_OBJ_LINE) {
-			pcb_message(PCB_MSG_ERROR, "can't find a line to split\n");
+			rnd_message(PCB_MSG_ERROR, "can't find a line to split\n");
 			return -1;
 		}
 		l = r2;
@@ -651,18 +651,18 @@
 		assert(l->parent_type == PCB_PARENT_LAYER);
 		ly = l->parent.layer;
 		if (!(pcb_layer_flags_(ly) & PCB_LYT_COPPER)) {
-			pcb_message(PCB_MSG_ERROR, "not a copper line, can't split it\n");
+			rnd_message(PCB_MSG_ERROR, "not a copper line, can't split it\n");
 			return -1;
 		}
 
 #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)) {
-			pcb_message(PCB_MSG_ERROR, "Can not split near the endpoint of a line\n");
+			rnd_message(PCB_MSG_ERROR, "Can not split near the endpoint of a line\n");
 			return -1;
 		}
 #undef MINDIST2
 
-		pcb_message(PCB_MSG_INFO, "The two arms of the net are:\n");
+		rnd_message(PCB_MSG_INFO, "The two arms of the net are:\n");
 		pcb_r_delete_entry(ly->line_tree, (pcb_box_t *)l);
 		ox = l->Point1.X; oy = l->Point1.Y; l->Point1.X = x; l->Point1.Y = y;
 		pcb_r_insert_entry(ly->line_tree, (pcb_box_t *)l);
@@ -684,7 +684,7 @@
 		return 0;
 	}
 	else {
-		pcb_coord_t x, y;
+		rnd_coord_t x, y;
 		rnd_hid_get_coords("Click on a network", &x, &y, 0);
 		return report_net_length_(res, argc, argv, x, y);
 	}
@@ -694,9 +694,9 @@
 {
 	const char *netname = NULL;
 	pcb_net_t *net;
-	pcb_coord_t length = 0;
+	rnd_coord_t length = 0;
 	int found = 0;
-	pcb_coord_t x, y;
+	rnd_coord_t x, y;
 	gds_t err;
 
 	if (!PCB)
@@ -714,13 +714,13 @@
 			netname = net->name;
 			term = pcb_termlist_first(&net->conns);
 			if (term == NULL) {
-				pcb_message(PCB_MSG_INFO, "Net found, but it has not terminals.\n");
+				rnd_message(PCB_MSG_INFO, "Net found, but it has not terminals.\n");
 				return 1;
 			}
 
 			obj = pcb_term_find_name(PCB, PCB->Data, PCB_LYT_COPPER, term->refdes, term->term, NULL, NULL);
 			if (obj == NULL) {
-				pcb_message(PCB_MSG_INFO, "Net found, but its terminal %s-%s is not on the board.\n", term->refdes, term->term);
+				rnd_message(PCB_MSG_INFO, "Net found, but its terminal %s-%s is not on the board.\n", term->refdes, term->term);
 				return 1;
 			}
 			pcb_obj_center(obj, &x, &y);
@@ -728,7 +728,7 @@
 	}
 
 	if (netname == NULL) {
-		pcb_message(PCB_MSG_ERROR, "No net named %s\n", tofind);
+		rnd_message(PCB_MSG_ERROR, "No net named %s\n", tofind);
 		return 1;
 	}
 
@@ -738,9 +738,9 @@
 
 	if (!found) {
 		if (netname != NULL)
-			pcb_message(PCB_MSG_INFO, "Net found, but no lines or arcs were flagged.\n");
+			rnd_message(PCB_MSG_INFO, "Net found, but no lines or arcs were flagged.\n");
 		else
-			pcb_message(PCB_MSG_ERROR, "Net not found.\n");
+			rnd_message(PCB_MSG_ERROR, "Net not found.\n");
 
 		gds_uninit(&err);
 		return 1;
@@ -750,11 +750,11 @@
 		char buf[50];
 		pcb_snprintf(buf, sizeof(buf), "%$m*", pcbhl_conf.editor.grid_unit->suffix, length);
 		if (netname)
-			pcb_message(PCB_MSG_INFO, "Net \"%s\" length: %s\n", netname, buf);
+			rnd_message(PCB_MSG_INFO, "Net \"%s\" length: %s\n", netname, buf);
 		else
-			pcb_message(PCB_MSG_INFO, "Net length: %s\n", buf);
+			rnd_message(PCB_MSG_INFO, "Net length: %s\n", buf);
 		if (err.used != 0)
-			pcb_message(PCB_MSG_INFO, "BUT BEWARE: %s\n", err.array);
+			rnd_message(PCB_MSG_INFO, "BUT BEWARE: %s\n", err.array);
 	}
 
 	gds_uninit(&err);
@@ -765,7 +765,7 @@
 static fgw_error_t pcb_act_Report(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	const char *cmd, *name;
-	pcb_coord_t x, y;
+	rnd_coord_t x, y;
 
 	RND_PCB_ACT_CONVARG(1, FGW_STR, Report, cmd = argv[1].val.str);