Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 34760)
+++ trunk/src/crosshair.c	(revision 34761)
@@ -1193,7 +1193,7 @@
 	int obj, line, box;
 } old_crosshair_t;
 
-void *rnd_hidlib_crosshair_suspend(rnd_hidlib_t *hl)
+void *pcb_crosshair_suspend(rnd_hidlib_t *hl)
 {
 	old_crosshair_t *buf = malloc(sizeof(old_crosshair_t));
 
@@ -1208,7 +1208,7 @@
 	return buf;
 }
 
-void rnd_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data)
+void pcb_crosshair_restore(rnd_hidlib_t *hl, void *susp_data)
 {
 	old_crosshair_t *buf = susp_data;
 
@@ -1222,7 +1222,7 @@
 }
 
 
-void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot)
+void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot)
 {
 	if (!mouse_mot) {
 		rnd_hid_notify_crosshair_change(hl, rnd_false);
Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 34760)
+++ trunk/src/crosshair.h	(revision 34761)
@@ -123,4 +123,8 @@
 /* Always call this before changing the attached object of the crosshair */
 void pcb_crosshair_attached_clean(rnd_hidlib_t *hidlib);
 
+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);
+
 #endif
Index: trunk/src/hidlib_pcb.c
===================================================================
--- trunk/src/hidlib_pcb.c	(revision 34760)
+++ trunk/src/hidlib_pcb.c	(revision 34761)
@@ -26,8 +26,3 @@
 
 #include "board.h"
 #include <librnd/core/tool.h>
-
-void rnd_hidlib_adjust_attached_objects(rnd_hidlib_t *hl)
-{
-	rnd_tool_adjust_attached(hl);
-}
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 34760)
+++ trunk/src/main.c	(revision 34761)
@@ -420,6 +420,12 @@
 	rnd_app.version = PCB_VERSION;
 	rnd_app.url = "http://repo.hu/projects/pcb-rnd";
 
+	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_conf_dot_dir = DOT_PCB_RND;
 	rnd_conf_lib_dir = PCBLIBDIR;
 
Index: trunk/src_plugins/lib_formula/test/glue.c
===================================================================
--- trunk/src_plugins/lib_formula/test/glue.c	(revision 34760)
+++ trunk/src_plugins/lib_formula/test/glue.c	(revision 34761)
@@ -9,8 +9,6 @@
 
 const char *rnd_hidlib_default_embedded_menu = "";
 
-void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { }
-
 const char *rnd_conf_userdir_path;
 const char *rnd_conf_user_path;
 const char *rnd_conf_sysdir_path;
Index: trunk/tests/conf/conftest.c
===================================================================
--- trunk/tests/conf/conftest.c	(revision 34760)
+++ trunk/tests/conf/conftest.c	(revision 34761)
@@ -37,11 +37,7 @@
 	return "dummy_brd";
 }
 
-void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot)
-{
-}
 
-
 void watch_pre(rnd_conf_native_t *cfg, int idx)
 {
 	printf("watch_pre:  '%s' old value\n", cfg->hash_path);
Index: trunk/tests/propedit/glue.c
===================================================================
--- trunk/tests/propedit/glue.c	(revision 34760)
+++ trunk/tests/propedit/glue.c	(revision 34761)
@@ -41,23 +41,6 @@
 {
 }
 
-void rnd_hidlib_adjust_attached_objects(rnd_hidlib_t *hl)
-{
-}
-
-void *rnd_hidlib_crosshair_suspend(rnd_hidlib_t *hl)
-{
-	return NULL;
-}
-
-void rnd_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data)
-{
-}
-
-void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot)
-{
-}
-
 void rnd_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode)
 {
 }
Index: trunk/util/gsch2pcb-rnd/glue.c
===================================================================
--- trunk/util/gsch2pcb-rnd/glue.c	(revision 34760)
+++ trunk/util/gsch2pcb-rnd/glue.c	(revision 34761)
@@ -30,10 +30,6 @@
 
 /* glue for pcb-rnd core */
 
-void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { }
-
-void *rnd_hidlib_crosshair_suspend(rnd_hidlib_t *hl) { return NULL; }
-void rnd_hidlib_crosshair_restore(rnd_hidlib_t *hl, void *susp_data) {}
 void rnd_draw_marks(rnd_hidlib_t *hidlib, rnd_bool inhibit_drawing_mode) {}
 
 static const char rnd_conf_internal_arr[] = { 0 };
@@ -41,6 +37,5 @@
 
 void rnd_expose_preview(rnd_hid_t *hid, const rnd_hid_expose_ctx_t *e) {}
 
-void rnd_hidlib_adjust_attached_objects(rnd_hidlib_t *hl) {}
 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) {}