Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 30902)
+++ conf/conftest.c	(revision 30903)
@@ -80,7 +80,7 @@
 void cmd_dump(char *arg)
 {
 	if (arg == NULL) {
-		pcb_message(PCB_MSG_ERROR, "Need an arg: native or lihata");
+		rnd_message(PCB_MSG_ERROR, "Need an arg: native or lihata");
 		return;
 	}
 	if (strncmp(arg, "native", 6) == 0) {
@@ -94,7 +94,7 @@
 		while(isspace(*arg)) arg++;
 		role = pcb_conf_role_parse(arg);
 		if (role == CFR_invalid) {
-			pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
+			rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
 			return;
 		}
 		if (pcb_conf_main_root[role] != NULL)
@@ -103,7 +103,7 @@
 			printf("<empty>\n");
 	}
 	else
-		pcb_message(PCB_MSG_ERROR, "Invalid dump mode: '%s'", arg);
+		rnd_message(PCB_MSG_ERROR, "Invalid dump mode: '%s'", arg);
 }
 
 void cmd_print(char *arg)
@@ -112,12 +112,12 @@
 	gds_t s;
 
 	if (arg == NULL) {
-		pcb_message(PCB_MSG_ERROR, "Need an arg: a native path");
+		rnd_message(PCB_MSG_ERROR, "Need an arg: a native path");
 		return;
 	}
 	node = pcb_conf_get_field(arg);
 	if (node == NULL) {
-		pcb_message(PCB_MSG_ERROR, "No such path: '%s'", arg);
+		rnd_message(PCB_MSG_ERROR, "No such path: '%s'", arg);
 		return;
 	}
 	gds_init(&s);
@@ -133,7 +133,7 @@
 
 	if (arg == NULL) {
 		help:;
-		pcb_message(PCB_MSG_ERROR, "Need 2 args: role and %s", (is_text ? "lihata text" : "file name"));
+		rnd_message(PCB_MSG_ERROR, "Need 2 args: role and %s", (is_text ? "lihata text" : "file name"));
 		return;
 	}
 
@@ -151,7 +151,7 @@
 
 	role = pcb_conf_role_parse(arg);
 	if (role == CFR_invalid) {
-		pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
+		rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
 		return;
 	}
 	printf("Result: %d\n", pcb_conf_load_as(role, fn, is_text));
@@ -165,7 +165,7 @@
 {
 	conf_policy_t np = pcb_conf_policy_parse(arg);
 	if (np == POL_invalid)
-		pcb_message(PCB_MSG_ERROR, "Invalid/unknown policy: '%s'", arg);
+		rnd_message(PCB_MSG_ERROR, "Invalid/unknown policy: '%s'", arg);
 	else
 		current_policy = np;
 }
@@ -174,7 +174,7 @@
 {
 	conf_role_t nr = pcb_conf_role_parse(arg);
 	if (nr == CFR_invalid)
-		pcb_message(PCB_MSG_ERROR, "Invalid/unknown role: '%s'", arg);
+		rnd_message(PCB_MSG_ERROR, "Invalid/unknown role: '%s'", arg);
 	else
 		current_role = nr;
 }
@@ -186,7 +186,7 @@
 	lht_node_t *first;
 
 	if ((*end != '\0') || (np < 0)) {
-		pcb_message(PCB_MSG_ERROR, "Invalid integer prio: '%s'", arg);
+		rnd_message(PCB_MSG_ERROR, "Invalid integer prio: '%s'", arg);
 		return;
 	}
 	first = pcb_conf_lht_get_first(current_role, 0);
@@ -209,12 +209,12 @@
 	lht_node_t *first;
 
 	if (arg == NULL) {
-		pcb_message(PCB_MSG_ERROR, "need a policy", arg);
+		rnd_message(PCB_MSG_ERROR, "need a policy", arg);
 		return;
 	}
 	np = pcb_conf_policy_parse(arg);
 	if (np == POL_invalid) {
-		pcb_message(PCB_MSG_ERROR, "Invalid integer policy: '%s'", arg);
+		rnd_message(PCB_MSG_ERROR, "Invalid integer policy: '%s'", arg);
 		return;
 	}
 
@@ -244,7 +244,7 @@
 	path = arg;
 	val = strpbrk(path, " \t=");
 	if (val == NULL) {
-		pcb_message(PCB_MSG_ERROR, "set needs a value");
+		rnd_message(PCB_MSG_ERROR, "set needs a value");
 		return;
 	}
 	*val = '\0';
