Index: tool_arc.c
===================================================================
--- tool_arc.c	(revision 36988)
+++ tool_arc.c	(revision 36989)
@@ -74,7 +74,7 @@
 	rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true);
 }
 
-void pcb_tool_arc_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_arc_notify_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -132,12 +132,12 @@
 	}
 }
 
-void pcb_tool_arc_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_arc_adjust_attached_objects(rnd_design_t *hl)
 {
 	pcb_crosshair.AttachedBox.otherway = rnd_gui->shift_is_pressed(rnd_gui);
 }
 
-void pcb_tool_arc_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_arc_draw_attached(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -171,7 +171,7 @@
 
 }
 
-rnd_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_arc_undo_act(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_SECOND) {
 		pcb_crosshair.AttachedBox.State = PCB_CH_STATE_FIRST;
@@ -193,7 +193,7 @@
 	return rnd_true;
 }
 
-void pcb_tool_arc_escape(rnd_hidlib_t *hl)
+void pcb_tool_arc_escape(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST)
 		rnd_tool_select_by_name(hl, "arrow");
Index: tool_arc.h
===================================================================
--- tool_arc.h	(revision 36988)
+++ tool_arc.h	(revision 36989)
@@ -2,7 +2,7 @@
 
 void pcb_tool_arc_init(void);
 void pcb_tool_arc_uninit(void);
-void pcb_tool_arc_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_arc_adjust_attached_objects(rnd_hidlib_t *hl);
-void pcb_tool_arc_draw_attached(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_arc_undo_act(rnd_hidlib_t *hl);
+void pcb_tool_arc_notify_mode(rnd_design_t *hl);
+void pcb_tool_arc_adjust_attached_objects(rnd_design_t *hl);
+void pcb_tool_arc_draw_attached(rnd_design_t *hl);
+rnd_bool pcb_tool_arc_undo_act(rnd_design_t *hl);
Index: tool_arrow.c
===================================================================
--- tool_arrow.c	(revision 36988)
+++ tool_arrow.c	(revision 36989)
@@ -65,7 +65,7 @@
 	 at the initial click event) */
 static void click_timer_cb(rnd_hidval_t hv)
 {
-	rnd_hidlib_t *hl = hv.ptr;
+	rnd_design_t *hl = hv.ptr;
 	pcb_board_t *pcb = hv.ptr;
 
 	if (hl->tool_click) {
@@ -140,7 +140,7 @@
 	}
 }
 
-static int pcb_tool_arrow_notify_mode_(rnd_hidlib_t *hl, int type, void *ptr1, void *ptr2, void *ptr3)
+static int pcb_tool_arrow_notify_mode_(rnd_design_t *hl, int type, void *ptr1, void *ptr2, void *ptr3)
 {
 	int otype = type;
 
@@ -169,7 +169,7 @@
 	return 0;
 }
 
-void pcb_tool_arrow_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_arrow_notify_mode(rnd_design_t *hl)
 {
 	void *ptr1, *ptr2, *ptr3;
 	int type;
@@ -193,7 +193,7 @@
 	}
 }
 
-void pcb_tool_arrow_release_mode(rnd_hidlib_t *hl)
+void pcb_tool_arrow_release_mode(rnd_design_t *hl)
 {
 	rnd_box_t box;
 	pcb_board_t *pcb = (pcb_board_t *)hl;
@@ -245,7 +245,7 @@
 	}
 }
 
-void pcb_tool_arrow_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_arrow_adjust_attached_objects(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedBox.State) {
 		pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.X;
Index: tool_arrow.h
===================================================================
--- tool_arrow.h	(revision 36988)
+++ tool_arrow.h	(revision 36989)
@@ -1,6 +1,6 @@
 extern rnd_tool_t pcb_tool_arrow;
 
 void pcb_tool_arrow_uninit(void);
-void pcb_tool_arrow_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_arrow_release_mode(rnd_hidlib_t *hl);
-void pcb_tool_arrow_adjust_attached_objects(rnd_hidlib_t *hl);
+void pcb_tool_arrow_notify_mode(rnd_design_t *hl);
+void pcb_tool_arrow_release_mode(rnd_design_t *hl);
+void pcb_tool_arrow_adjust_attached_objects(rnd_design_t *hl);
Index: tool_buffer.c
===================================================================
--- tool_buffer.c	(revision 36988)
+++ tool_buffer.c	(revision 36989)
@@ -53,7 +53,7 @@
 {
 }
 
-static void pcb_tool_buffer_notify_mode_(rnd_hidlib_t *hl, rnd_bool keep_ids)
+static void pcb_tool_buffer_notify_mode_(rnd_design_t *hl, rnd_bool keep_ids)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -68,12 +68,12 @@
 	}
 }
 
