Index: constraint.c
===================================================================
--- constraint.c	(revision 30901)
+++ constraint.c	(revision 30902)
@@ -171,7 +171,7 @@
 	pcb_crosshair.AttachedObject.ty = pcb_crosshair.AttachedObject.Y + dy;
 }
 
-static void cnst_enforce(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void cnst_enforce(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((pcb_crosshair.AttachedLine.State == PCB_CH_STATE_SECOND) || (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_THIRD))
 		cnst_line2(&cons);
Index: ddraft.c
===================================================================
--- ddraft.c	(revision 30901)
+++ ddraft.c	(revision 30902)
@@ -441,7 +441,7 @@
 	return 0;
 }
 
-void ddraft_tool_draw_attached(pcb_hidlib_t *hl)
+void ddraft_tool_draw_attached(rnd_hidlib_t *hl)
 {
 	int n;
 	pcb_render->set_line_cap(pcb_crosshair.GC, pcb_cap_round);