Index: constraint.c
===================================================================
--- constraint.c	(revision 30966)
+++ constraint.c	(revision 30967)
@@ -171,7 +171,7 @@
 	pcb_crosshair.AttachedObject.ty = pcb_crosshair.AttachedObject.Y + dy;
 }
 
-static void cnst_enforce(rnd_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, rnd_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 30966)
+++ ddraft.c	(revision 30967)
@@ -539,7 +539,7 @@
 void pplg_uninit_ddraft(void)
 {
 	rnd_conf_hid_unreg(ddraft_cookie);
-	pcb_event_unbind_allcookie(ddraft_cookie);
+	rnd_event_unbind_allcookie(ddraft_cookie);
 	rnd_remove_actions_by_cookie(ddraft_cookie);
 	pcb_tool_unreg_by_cookie(ddraft_cookie);
 }
@@ -555,7 +555,7 @@
 	PCB_API_CHK_VER;
 
 	RND_REGISTER_ACTIONS(ddraft_action_list, ddraft_cookie)
-	pcb_event_bind(PCB_EVENT_DRAW_CROSSHAIR_CHATT, cnst_enforce, NULL, ddraft_cookie);
+	rnd_event_bind(PCB_EVENT_DRAW_CROSSHAIR_CHATT, cnst_enforce, NULL, ddraft_cookie);
 
 	pcb_ddraft_tool = pcb_tool_reg(&tool_ddraft, ddraft_cookie);