Index: sketch_route.c
===================================================================
--- sketch_route.c	(revision 30902)
+++ sketch_route.c	(revision 30903)
@@ -101,7 +101,7 @@
 static void sketch_update_erbs_layer(sketch_t *sk)
 {
 	pcb_layer_t *l = sk->ui_layer_erbs;
-	pcb_coord_t px, py, qx, qy;
+	rnd_coord_t px, py, qx, qy;
 	int i;
 
 	list_map0(&l->Line, pcb_line_t, pcb_line_free);
@@ -295,7 +295,7 @@
 	}
 }
 
-static pcb_bool sketch_check_path(point_t *from_p, edge_t *from_e, edge_t *to_e, point_t *to_p)
+static rnd_bool sketch_check_path(point_t *from_p, edge_t *from_e, edge_t *to_e, point_t *to_p)
 {
 	/* TODO */
 	return pcb_true;
@@ -816,7 +816,7 @@
 	tool_skline_adjust_attached_objects(&PCB->hidlib);
 }
 
-static pcb_bool attached_path_init(pcb_layer_t *layer, pcb_any_obj_t *start_term)
+static rnd_bool attached_path_init(pcb_layer_t *layer, pcb_any_obj_t *start_term)
 {
 	pcb_attached_line_t *start_l;
 	pcb_net_term_t *term;
@@ -854,7 +854,7 @@
 	wire_uninit(&attached_path.corridor);
 }
 
-static pcb_bool line_intersects_edge(pcb_attached_line_t *line, edge_t *edge)
+static rnd_bool line_intersects_edge(pcb_attached_line_t *line, edge_t *edge)
 {
 	point_t p, q;
 	p.pos.x = line->Point1.X;
@@ -864,7 +864,7 @@
 	return LINES_INTERSECT(&p, &q, edge->endp[0], edge->endp[1]);
 }
 
-static pcb_bool attached_path_next_point(point_t *end_p)
+static rnd_bool attached_path_next_point(point_t *end_p)
 {
 	int last = vtp0_len(&attached_path.lines) - 1;
 	pcb_attached_line_t *attached_line = attached_path.lines.array[last];
@@ -967,9 +967,9 @@
 #undef RETURN
 }
 
-static pcb_bool attached_path_finish(pcb_any_obj_t *end_term)
+static rnd_bool attached_path_finish(pcb_any_obj_t *end_term)
 {
-	pcb_bool net_valid = pcb_false;
+	rnd_bool net_valid = pcb_false;
 
 	if (check_net) {
 		if(end_term != attached_path.start_term) {
@@ -1037,7 +1037,7 @@
 				pcb_crosshair.AttachedObject.State = PCB_CH_STATE_SECOND;
 			}
 			else
-				pcb_message(PCB_MSG_WARNING, "Sketch lines can be only drawn from a terminal\n");
+				rnd_message(PCB_MSG_WARNING, "Sketch lines can be only drawn from a terminal\n");
 		}
 		break;
 
@@ -1054,14 +1054,14 @@
 					pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 					pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
 				} else {
-					pcb_message(PCB_MSG_WARNING, "Cannot finish placing wire at this terminal\n");
-					pcb_message(PCB_MSG_WARNING, "(the terminal does not belong to the routed net or is the starting terminal)\n");
+					rnd_message(PCB_MSG_WARNING, "Cannot finish placing wire at this terminal\n");
+					rnd_message(PCB_MSG_WARNING, "(the terminal does not belong to the routed net or is the starting terminal)\n");
 				}
 				break;
 			}
 		}
 		if (attached_path_next_point(NULL) == pcb_false)
-			pcb_message(PCB_MSG_WARNING, "Cannot route the wire this way\n");
+			rnd_message(PCB_MSG_WARNING, "Cannot route the wire this way\n");
 
 		break;
 	}
@@ -1088,7 +1088,7 @@
 	}
 }
 
-pcb_bool tool_skline_undo_act(rnd_hidlib_t *hl)
+rnd_bool tool_skline_undo_act(rnd_hidlib_t *hl)
 {
 	/* TODO */
 	return pcb_false;
Index: spoke.c
===================================================================
--- spoke.c	(revision 30902)
+++ spoke.c	(revision 30903)
@@ -25,10 +25,10 @@
 	vtp0_uninit(&sp->slots);
 }
 
