Index: tool_logic.c
===================================================================
--- tool_logic.c	(revision 36988)
+++ tool_logic.c	(revision 36989)
@@ -43,15 +43,15 @@
 
 #include "tool_logic.h"
 
-static void tool_logic_chg_layer(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]);
-static void pcb_release_mode(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]);
-static void pcb_press_mode(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]);
+static void tool_logic_chg_layer(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]);
+static void pcb_release_mode(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]);
+static void pcb_press_mode(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[]);
 
 /*** Generic part, all rnd apps should do something like this ***/
 
 static char tool_logic_cookie[] = "tool_logic";
 
-static void tool_logic_chg_tool(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void tool_logic_chg_tool(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	int *ok = argv[1].d.p;
 	int id = argv[2].d.i;
@@ -96,7 +96,7 @@
 /*** pcb-rnd-specific parts ***/
 
 
-static void tool_logic_chg_layer(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void tool_logic_chg_layer(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	static int was_rat;
 	if (PCB->RatDraw && !was_rat && !(rnd_tool_get(rnd_conf.editor.mode)->user_flags & PCB_TLF_RAT))
@@ -136,7 +136,7 @@
 	}
 }
 
-void pcb_tool_attach_for_copy(rnd_hidlib_t *hl, rnd_coord_t PlaceX, rnd_coord_t PlaceY, rnd_bool do_rubberband)
+void pcb_tool_attach_for_copy(rnd_design_t *hl, rnd_coord_t PlaceX, rnd_coord_t PlaceY, rnd_bool do_rubberband)
 {
 	rnd_coord_t mx = 0, my = 0;
 	pcb_board_t *pcb = (pcb_board_t *)hl;
@@ -211,12 +211,12 @@
 
 /*** old helpers ***/
 
-static void pcb_release_mode(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void pcb_release_mode(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	pcb_draw();
 }
 
-static void pcb_press_mode(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void pcb_press_mode(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	pcb_board_t *pcb = (pcb_board_t *)hidlib;