Index: tool_arc.c
===================================================================
--- tool_arc.c	(revision 30902)
+++ tool_arc.c	(revision 30903)
@@ -89,7 +89,7 @@
 	case PCB_CH_STATE_THIRD:
 		{
 			pcb_arc_t *arc;
-			pcb_coord_t wx, wy;
+			rnd_coord_t wx, wy;
 			pcb_angle_t sa, dir;
 			wx = hl->tool_x - pcb_crosshair.AttachedBox.Point1.X;
 			wy = hl->tool_y - pcb_crosshair.AttachedBox.Point1.Y;
@@ -171,7 +171,7 @@
 
 }
 
-pcb_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
Index: tool_arc.h
===================================================================
--- tool_arc.h	(revision 30902)
+++ tool_arc.h	(revision 30903)
@@ -5,4 +5,4 @@
 void pcb_tool_arc_notify_mode(rnd_hidlib_t *hl);
 void pcb_tool_arc_adjust_attached_objects(rnd_hidlib_t *hl);
 void pcb_tool_arc_draw_attached(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl);
Index: tool_buffer.c
===================================================================
--- tool_buffer.c	(revision 30902)
+++ tool_buffer.c	(revision 30903)
@@ -53,7 +53,7 @@
 {
 }
 
-static void pcb_tool_buffer_notify_mode_(rnd_hidlib_t *hl, pcb_bool keep_ids)
+static void pcb_tool_buffer_notify_mode_(rnd_hidlib_t *hl, rnd_bool keep_ids)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
Index: tool_copy.c
===================================================================
--- tool_copy.c	(revision 30902)
+++ tool_copy.c	(revision 30903)
@@ -73,7 +73,7 @@
 	case PCB_CH_STATE_SECOND:
 
 		if ((pcb->is_footprint) && (pcb_crosshair.AttachedObject.Type == PCB_OBJ_SUBC)) {
-			pcb_message(PCB_MSG_WARNING, "Can not copy subcircuit in the footprint edit mode\n");
+			rnd_message(PCB_MSG_WARNING, "Can not copy subcircuit in the footprint edit mode\n");
 		}
 		else {
 			pcb_copy_obj(pcb_crosshair.AttachedObject.Type,
@@ -111,7 +111,7 @@
 	pcb_xordraw_movecopy();
 }
 
-pcb_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
Index: tool_copy.h
===================================================================
--- tool_copy.h	(revision 30902)
+++ tool_copy.h	(revision 30903)
@@ -4,4 +4,4 @@
 void pcb_tool_copy_notify_mode(rnd_hidlib_t *hl);
 void pcb_tool_copy_release_mode(rnd_hidlib_t *hl);
 void pcb_tool_copy_draw_attached(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl);
Index: tool_insert.c
===================================================================
--- tool_insert.c	(revision 30902)
+++ tool_insert.c	(revision 30903)
@@ -72,7 +72,7 @@
 		if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
 			pcb_any_obj_t *obj = (pcb_any_obj_t *)pcb_crosshair.AttachedObject.Ptr2;
 			if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
-				pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
+				rnd_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 				pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 				pcb_crosshair.extobj_edit = NULL;
 				break;
@@ -126,7 +126,7 @@
 	pcb_xordraw_insert_pt_obj();
 }
 
-pcb_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
Index: tool_insert.h
===================================================================
--- tool_insert.h	(revision 30902)
+++ tool_insert.h	(revision 30903)
@@ -4,4 +4,4 @@
 void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl);
 void pcb_tool_insert_adjust_attached_objects(rnd_hidlib_t *hl);
 void pcb_tool_insert_draw_attached(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl);
Index: tool_line.c
===================================================================
--- tool_line.c	(revision 30902)
+++ tool_line.c	(revision 30903)
@@ -389,7 +389,7 @@
 	}
 }
 
-pcb_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -457,7 +457,7 @@
 	return pcb_true;
 }
 
-pcb_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
Index: tool_line.h
===================================================================
--- tool_line.h	(revision 30902)
+++ tool_line.h	(revision 30903)
@@ -5,5 +5,5 @@
 void pcb_tool_line_notify_mode(rnd_hidlib_t *hl);
 void pcb_tool_line_adjust_attached_objects(rnd_hidlib_t *hl);
 void pcb_tool_line_draw_attached(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl);
Index: tool_move.c
===================================================================
--- tool_move.c	(revision 30902)
+++ tool_move.c	(revision 30903)
@@ -54,7 +54,7 @@
 
 void pcb_tool_move_notify_mode(rnd_hidlib_t *hl)
 {
-	pcb_coord_t dx, dy;
+	rnd_coord_t dx, dy;
 
 	switch (pcb_crosshair.AttachedObject.State) {
 		/* first notify, lookup object */
@@ -68,7 +68,7 @@
 			if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
 				pcb_any_obj_t *obj = (pcb_any_obj_t *)pcb_crosshair.AttachedObject.Ptr2;
 				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
-					pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
+					rnd_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 					pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 					pcb_crosshair.extobj_edit = NULL;
 				}
@@ -120,7 +120,7 @@
 	pcb_xordraw_movecopy();
 }
 
-pcb_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
Index: tool_move.h
===================================================================
--- tool_move.h	(revision 30902)
+++ tool_move.h	(revision 30903)
@@ -4,4 +4,4 @@
 void pcb_tool_move_notify_mode(rnd_hidlib_t *hl);
 void pcb_tool_move_release_mode(rnd_hidlib_t *hl);
 void pcb_tool_move_draw_attached(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl);