-static void spoke_pos(spoke_t *sp, pcb_coord_t spacing, pcb_coord_t *x, pcb_coord_t *y)
+static void spoke_pos(spoke_t *sp, rnd_coord_t spacing, rnd_coord_t *x, rnd_coord_t *y)
 {
 	pcb_box_t *obj_bbox = &((pointdata_t *) sp->p->data)->obj->bbox_naked;
-	pcb_coord_t half_obj_w, half_obj_h;
+	rnd_coord_t half_obj_w, half_obj_h;
 
 	half_obj_w = (obj_bbox->X2 - obj_bbox->X1 + 1) / 2;
 	half_obj_h = (obj_bbox->Y2 - obj_bbox->Y1 + 1) / 2;
@@ -53,11 +53,11 @@
 	}
 }
 
-void spoke_pos_at_wire_point(spoke_t *sp, wire_point_t *wp, pcb_coord_t *x, pcb_coord_t *y)
+void spoke_pos_at_wire_point(spoke_t *sp, wire_point_t *wp, rnd_coord_t *x, rnd_coord_t *y)
 {
 	pointdata_t *pd = wp->p->data;
 	wirelist_node_t *w_node = wp->wire_node;
-	pcb_coord_t spacing;
+	rnd_coord_t spacing;
 
 	assert(w_node != NULL);
 
@@ -84,9 +84,9 @@
 	spoke_pos(sp, spacing, x, y);
 }
 
-void spoke_pos_at_slot(spoke_t *sp, int slot, pcb_coord_t *x, pcb_coord_t *y)
+void spoke_pos_at_slot(spoke_t *sp, int slot, rnd_coord_t *x, rnd_coord_t *y)
 {
-	pcb_coord_t spacing = 0;
+	rnd_coord_t spacing = 0;
 	int i;
 
 	assert(slot < vtp0_len(&sp->slots));
@@ -101,9 +101,9 @@
 	spoke_pos(sp, spacing, x, y);
 }
 
-void spoke_pos_at_end(spoke_t *sp, pcb_coord_t bloat, pcb_coord_t *x, pcb_coord_t *y)
+void spoke_pos_at_end(spoke_t *sp, rnd_coord_t bloat, rnd_coord_t *x, rnd_coord_t *y)
 {
-	pcb_coord_t spacing = 0;
+	rnd_coord_t spacing = 0;
 	int i;
 
 	if (vtp0_len(&sp->slots) > 0) {
Index: spoke.h
===================================================================
--- spoke.h	(revision 30902)
+++ spoke.h	(revision 30903)
@@ -27,9 +27,9 @@
 void spoke_init(spoke_t *sp, spoke_dir_t dir, point_t *p);
 void spoke_uninit(spoke_t *sp);
 
-void spoke_pos_at_wire_point(spoke_t *sp, wire_point_t *wp, pcb_coord_t *x, pcb_coord_t *y);
-void spoke_pos_at_slot(spoke_t *sp, int slot, pcb_coord_t *x, pcb_coord_t *y);
-void spoke_pos_at_end(spoke_t *sp, pcb_coord_t bloat, pcb_coord_t *x, pcb_coord_t *y);
+void spoke_pos_at_wire_point(spoke_t *sp, wire_point_t *wp, rnd_coord_t *x, rnd_coord_t *y);
+void spoke_pos_at_slot(spoke_t *sp, int slot, rnd_coord_t *x, rnd_coord_t *y);
+void spoke_pos_at_end(spoke_t *sp, rnd_coord_t bloat, rnd_coord_t *x, rnd_coord_t *y);
 
 void spoke_insert_wire_at_slot(spoke_t *sp, int slot_num, ewire_t *ew);
 
Index: wire.h
===================================================================
--- wire.h	(revision 30902)
+++ wire.h	(revision 30903)
@@ -19,8 +19,8 @@
 	int point_num;
 	int point_max;
 	wire_point_t *points;
-	pcb_coord_t thickness;
-	pcb_coord_t clearance;
+	rnd_coord_t thickness;
+	rnd_coord_t clearance;
 };
 
 typedef wire_t* wire_ptr_t;