-void pcb_tool_buffer_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_buffer_notify_mode(rnd_design_t *hl)
 {
 	pcb_tool_buffer_notify_mode_(hl, rnd_false);
 }
 
-void pcb_tool_buffer_release_mode(rnd_hidlib_t *hl)
+void pcb_tool_buffer_release_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -93,13 +93,13 @@
 	}
 }
 
-void pcb_tool_buffer_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_buffer_adjust_attached_objects(rnd_design_t *hl)
 {
 	pcb_crosshair.AttachedObject.tx = pcb_crosshair.X;
 	pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y;
 }
 
-void pcb_tool_buffer_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_buffer_draw_attached(rnd_design_t *hl)
 {
 	pcb_xordraw_buffer(PCB_PASTEBUFFER);
 }
Index: tool_buffer.h
===================================================================
--- tool_buffer.h	(revision 36988)
+++ tool_buffer.h	(revision 36989)
@@ -3,6 +3,6 @@
 
 void pcb_tool_buffer_init(void);
 void pcb_tool_buffer_uninit(void);
-void pcb_tool_buffer_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_buffer_release_mode(rnd_hidlib_t *hl);
-void pcb_tool_buffer_draw_attached(rnd_hidlib_t *hl);
+void pcb_tool_buffer_notify_mode(rnd_design_t *hl);
+void pcb_tool_buffer_release_mode(rnd_design_t *hl);
+void pcb_tool_buffer_draw_attached(rnd_design_t *hl);
Index: tool_copy.c
===================================================================
--- tool_copy.c	(revision 36988)
+++ tool_copy.c	(revision 36989)
@@ -51,7 +51,7 @@
 	pcb_crosshair.extobj_edit = NULL;
 }
 
-void pcb_tool_copy_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_copy_notify_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -95,7 +95,7 @@
 	}
 }
 
-void pcb_tool_copy_release_mode(rnd_hidlib_t *hl)
+void pcb_tool_copy_release_mode(rnd_design_t *hl)
 {
 	if (hl->tool_hit) {
 		pcb_tool_copy_notify_mode(hl);
@@ -103,18 +103,18 @@
 	}
 }
 
-void pcb_tool_copy_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_copy_adjust_attached_objects(rnd_design_t *hl)
 {
 	pcb_crosshair.AttachedObject.tx = pcb_crosshair.X;
 	pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y;
 }
 
-void pcb_tool_copy_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_copy_draw_attached(rnd_design_t *hl)
 {
 	pcb_xordraw_movecopy(rnd_gui->control_is_pressed(rnd_gui));
 }
 
-rnd_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_copy_undo_act(rnd_design_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
Index: tool_copy.h
===================================================================
--- tool_copy.h	(revision 36988)
+++ tool_copy.h	(revision 36989)
@@ -1,7 +1,7 @@
 extern rnd_tool_t pcb_tool_copy;
 
 void pcb_tool_copy_uninit(void);
-void pcb_tool_copy_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_copy_release_mode(rnd_hidlib_t *hl);
-void pcb_tool_copy_draw_attached(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_copy_undo_act(rnd_hidlib_t *hl);
+void pcb_tool_copy_notify_mode(rnd_design_t *hl);
+void pcb_tool_copy_release_mode(rnd_design_t *hl);
+void pcb_tool_copy_draw_attached(rnd_design_t *hl);
+rnd_bool pcb_tool_copy_undo_act(rnd_design_t *hl);
Index: tool_insert.c
===================================================================
--- tool_insert.c	(revision 36988)
+++ tool_insert.c	(revision 36989)
@@ -62,7 +62,7 @@
 	rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true);
 }
 
-void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_insert_notify_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	switch (pcb_crosshair.AttachedObject.State) {
@@ -136,7 +136,7 @@
 	}
 }
 
-void pcb_tool_insert_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_insert_adjust_attached_objects(rnd_design_t *hl)
 {
 	rnd_point_t *pnt;
 	pnt = pcb_adjust_insert_point();
@@ -144,12 +144,12 @@
 		InsertedPoint = *pnt;
 }
 
-void pcb_tool_insert_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_insert_draw_attached(rnd_design_t *hl)
 {
 	pcb_xordraw_insert_pt_obj();
 }
 
