Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 23980)
+++ trunk/src/crosshair.c	(revision 23981)
@@ -52,6 +52,7 @@
 #include "obj_arc_draw.h"
 #include "obj_text_draw.h"
 #include "obj_pstk_draw.h"
+#include "route_draw.h"
 #include "obj_arc_ui.h"
 #include "obj_subc_parent.h"
 
Index: trunk/src/route.c
===================================================================
--- trunk/src/route.c	(revision 23980)
+++ trunk/src/route.c	(revision 23981)
@@ -40,6 +40,7 @@
 #include "undo.h"
 #include "obj_line_draw.h"
 #include "obj_arc_draw.h"
+#include "route_draw.h"
 #include "obj_line.h"
 #include "obj_line_op.h"
 #include "draw_wireframe.h"
Index: trunk/src/route.h
===================================================================
--- trunk/src/route.h	(revision 23980)
+++ trunk/src/route.h	(revision 23981)
@@ -35,8 +35,6 @@
 #include "obj_common.h"
 #include "global_typedefs.h"
 
-#include "hid.h"
-
 typedef struct {
 	pcb_objtype_t type;
 	pcb_point_t point1; /* Line: Start Point, Arc: Center Point */
@@ -81,7 +79,4 @@
 int pcb_route_apply_to_line(const pcb_route_t *p_route, pcb_layer_t *Layer, pcb_line_t *apply_to_line);
 int pcb_route_apply_to_arc(const pcb_route_t *p_route, pcb_layer_t *apply_to_arc_layer, pcb_arc_t *apply_to_arc);
 
-void pcb_route_draw(pcb_route_t *p_route, pcb_hid_gc_t GC);
-void pcb_route_draw_drc(pcb_route_t *p_route, pcb_hid_gc_t GC);
-
 #endif
Index: trunk/src/route_draw.h
===================================================================
--- trunk/src/route_draw.h	(nonexistent)
+++ trunk/src/route_draw.h	(revision 23981)
@@ -0,0 +1,10 @@
+#ifndef PCB_ROUTE_DRAW_H
+#define PCB_ROUTE_DRAW_H
+
+#include "global_typedefs.h"
+#include "hid.h"
+
+void pcb_route_draw(pcb_route_t *p_route, pcb_hid_gc_t GC);
+void pcb_route_draw_drc(pcb_route_t *p_route, pcb_hid_gc_t GC);
+
+#endif
Index: trunk/src/tool_line.c
===================================================================
--- trunk/src/tool_line.c	(revision 23980)
+++ trunk/src/tool_line.c	(revision 23981)
@@ -51,6 +51,7 @@
 #include "obj_line_draw.h"
 #include "obj_pstk_draw.h"
 #include "obj_rat_draw.h"
+#include "route_draw.h"
 
 TODO("pstk: remove this when via is removed and the padstack is created from style directly")
 #include "src_plugins/lib_compat_help/pstk_compat.h"
Index: trunk/src_plugins/rubberband_orig/rubberband.c
===================================================================
--- trunk/src_plugins/rubberband_orig/rubberband.c	(revision 23980)
+++ trunk/src_plugins/rubberband_orig/rubberband.c	(revision 23981)
@@ -51,6 +51,7 @@
 #include "obj_line_op.h"
 #include "obj_line_draw.h"
 #include "obj_pstk_inlines.h"
+#include "route_draw.h"
 #include "plugins.h"
 #include "conf_core.h"
 #include "layer_grp.h"