Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 34761)
+++ trunk/src/crosshair.c	(revision 34762)
@@ -688,7 +688,7 @@
 		rnd_polyarea_free(&xordraw_cache.pa);
 }
 
-void rnd_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode)
+void pcb_crosshair_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode)
 {
 	if (!inhibit_drawing_mode) {
 		rnd_render->set_drawing_mode(rnd_gui, RND_HID_COMP_RESET, 1, NULL);
@@ -713,7 +713,7 @@
 		rnd_render->set_drawing_mode(rnd_gui, RND_HID_COMP_FLUSH, 1, NULL);
 }
 
-void rnd_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode)
+void pcb_crosshair_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode)
 {
 	rnd_coord_t ms = conf_core.appearance.mark_size, ms2 = ms / 2;
 
Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 34761)
+++ trunk/src/crosshair.h	(revision 34762)
@@ -126,5 +126,7 @@
 void *pcb_crosshair_suspend(rnd_hidlib_t *hl);
 void pcb_crosshair_restore(rnd_hidlib_t *hl, void *susp_data);
 void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot);
+void pcb_crosshair_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode);
+void pcb_crosshair_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode);
 
 #endif
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 34761)
+++ trunk/src/main.c	(revision 34762)
@@ -423,6 +423,8 @@
 	rnd_app.crosshair_suspend = pcb_crosshair_suspend;
 	rnd_app.crosshair_restore = pcb_crosshair_restore;
 	rnd_app.crosshair_move_to = pcb_hidlib_crosshair_move_to;
+	rnd_app.draw_marks        = pcb_crosshair_draw_marks;
+	rnd_app.draw_attached     = pcb_crosshair_draw_attached;
 
 
 
Index: trunk/tests/propedit/glue.c
===================================================================
--- trunk/tests/propedit/glue.c	(revision 34761)
+++ trunk/tests/propedit/glue.c	(revision 34762)
@@ -41,14 +41,6 @@
 {
 }
 
-void rnd_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode)
-{
-}
-
-void rnd_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode)
-{
-}
-
 void rnd_expose_main(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *region, rnd_xform_t *xform_caller)
 {
 }
Index: trunk/util/gsch2pcb-rnd/glue.c
===================================================================
--- trunk/util/gsch2pcb-rnd/glue.c	(revision 34761)
+++ trunk/util/gsch2pcb-rnd/glue.c	(revision 34762)
@@ -30,12 +30,8 @@
 
 /* glue for pcb-rnd core */
 
-void rnd_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) {}
-
 static const char rnd_conf_internal_arr[] = { 0 };
 const char *rnd_conf_internal = rnd_conf_internal_arr;
 
 void rnd_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) {}
-
 void rnd_expose_main(rnd_hid_t * hid, const rnd_hid_expose_ctx_t *ctx, rnd_xform_t *xform_caller) {}
-void rnd_draw_attached(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) {}