-rnd_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_insert_undo_act(rnd_design_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
Index: tool_insert.h
===================================================================
--- tool_insert.h	(revision 36988)
+++ tool_insert.h	(revision 36989)
@@ -1,7 +1,7 @@
 extern rnd_tool_t pcb_tool_insert;
 
 void pcb_tool_insert_uninit(void);
-void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_insert_adjust_attached_objects(rnd_hidlib_t *hl);
-void pcb_tool_insert_draw_attached(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_insert_undo_act(rnd_hidlib_t *hl);
+void pcb_tool_insert_notify_mode(rnd_design_t *hl);
+void pcb_tool_insert_adjust_attached_objects(rnd_design_t *hl);
+void pcb_tool_insert_draw_attached(rnd_design_t *hl);
+rnd_bool pcb_tool_insert_undo_act(rnd_design_t *hl);
Index: tool_line.c
===================================================================
--- tool_line.c	(revision 36988)
+++ tool_line.c	(revision 36989)
@@ -93,7 +93,7 @@
 }
 
 /* creates points of a line (when clicked) */
-static void notify_line(rnd_hidlib_t *hl)
+static void notify_line(rnd_design_t *hl)
 {
 	int type = PCB_OBJ_VOID;
 	void *ptr1, *ptr2, *ptr3;
@@ -145,7 +145,7 @@
 	}
 }
 
-void pcb_tool_line_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_line_notify_mode(rnd_design_t *hl)
 {
 	void *ptr1, *ptr2, *ptr3;
 	pcb_board_t *pcb = (pcb_board_t *)hl;
@@ -333,7 +333,7 @@
 	}
 }
 
-void pcb_tool_line_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_line_adjust_attached_objects(rnd_design_t *hl)
 {
 	/* don't draw outline when ctrl key is pressed */
 	if (rnd_gui->control_is_pressed(rnd_gui)) {
@@ -345,7 +345,7 @@
 	}
 }
 
-void pcb_tool_line_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_line_draw_attached(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -384,7 +384,7 @@
 	}
 }
 
-rnd_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_line_undo_act(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -452,7 +452,7 @@
 	return rnd_true;
 }
 
-rnd_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_line_redo_act(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -470,7 +470,7 @@
 	return rnd_false;
 }
 
-void pcb_tool_line_escape(rnd_hidlib_t *hl)
+void pcb_tool_line_escape(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 		rnd_tool_select_by_name(hl, "arrow");
Index: tool_line.h
===================================================================
--- tool_line.h	(revision 36988)
+++ tool_line.h	(revision 36989)
@@ -2,8 +2,8 @@
 
 void pcb_tool_line_init(void);
 void pcb_tool_line_uninit(void);
-void pcb_tool_line_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_line_adjust_attached_objects(rnd_hidlib_t *hl);
-void pcb_tool_line_draw_attached(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_line_undo_act(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_line_redo_act(rnd_hidlib_t *hl);
+void pcb_tool_line_notify_mode(rnd_design_t *hl);
+void pcb_tool_line_adjust_attached_objects(rnd_design_t *hl);
+void pcb_tool_line_draw_attached(rnd_design_t *hl);
+rnd_bool pcb_tool_line_undo_act(rnd_design_t *hl);
+rnd_bool pcb_tool_line_redo_act(rnd_design_t *hl);
Index: tool_lock.c
===================================================================
--- tool_lock.c	(revision 36988)
+++ tool_lock.c	(revision 36989)
@@ -47,7 +47,7 @@
 
 #define PCB_OBJ_CLASS_LOCK (PCB_OBJ_PSTK | PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC | PCB_OBJ_TEXT | PCB_OBJ_LOCKED)
 
-void pcb_tool_lock_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_lock_notify_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	void *ptr1, *ptr2, *ptr3;
Index: tool_lock.h
===================================================================
--- tool_lock.h	(revision 36988)
+++ tool_lock.h	(revision 36989)
@@ -1,3 +1,3 @@
 extern rnd_tool_t pcb_tool_lock;
 
-void pcb_tool_lock_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_lock_notify_mode(rnd_design_t *hl);
Index: tool_move.c
===================================================================
--- tool_move.c	(revision 36988)
+++ tool_move.c	(revision 36989)
@@ -54,7 +54,7 @@
 	pcb_crosshair.extobj_edit = NULL;
 }
 
-void pcb_tool_move_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_move_notify_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	rnd_coord_t dx, dy;
@@ -133,7 +133,7 @@
 	}
 }
 
