Index: tool_arc.c
===================================================================
--- tool_arc.c	(revision 29334)
+++ tool_arc.c	(revision 29335)
@@ -51,7 +51,7 @@
 
 void pcb_tool_arc_init(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	if (pcb_tool_prev_id == pcb_crosshair.tool_line && pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST) {
 		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_SECOND;
@@ -59,12 +59,12 @@
 		pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair.AttachedBox.Point2.Y = pcb_crosshair.AttachedLine.Point1.Y;
 		pcb_tool_adjust_attached_objects(NULL);
 	}
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_arc_uninit(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_added_lines = 0;
 	if (pcb_tool_next_id != pcb_crosshair.tool_line) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
@@ -71,7 +71,7 @@
 		if (!pcb_marked.user_placed)
 			pcb_crosshair_set_local_ref(0, 0, pcb_false);
 	}
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_arc_notify_mode(pcb_hidlib_t *hl)
@@ -175,7 +175,7 @@
 {
 	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
-		pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 		return pcb_false;
 	}
 	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_THIRD) {
Index: tool_arrow.c
===================================================================
--- tool_arrow.c	(revision 29334)
+++ tool_arrow.c	(revision 29335)
@@ -51,11 +51,11 @@
 
 void pcb_tool_arrow_uninit(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
 	pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 /* Called some time after the click if there was a release but no second click
@@ -67,7 +67,7 @@
 	pcb_board_t *pcb = hv.ptr;
 
 	if (pcb_crosshair_note.Click) {
-		pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 		pcb_crosshair_note.Click = pcb_false;
 		if (pcb_crosshair_note.Moving && !pcb_gui->shift_is_pressed(pcb_gui)) {
 			pcb_grabbed.status = pcb_true;
@@ -124,7 +124,7 @@
 			pcb_crosshair.AttachedBox.Point1.X = pcb_crosshair_note.X;
 			pcb_crosshair.AttachedBox.Point1.Y = pcb_crosshair_note.Y;
 		}
-		pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+		pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 	}
 
 	if (pcb_crosshair.extobj_edit != NULL) {
Index: tool_copy.c
===================================================================
--- tool_copy.c	(revision 29334)
+++ tool_copy.c	(revision 29335)
@@ -42,10 +42,10 @@
 
 void pcb_tool_copy_uninit(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 	pcb_crosshair.extobj_edit = NULL;
 }
 
Index: tool_insert.c
===================================================================
--- tool_insert.c	(revision 29334)
+++ tool_insert.c	(revision 29335)
@@ -53,11 +53,11 @@
 
 void pcb_tool_insert_uninit(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
 	pcb_crosshair.extobj_edit = NULL;
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_insert_notify_mode(pcb_hidlib_t *hl)
Index: tool_line.c
===================================================================
--- tool_line.c	(revision 29334)
+++ tool_line.c	(revision 29335)
@@ -63,7 +63,7 @@
 
 void pcb_tool_line_init(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	if (pcb_tool_prev_id == pcb_crosshair.tool_arc && pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
 		pcb_crosshair.AttachedLine.State = PCB_CH_STATE_SECOND;
@@ -79,12 +79,12 @@
 			}
 		}
 	}
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_line_uninit(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_added_lines = 0;
 	pcb_route_reset(&pcb_crosshair.Route);
 	if (pcb_tool_next_id != pcb_crosshair.tool_arc) {
@@ -92,7 +92,7 @@
 		if (!pcb_marked.user_placed)
 			pcb_crosshair_set_local_ref(0, 0, pcb_false);
 	}
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 /* creates points of a line (when clicked) */
Index: tool_move.c
===================================================================
--- tool_move.c	(revision 29334)
+++ tool_move.c	(revision 29335)
@@ -44,10 +44,10 @@
 
 void pcb_tool_move_uninit(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 	pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST;
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 	pcb_crosshair.extobj_edit = NULL;
 }
 
Index: tool_poly.c
===================================================================
--- tool_poly.c	(revision 29334)
+++ tool_poly.c	(revision 29335)
@@ -44,10 +44,10 @@
 
 void pcb_tool_poly_uninit(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedPolygon.PointN = 0;
 	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 TODO("remove this when pcb_tool_poly_notify_mode() loses PCB")
Index: tool_polyhole.c
===================================================================
--- tool_polyhole.c	(revision 29334)
+++ tool_polyhole.c	(revision 29335)
@@ -45,10 +45,10 @@
 
 void pcb_tool_polyhole_uninit(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedPolygon.PointN = 0;
 	pcb_crosshair.AttachedLine.State = PCB_CH_STATE_FIRST;
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 TODO("remove this when pcb_tool_polyhole_notify_mode() loses PCB")
Index: tool_rectangle.c
===================================================================
--- tool_rectangle.c	(revision 29334)
+++ tool_rectangle.c	(revision 29335)
@@ -47,9 +47,9 @@
 
 void pcb_tool_rectangle_uninit(void)
 {
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_false);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_false);
 	pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
-	pcb_notify_crosshair_change(&PCB->hidlib, pcb_true);
+	pcb_hid_notify_crosshair_change(&PCB->hidlib, pcb_true);
 }
 
 void pcb_tool_rectangle_notify_mode(pcb_hidlib_t *hl)