@@ -260,7 +260,7 @@
 {
 	conf_native_t *n = pcb_conf_get_field(arg);
 	if (n == NULL) {
-		pcb_message(PCB_MSG_ERROR, "unknown path");
+		rnd_message(PCB_MSG_ERROR, "unknown path");
 		return;
 	}
 	pcb_conf_hid_set_cb(n, hid_id, (add ? &watch_cbs : NULL));
@@ -296,7 +296,7 @@
 	else {
 		conf_role_t role = pcb_conf_role_parse(arg);
 		if (role == CFR_invalid) {
-			pcb_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
+			rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
 			return;
 		}
 		pcb_conf_reset(role, "<cmd_reset role>");
@@ -399,7 +399,7 @@
 		else if (strcmp(cmd, "help") == 0)
 			cmd_help(arg);
 		else
-			pcb_message(PCB_MSG_ERROR, "unknown command '%s'", cmd);
+			rnd_message(PCB_MSG_ERROR, "unknown command '%s'", cmd);
 	}
 
 	conf_core_uninit_pre();
Index: io_bxl/glue.c
===================================================================
--- io_bxl/glue.c	(revision 30902)
+++ io_bxl/glue.c	(revision 30903)
@@ -1,7 +1,7 @@
 #include "bxl.h"
 
-pcb_coord_t pcb_bxl_coord_x(pcb_coord_t c) { return c; }
-pcb_coord_t pcb_bxl_coord_y(pcb_coord_t c) { return -c; }
+rnd_coord_t pcb_bxl_coord_x(rnd_coord_t c) { return c; }
+rnd_coord_t pcb_bxl_coord_y(rnd_coord_t c) { return -c; }
 
 void pcb_bxl_pattern_begin(pcb_bxl_ctx_t *ctx, const char *name) {}
 void pcb_bxl_pattern_end(pcb_bxl_ctx_t *ctx) {}
@@ -15,7 +15,7 @@
 void pcb_bxl_set_text_str(pcb_bxl_ctx_t *ctx, char *str) { free(str); }
 void pcb_bxl_poly_begin(pcb_bxl_ctx_t *ctx) {}
 void pcb_bxl_poly_end(pcb_bxl_ctx_t *ctx) {}
-void pcb_bxl_poly_add_vertex(pcb_bxl_ctx_t *ctx, pcb_coord_t x, pcb_coord_t y) {}
+void pcb_bxl_poly_add_vertex(pcb_bxl_ctx_t *ctx, rnd_coord_t x, rnd_coord_t y) {}
 void pcb_bxl_add_property(pcb_bxl_ctx_t *ctx, pcb_any_obj_t *obj, const char *keyval) {}
 void pcb_bxl_set_attr_val(pcb_bxl_ctx_t *ctx, char *key, char *val) { free(key); free(val); }
 
Index: librnd/glue.c
===================================================================
--- librnd/glue.c	(revision 30902)
+++ librnd/glue.c	(revision 30903)
@@ -49,15 +49,15 @@
 {
 }
 
-void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, pcb_coord_t abs_x, pcb_coord_t abs_y, int mouse_mot)
+void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot)
 {
 }
 
-void pcbhl_draw_marks(rnd_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
+void pcbhl_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode)
 {
 }
 
-void pcbhl_draw_attached(rnd_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
+void pcbhl_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode)
 {
 }
 
Index: pcb-printf/prcli.c
===================================================================
--- pcb-printf/prcli.c	(revision 30902)
+++ pcb-printf/prcli.c	(revision 30903)
@@ -7,7 +7,7 @@
 int main(int argc, char *argv[])
 {
 	const char *fmt = argv[1];
-	pcb_coord_t crd;
+	rnd_coord_t crd;
 	int n;
 
 	setlocale(LC_ALL, "C");
@@ -15,10 +15,10 @@
 	pcb_printf_slot[0] = "%mr";
 
 	for(n = 2; n < argc; n++) {
-		pcb_bool success;
+		rnd_bool success;
 		double val = pcb_get_value_ex(argv[n], NULL, NULL, NULL, "", &success);
 		if (!success) {
-			fprintf(stderr, "Unable to convert '%s' to pcb_coord_t\n", argv[n]);
+			fprintf(stderr, "Unable to convert '%s' to rnd_coord_t\n", argv[n]);
 			return 1;
 		}
 		crd = val;
Index: pcb-printf/tester.c
===================================================================
--- pcb-printf/tester.c	(revision 30902)
+++ pcb-printf/tester.c	(revision 30903)
@@ -19,7 +19,7 @@
 
 int main()
 {
-	pcb_coord_t c[] = {0, 1, 1024, 1024*1024, 1024*1024*1024};
+	rnd_coord_t c[] = {0, 1, 1024, 1024*1024, 1024*1024*1024};
 	char *fmt[] = {
 	"%mI",  "%mm",  "%mM",  "%ml",  "%mL",  "%ms",  "%mS",  "%md",  "%mD",  "%m3",  "%mr",
 	"%$mI", "%$mm", "%$mM", "%$ml", "%$mL", "%$ms", "%$mS", "%$md", "%$mD", "%$m3", "%$mr",