-void pcb_tool_move_release_mode(rnd_hidlib_t *hl)
+void pcb_tool_move_release_mode(rnd_design_t *hl)
 {
 	if (hl->tool_hit) {
 		pcb_line_mod_merge_inhibit_inc((pcb_board_t *)hl);
@@ -143,18 +143,18 @@
 	}
 }
 
-void pcb_tool_move_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_move_adjust_attached_objects(rnd_design_t *hl)
 {
 	pcb_crosshair.AttachedObject.tx = pcb_crosshair.X;
 	pcb_crosshair.AttachedObject.ty = pcb_crosshair.Y;
 }
 
-void pcb_tool_move_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_move_draw_attached(rnd_design_t *hl)
 {
 	pcb_xordraw_movecopy(rnd_gui->control_is_pressed(rnd_gui));
 }
 
-rnd_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_move_undo_act(rnd_design_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedObject.State != PCB_CH_STATE_FIRST)
Index: tool_move.h
===================================================================
--- tool_move.h	(revision 36988)
+++ tool_move.h	(revision 36989)
@@ -1,7 +1,7 @@
 extern rnd_tool_t pcb_tool_move;
 
 void pcb_tool_move_uninit(void);
-void pcb_tool_move_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_move_release_mode(rnd_hidlib_t *hl);
-void pcb_tool_move_draw_attached(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_move_undo_act(rnd_hidlib_t *hl);
+void pcb_tool_move_notify_mode(rnd_design_t *hl);
+void pcb_tool_move_release_mode(rnd_design_t *hl);
+void pcb_tool_move_draw_attached(rnd_design_t *hl);
+rnd_bool pcb_tool_move_undo_act(rnd_design_t *hl);
Index: tool_poly.c
===================================================================
--- tool_poly.c	(revision 36988)
+++ tool_poly.c	(revision 36989)
@@ -50,7 +50,7 @@
 	rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true);
 }
 
-void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_poly_notify_mode(rnd_design_t *hl)
 {
 	rnd_point_t *points = pcb_crosshair.AttachedPolygon.Points;
 	rnd_cardinal_t n = pcb_crosshair.AttachedPolygon.PointN;
@@ -95,7 +95,7 @@
 	}
 }
 
-void pcb_tool_poly_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_poly_adjust_attached_objects(rnd_design_t *hl)
 {
 	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
 
@@ -114,7 +114,7 @@
 	pcb_line_45(line);
 }
 
-void pcb_tool_poly_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_poly_draw_attached(rnd_design_t *hl)
 {
 	/* draw only if starting point is set */
 	if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
@@ -128,7 +128,7 @@
 	}
 }
 
-rnd_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_poly_undo_act(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_prev_point();
@@ -137,7 +137,7 @@
 	return rnd_true;
 }
 
-rnd_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_poly_redo_act(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_next_point();
@@ -147,7 +147,7 @@
 		return rnd_true;
 }
 
-void pcb_tool_poly_escape(rnd_hidlib_t *hl)
+void pcb_tool_poly_escape(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 		rnd_tool_select_by_name(hl, "arrow");
Index: tool_poly.h
===================================================================
--- tool_poly.h	(revision 36988)
+++ tool_poly.h	(revision 36989)
@@ -1,8 +1,8 @@
 extern rnd_tool_t pcb_tool_poly;
 
 void pcb_tool_poly_uninit(void);
-void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_poly_adjust_attached_objects(rnd_hidlib_t *hl);
-void pcb_tool_poly_draw_attached(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_poly_undo_act(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_poly_redo_act(rnd_hidlib_t *hl);
+void pcb_tool_poly_notify_mode(rnd_design_t *hl);
+void pcb_tool_poly_adjust_attached_objects(rnd_design_t *hl);
+void pcb_tool_poly_draw_attached(rnd_design_t *hl);
+rnd_bool pcb_tool_poly_undo_act(rnd_design_t *hl);
+rnd_bool pcb_tool_poly_redo_act(rnd_design_t *hl);
Index: tool_polyhole.c
===================================================================
--- tool_polyhole.c	(revision 36988)
+++ tool_polyhole.c	(revision 36989)
@@ -51,7 +51,7 @@
 	rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true);
 }
 
-void pcb_tool_polyhole_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_polyhole_notify_mode(rnd_design_t *hl)
 {
 	switch (pcb_crosshair.AttachedObject.State) {
 		/* first notify, lookup object */
@@ -127,7 +127,7 @@
 	}
 }
 
-void pcb_tool_polyhole_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_polyhole_adjust_attached_objects(rnd_design_t *hl)
 {
 	pcb_attached_line_t *line = &pcb_crosshair.AttachedLine;
 
@@ -146,7 +146,7 @@
 	pcb_line_45(line);
 }
 
-void pcb_tool_polyhole_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_polyhole_draw_attached(rnd_design_t *hl)
 {
 	/* draw only if starting point is set */
 	if (pcb_crosshair.AttachedLine.State != PCB_CH_STATE_FIRST)
@@ -160,7 +160,7 @@
 	}
 }
 
