Index: route.c
===================================================================
--- route.c	(revision 30970)
+++ route.c	(revision 30971)
@@ -107,7 +107,7 @@
 	return &p_route->objects[p_route->size - 1];
 }
 
-void pcb_route_add_line(pcb_route_t *p_route, rnd_point_t *point1, rnd_point_t *point2, pcb_layer_id_t layer)
+void pcb_route_add_line(pcb_route_t *p_route, rnd_point_t *point1, rnd_point_t *point2, rnd_layer_id_t layer)
 {
 	pcb_route_object_t *p_object = pcb_route_alloc_object(p_route);
 	if (p_object == NULL)
@@ -120,7 +120,7 @@
 	p_route->end_point = *point2;
 }
 
-void pcb_route_add_arc(pcb_route_t *p_route, rnd_point_t *center, rnd_angle_t start_angle, rnd_angle_t delta, rnd_coord_t radius, pcb_layer_id_t layer)
+void pcb_route_add_arc(pcb_route_t *p_route, rnd_point_t *center, rnd_angle_t start_angle, rnd_angle_t delta, rnd_coord_t radius, rnd_layer_id_t layer)
 {
 	pcb_route_object_t *p_object = pcb_route_alloc_object(p_route);
 	if (p_object == NULL)
@@ -138,7 +138,7 @@
 }
 
 
-void pcb_route_direct(pcb_board_t *PCB, pcb_route_t *route, rnd_point_t *point1, rnd_point_t *point2, pcb_layer_id_t layer, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags)
+void pcb_route_direct(pcb_board_t *PCB, pcb_route_t *route, rnd_point_t *point1, rnd_point_t *point2, rnd_layer_id_t layer, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags)
 {
 	pcb_route_reset(route);
 	route->start_point = *point1;
@@ -291,7 +291,7 @@
 	}
 }
 
-void pcb_route_start(pcb_board_t *PCB, pcb_route_t *route, rnd_point_t *point, pcb_layer_id_t layer_id, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags)
+void pcb_route_start(pcb_board_t *PCB, pcb_route_t *route, rnd_point_t *point, rnd_layer_id_t layer_id, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags)
 {
 	/* Restart the route */
 	pcb_route_reset(route);
@@ -312,7 +312,7 @@
 
 	rnd_point_t *point1 = &route->end_point;
 	rnd_point_t *point2 = point;
-	pcb_layer_id_t layer_id = route->end_layer;
+	rnd_layer_id_t layer_id = route->end_layer;
 
 	/* Set radius to 0 for standard 45/90 operation */
 	const rnd_coord_t radius = route->thickness * conf_core.editor.route_radius;
@@ -398,7 +398,7 @@
 }
 
 TODO("Pass in other required information such as object flags")
-void pcb_route_calculate(pcb_board_t *PCB, pcb_route_t *route, rnd_point_t *point1, rnd_point_t *point2, pcb_layer_id_t layer_id, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags, int mod1, int mod2)
+void pcb_route_calculate(pcb_board_t *PCB, pcb_route_t *route, rnd_point_t *point1, rnd_point_t *point2, rnd_layer_id_t layer_id, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags, int mod1, int mod2)
 {
 	/* Set radius to 0 for standard 45/90 operation */
 /*	const rnd_coord_t radius = thickness * conf_core.editor.route_radius; - TODO: remove this if not needed */
@@ -698,7 +698,7 @@
 /*-----------------------------------------------------------
  * Draws the outline of an arc
  *---------------------------------------------------------*/
-void pcb_route_draw_arc(pcb_hid_gc_t GC, rnd_coord_t x, rnd_coord_t y, rnd_angle_t start_angle, rnd_angle_t delta, rnd_coord_t radius, rnd_coord_t thickness)
+void pcb_route_draw_arc(rnd_hid_gc_t GC, rnd_coord_t x, rnd_coord_t y, rnd_angle_t start_angle, rnd_angle_t delta, rnd_coord_t radius, rnd_coord_t thickness)
 {
 	double x1, y1, x2, y2, wid = thickness / 2;
 
@@ -724,7 +724,7 @@
 /*-----------------------------------------------------------
  * Draws the route as outlines
  *---------------------------------------------------------*/
-void pcb_route_draw(pcb_route_t *p_route, pcb_hid_gc_t GC)
+void pcb_route_draw(pcb_route_t *p_route, rnd_hid_gc_t GC)
 {
 	int i = 0;
 	for(i = 0; i < p_route->size; ++i) {
@@ -752,7 +752,7 @@
 /*-----------------------------------------------------------
  * Draws a drc outline around the route
  *---------------------------------------------------------*/
-void pcb_route_draw_drc(pcb_route_t *p_route, pcb_hid_gc_t GC)
+void pcb_route_draw_drc(pcb_route_t *p_route, rnd_hid_gc_t GC)
 {
 	rnd_coord_t thickness = p_route->thickness + 2 * conf_core.design.bloat;
 	int i;