Index: cli.c
===================================================================
--- cli.c	(revision 31018)
+++ cli.c	(revision 31019)
@@ -505,7 +505,7 @@
 
 	if (argc == 1) {
 		rnd_cli_enter("ddraft", "ddraft");
-		pcb_tool_select_by_id(&PCB->hidlib, pcb_ddraft_tool);
+		rnd_tool_select_by_id(&PCB->hidlib, pcb_ddraft_tool);
 		RND_ACT_IRES(0);
 		return 0;
 	}
Index: cli_line.c
===================================================================
--- cli_line.c	(revision 31018)
+++ cli_line.c	(revision 31019)
@@ -62,8 +62,8 @@
 
 	pcb_ddraft_attached_reset();
 
-	if (pcb_tool_next_id != pcb_ddraft_tool)
-		pcb_tool_select_by_id(&PCB->hidlib, pcb_ddraft_tool);
+	if (rnd_tool_next_id != pcb_ddraft_tool)
+		rnd_tool_select_by_id(&PCB->hidlib, pcb_ddraft_tool);
 
 	rnd_trace("line e: '%s':%d\n", line, cursor);
 	memset(&box, 0, sizeof(box));
Index: ddraft.c
===================================================================
--- ddraft.c	(revision 31018)
+++ ddraft.c	(revision 31019)
@@ -503,7 +503,7 @@
 
 static pcb_tool_t tool_ddraft = {
 	"ddraft", "2 dimensional drafting",
-	NULL, 1000, ddraft_xpm, PCB_TOOL_CURSOR_NAMED(NULL), 1,
+	NULL, 1000, ddraft_xpm, RND_TOOL_CURSOR_NAMED(NULL), 1,
 	NULL,
 	NULL,
 	NULL,
@@ -541,7 +541,7 @@
 	rnd_conf_hid_unreg(ddraft_cookie);
 	rnd_event_unbind_allcookie(ddraft_cookie);
 	rnd_remove_actions_by_cookie(ddraft_cookie);
-	pcb_tool_unreg_by_cookie(ddraft_cookie);
+	rnd_tool_unreg_by_cookie(ddraft_cookie);
 }
 
 static const rnd_conf_hid_callbacks_t conf_cbs_adl = { NULL, cons_gui_confchg, NULL, NULL };
@@ -557,7 +557,7 @@
 	RND_REGISTER_ACTIONS(ddraft_action_list, 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);
+	pcb_ddraft_tool = rnd_tool_reg(&tool_ddraft, ddraft_cookie);
 
 	confid = rnd_conf_hid_reg(ddraft_cookie, NULL);
 	cn = rnd_conf_get_field("editor/all_direction_lines");