-rnd_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_polyhole_undo_act(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_prev_point();
@@ -169,7 +169,7 @@
 	return rnd_true;
 }
 
-rnd_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_polyhole_redo_act(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedPolygon.PointN) {
 		pcb_polygon_go_to_next_point();
@@ -179,7 +179,7 @@
 		return rnd_true;
 }
 
-void pcb_tool_polyhole_escape(rnd_hidlib_t *hl)
+void pcb_tool_polyhole_escape(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedLine.State == PCB_CH_STATE_FIRST)
 		rnd_tool_select_by_name(hl, "arrow");
Index: tool_polyhole.h
===================================================================
--- tool_polyhole.h	(revision 36988)
+++ tool_polyhole.h	(revision 36989)
@@ -1,8 +1,8 @@
 extern rnd_tool_t pcb_tool_polyhole;
 
 void pcb_tool_polyhole_uninit(void);
-void pcb_tool_polyhole_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_polyhole_adjust_attached_objects(rnd_hidlib_t *hl);
-void pcb_tool_polyhole_draw_attached(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_polyhole_undo_act(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_polyhole_redo_act(rnd_hidlib_t *hl);
+void pcb_tool_polyhole_notify_mode(rnd_design_t *hl);
+void pcb_tool_polyhole_adjust_attached_objects(rnd_design_t *hl);
+void pcb_tool_polyhole_draw_attached(rnd_design_t *hl);
+rnd_bool pcb_tool_polyhole_undo_act(rnd_design_t *hl);
+rnd_bool pcb_tool_polyhole_redo_act(rnd_design_t *hl);
Index: tool_rectangle.c
===================================================================
--- tool_rectangle.c	(revision 36988)
+++ tool_rectangle.c	(revision 36989)
@@ -53,7 +53,7 @@
 	rnd_hid_notify_crosshair_change(&PCB->hidlib, rnd_true);
 }
 
-void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_rectangle_notify_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
@@ -94,7 +94,7 @@
 	}
 }
 
-void pcb_tool_rectangle_adjust_attached_objects(rnd_hidlib_t *hl)
+void pcb_tool_rectangle_adjust_attached_objects(rnd_design_t *hl)
 {
 	switch (pcb_crosshair.AttachedBox.State) {
 	case PCB_CH_STATE_SECOND:						/* one corner is selected */
@@ -107,7 +107,7 @@
 	}
 }
 
-rnd_bool pcb_tool_rectangle_anydo_act(rnd_hidlib_t *hl)
+rnd_bool pcb_tool_rectangle_anydo_act(rnd_design_t *hl)
 {
 	/* don't allow undo in the middle of an operation */
 	if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST)
@@ -115,7 +115,7 @@
 	return rnd_true;
 }
 