Index: tool_poly.c
===================================================================
--- tool_poly.c	(revision 30902)
+++ tool_poly.c	(revision 30903)
@@ -131,7 +131,7 @@
 	}
 }
 
-pcb_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_prev_point();
@@ -140,7 +140,7 @@
 	return pcb_true;
 }
 
-pcb_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_next_point();
Index: tool_poly.h
===================================================================
--- tool_poly.h	(revision 30902)
+++ tool_poly.h	(revision 30903)
@@ -4,5 +4,5 @@
 void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl);
 void pcb_tool_poly_adjust_attached_objects(rnd_hidlib_t *hl);
 void pcb_tool_poly_draw_attached(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl);
Index: tool_polyhole.c
===================================================================
--- tool_polyhole.c	(revision 30902)
+++ tool_polyhole.c	(revision 30903)
@@ -65,12 +65,12 @@
 									 &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3);
 
 		if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_VOID) {
-			pcb_message(PCB_MSG_WARNING, "The first point of a polygon hole must be on a polygon.\n");
+			rnd_message(PCB_MSG_WARNING, "The first point of a polygon hole must be on a polygon.\n");
 			break; /* don't start doing anything if clicket out of polys */
 		}
 
 		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_poly_t *)pcb_crosshair.AttachedObject.Ptr2)) {
-			pcb_message(PCB_MSG_WARNING, "Sorry, poly object is locked\n");
+			rnd_message(PCB_MSG_WARNING, "Sorry, poly object is locked\n");
 			pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 			pcb_crosshair.extobj_edit = NULL;
 			break;
@@ -161,7 +161,7 @@
 	}
 }
 
-pcb_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_prev_point();
@@ -170,7 +170,7 @@
 	return pcb_true;
 }
 
-pcb_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_next_point();
Index: tool_polyhole.h
===================================================================
--- tool_polyhole.h	(revision 30902)
+++ tool_polyhole.h	(revision 30903)
@@ -4,5 +4,5 @@
 void pcb_tool_polyhole_notify_mode(rnd_hidlib_t *hl);
 void pcb_tool_polyhole_adjust_attached_objects(rnd_hidlib_t *hl);
 void pcb_tool_polyhole_draw_attached(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl);
Index: tool_rectangle.c
===================================================================
--- tool_rectangle.c	(revision 30902)
+++ tool_rectangle.c	(revision 30903)
@@ -107,7 +107,7 @@
 	}
 }
 
-pcb_bool pcb_tool_rectangle_anydo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_rectangle_anydo_act(rnd_hidlib_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST)
Index: tool_rectangle.h
===================================================================
--- tool_rectangle.h	(revision 30902)
+++ tool_rectangle.h	(revision 30903)
@@ -3,4 +3,4 @@
 void pcb_tool_rectangle_uninit(void);
 void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl);
 void pcb_tool_rectangle_adjust_attached_objects(rnd_hidlib_t *hl);
-pcb_bool pcb_tool_rectangle_undo_act(rnd_hidlib_t *hl);
+rnd_bool pcb_tool_rectangle_undo_act(rnd_hidlib_t *hl);
Index: tool_remove.c
===================================================================
--- tool_remove.c	(revision 30902)
+++ tool_remove.c	(revision 30903)
@@ -56,13 +56,13 @@
 	if ((type = pcb_search_screen(hl->tool_x, hl->tool_y, PCB_REMOVE_TYPES | PCB_LOOSE_SUBC(PCB) | PCB_OBJ_FLOATER, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
 		obj = (pcb_any_obj_t *)ptr2;
 		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
-			pcb_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
+			rnd_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 			return;
 		}
 
 		if (type == PCB_OBJ_SUBC) {
 			if(pcb->is_footprint) {
-				pcb_message(PCB_MSG_WARNING, "Can not remove the subcircuit being edited in the footprint edit mode\n");
+				rnd_message(PCB_MSG_WARNING, "Can not remove the subcircuit being edited in the footprint edit mode\n");
 				return;
 			}
 		}
Index: tool_via.c
===================================================================
--- tool_via.c	(revision 30902)
+++ tool_via.c	(revision 30903)
@@ -56,12 +56,12 @@
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
 	if (!pcb->pstk_on) {
-		pcb_message(PCB_MSG_WARNING, "You must turn via visibility on before\nyou can place vias\n");
+		rnd_message(PCB_MSG_WARNING, "You must turn via visibility on before\nyou can place vias\n");
 		return;
 	}
 
 	if (conf_core.design.via_drilling_hole >= conf_core.design.via_thickness) {
-		pcb_message(PCB_MSG_ERROR, "Can't place via: invalid via geometry (hole too large for via size)\n");
+		rnd_message(PCB_MSG_ERROR, "Can't place via: invalid via geometry (hole too large for via size)\n");
 		return;
 	}
 
@@ -85,9 +85,9 @@
 	}
 }
 
-static void xor_draw_fake_via(pcb_coord_t x, pcb_coord_t y, pcb_coord_t dia, pcb_coord_t clearance)
+static void xor_draw_fake_via(rnd_coord_t x, rnd_coord_t y, rnd_coord_t dia, rnd_coord_t clearance)
 {
-	pcb_coord_t r = (dia/2)+clearance;
+	rnd_coord_t r = (dia/2)+clearance;
 	pcb_render->draw_arc(pcb_crosshair.GC, x, y, r, r, 0, 360);
 }