-void pcb_tool_rectangle_escape(rnd_hidlib_t *hl)
+void pcb_tool_rectangle_escape(rnd_design_t *hl)
 {
 	if (pcb_crosshair.AttachedBox.State == PCB_CH_STATE_FIRST)
 		rnd_tool_select_by_name(hl, "arrow");
Index: tool_rectangle.h
===================================================================
--- tool_rectangle.h	(revision 36988)
+++ tool_rectangle.h	(revision 36989)
@@ -1,6 +1,6 @@
 extern rnd_tool_t pcb_tool_rectangle;
 
 void pcb_tool_rectangle_uninit(void);
-void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_rectangle_adjust_attached_objects(rnd_hidlib_t *hl);
-rnd_bool pcb_tool_rectangle_undo_act(rnd_hidlib_t *hl);
+void pcb_tool_rectangle_notify_mode(rnd_design_t *hl);
+void pcb_tool_rectangle_adjust_attached_objects(rnd_design_t *hl);
+rnd_bool pcb_tool_rectangle_undo_act(rnd_design_t *hl);
Index: tool_remove.c
===================================================================
--- tool_remove.c	(revision 36988)
+++ tool_remove.c	(revision 36989)
@@ -46,7 +46,7 @@
 #include "tool_logic.h"
 
 
-void pcb_tool_remove_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_remove_notify_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	void *ptr1, *ptr2, *ptr3;
Index: tool_remove.h
===================================================================
--- tool_remove.h	(revision 36988)
+++ tool_remove.h	(revision 36989)
@@ -1,3 +1,3 @@
 extern rnd_tool_t pcb_tool_remove;
 
-void pcb_tool_remove_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_remove_notify_mode(rnd_design_t *hl);
Index: tool_rotate.c
===================================================================
--- tool_rotate.c	(revision 36988)
+++ tool_rotate.c	(revision 36989)
@@ -43,7 +43,7 @@
 #include "tool_logic.h"
 
 
-void pcb_tool_rotate_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_rotate_notify_mode(rnd_design_t *hl)
 {
 	pcb_screen_obj_rotate90((pcb_board_t *)hl, hl->tool_x, hl->tool_y,
 		rnd_gui->shift_is_pressed(rnd_gui) ? (conf_core.editor.show_solder_side ? 1 : 3) : (conf_core.editor.show_solder_side ? 3 : 1));
Index: tool_rotate.h
===================================================================
--- tool_rotate.h	(revision 36988)
+++ tool_rotate.h	(revision 36989)
@@ -1,3 +1,3 @@
 extern rnd_tool_t pcb_tool_rotate;
 
-void pcb_tool_rotate_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_rotate_notify_mode(rnd_design_t *hl);
Index: tool_text.c
===================================================================
--- tool_text.c	(revision 36988)
+++ tool_text.c	(revision 36989)
@@ -45,7 +45,7 @@
 #include "obj_text_draw.h"
 
 
-void pcb_tool_text_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_text_notify_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	char *string;
@@ -71,7 +71,7 @@
 	}
 }
 
-void pcb_tool_text_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_text_draw_attached(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	pcb_text_t text = {0};
Index: tool_text.h
===================================================================
--- tool_text.h	(revision 36988)
+++ tool_text.h	(revision 36989)
@@ -1,3 +1,3 @@
 extern rnd_tool_t pcb_tool_text;
 
-void pcb_tool_text_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_text_notify_mode(rnd_design_t *hl);
Index: tool_thermal.c
===================================================================
--- tool_thermal.c	(revision 36988)
+++ tool_thermal.c	(revision 36989)
@@ -90,7 +90,7 @@
 }
 
 
-void pcb_tool_thermal_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_thermal_notify_mode(rnd_design_t *hl)
 {
 	void *ptr1, *ptr2, *ptr3;
 	int type, locked = 0;
Index: tool_thermal.h
===================================================================
--- tool_thermal.h	(revision 36988)
+++ tool_thermal.h	(revision 36989)
@@ -1,6 +1,6 @@
 extern rnd_tool_t pcb_tool_thermal;
 
-void pcb_tool_thermal_notify_mode(rnd_hidlib_t *hl);
+void pcb_tool_thermal_notify_mode(rnd_design_t *hl);
 
 /* direct call: cycle through thermal modes on a padstack - provided for tool_via.h */
 void pcb_tool_thermal_on_obj(pcb_any_obj_t *ps, unsigned long lid);
Index: tool_via.c
===================================================================
--- tool_via.c	(revision 36988)
+++ tool_via.c	(revision 36989)
@@ -48,7 +48,7 @@
 
 #include "obj_pstk_draw.h"
 
-void pcb_tool_via_notify_mode(rnd_hidlib_t *hl)
+void pcb_tool_via_notify_mode(rnd_design_t *hl)
 {
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	pcb_pstk_t *ps;
@@ -76,7 +76,7 @@
 }
 
 
-void pcb_tool_via_draw_attached(rnd_hidlib_t *hl)
+void pcb_tool_via_draw_attached(rnd_design_t *hl)
 {
 		static pcb_pstk_t ps; /* initialized to all-zero */
 
Index: tool_via.h
===================================================================
--- tool_via.h	(revision 36988)
+++ tool_via.h	(revision 36989)
@@ -1,4 +1,4 @@
 extern rnd_tool_t pcb_tool_via;
 
-void pcb_tool_via_notify_mode(rnd_hidlib_t *hl);
-void pcb_tool_via_draw_attached(rnd_hidlib_t *hl);
+void pcb_tool_via_notify_mode(rnd_design_t *hl);
+void pcb_tool_via_draw_attached(rnd_design_t *hl);