Index: trunk/src/librnd/core/event.h
===================================================================
--- trunk/src/librnd/core/event.h	(revision 31027)
+++ trunk/src/librnd/core/event.h	(revision 31028)
@@ -35,7 +35,7 @@
 	RND_EVENT_GUI_INIT,               /* finished initializing the GUI called right before the main loop of the GUI; args: (void) */
 	RND_EVENT_CLI_ENTER,              /* the user pressed enter on a CLI command - called before parsing the line for actions; args: (str commandline) */
 
-	RND_EVENT_TOOL_REG,               /* called after a new tool has been registered; arg is (pcb_tool_t *) of the new tool */
+	RND_EVENT_TOOL_REG,               /* called after a new tool has been registered; arg is (rnd_tool_t *) of the new tool */
 	RND_EVENT_TOOL_SELECT_PRE,        /* called before a tool is selected; arg is (int *ok, int toolid); if ok is non-zero if the selection is accepted */
 	RND_EVENT_TOOL_RELEASE,           /* no arg */
 	RND_EVENT_TOOL_PRESS,             /* no arg */
Index: trunk/src/librnd/core/tool.c
===================================================================
--- trunk/src/librnd/core/tool.c	(revision 31027)
+++ trunk/src/librnd/core/tool.c	(revision 31028)
@@ -60,7 +60,7 @@
 void rnd_tool_uninit(void)
 {
 	while(vtp0_len(&rnd_tools) != 0) {
-		const pcb_tool_t *tool = rnd_tool_get(0);
+		const rnd_tool_t *tool = rnd_tool_get(0);
 		rnd_message(RND_MSG_WARNING, "Unregistered tool: %s of %s; check your plugins, fix them to unregister their tools!\n", tool->name, tool->cookie);
 		rnd_tool_unreg_by_cookie(tool->cookie);
 	}
@@ -73,7 +73,7 @@
 		rnd_tool_select_by_id(hl, rnd_conf.editor.mode);
 }
 
-rnd_toolid_t rnd_tool_reg(pcb_tool_t *tool, const char *cookie)
+rnd_toolid_t rnd_tool_reg(rnd_tool_t *tool, const char *cookie)
 {
 	rnd_toolid_t id;
 	if (rnd_tool_lookup(tool->name) != RND_TOOLID_INVALID) /* don't register two tools with the same name */
@@ -91,7 +91,7 @@
 {
 	rnd_toolid_t n;
 	for(n = 0; n < vtp0_len(&rnd_tools); n++) {
-		const pcb_tool_t *tool = (const pcb_tool_t *)rnd_tools.array[n];
+		const rnd_tool_t *tool = (const rnd_tool_t *)rnd_tools.array[n];
 		if (tool->cookie == cookie) {
 			vtp0_remove(&rnd_tools, n, 1);
 			n--;
@@ -103,7 +103,7 @@
 {
 	rnd_toolid_t n;
 	for(n = 0; n < vtp0_len(&rnd_tools); n++) {
-		const pcb_tool_t *tool = (const pcb_tool_t *)rnd_tools.array[n];
+		const rnd_tool_t *tool = (const rnd_tool_t *)rnd_tools.array[n];
 		if (strcmp(tool->name, name) == 0)
 			return n;
 	}
@@ -162,7 +162,7 @@
 	rnd_toolid_t n, bestn = RND_TOOLID_INVALID;
 	unsigned int bestp = -1;
 	for(n = 0; n < vtp0_len(&rnd_tools) && (bestp > 0); n++) {
-		const pcb_tool_t *tool = (const pcb_tool_t *)rnd_tools.array[n];
+		const rnd_tool_t *tool = (const rnd_tool_t *)rnd_tools.array[n];
 		if (tool->priority < bestp) {
 			bestp = tool->priority;
 			bestn = n;
@@ -195,12 +195,12 @@
 void rnd_tool_gui_init(void)
 {
 	rnd_toolid_t n;
-	pcb_tool_t **tool;
+	rnd_tool_t **tool;
 
 	if (rnd_gui == NULL)
 		return;
 
-	for(n = 0, tool = (pcb_tool_t **)rnd_tools.array; n < rnd_tools.used; n++,tool++)
+	for(n = 0, tool = (rnd_tool_t **)rnd_tools.array; n < rnd_tools.used; n++,tool++)
 		if (*tool != NULL)
 			rnd_gui->reg_mouse_cursor(rnd_gui, n, (*tool)->cursor.name, (*tool)->cursor.pixel, (*tool)->cursor.mask);
 }
@@ -208,10 +208,10 @@
 /**** current tool function wrappers ****/
 #define wrap(func, err_ret, prefix, args) \
 	do { \
-		const pcb_tool_t *tool; \
+		const rnd_tool_t *tool; \
 		if ((rnd_conf.editor.mode < 0) || (rnd_conf.editor.mode >= vtp0_len(&rnd_tools))) \
 			{ err_ret; } \
-		tool = (const pcb_tool_t *)rnd_tools.array[rnd_conf.editor.mode]; \
+		tool = (const rnd_tool_t *)rnd_tools.array[rnd_conf.editor.mode]; \
 		if (tool->func == NULL) \
 			{ err_ret; } \
 		prefix tool->func args; \
@@ -309,7 +309,7 @@
 		rnd_tool_select_by_id(RND_ACT_HIDLIB, rnd_conf.editor.mode);
 	}
 	else if (rnd_strcasecmp(cmd, "Escape") == 0) {
-		const pcb_tool_t *t;
+		const rnd_tool_t *t;
 		escape:;
 		t = rnd_tool_get(rnd_conf.editor.mode);
 		if ((t == NULL) || (t->escape == NULL)) {
Index: trunk/src/librnd/core/tool.h
===================================================================
--- trunk/src/librnd/core/tool.h	(revision 31027)
+++ trunk/src/librnd/core/tool.h	(revision 31028)
@@ -45,10 +45,10 @@
 #define RND_TOOL_CURSOR_XBM(pixel, mask)  { NULL, pixel, mask }
 
 typedef enum rnd_tool_flags_e {
-	PCB_TLF_AUTO_TOOLBAR = 1      /* automatically insert in the toolbar if the menu file didn't do it */
+	RND_TLF_AUTO_TOOLBAR = 1      /* automatically insert in the toolbar if the menu file didn't do it */
 } rnd_tool_flags_t;
 
-typedef struct pcb_tool_s {
+typedef struct rnd_tool_s {
 	const char *name;             /* textual name of the tool */
 	const char *help;             /* help/tooltip that explains the feature */
 	const char *cookie;           /* plugin cookie _pointer_ of the registrar (comparision is pointer based, not strcmp) */
@@ -69,7 +69,7 @@
 	void     (*escape)(rnd_hidlib_t *hl);
 	
 	unsigned long user_flags;
-} pcb_tool_t;
+} rnd_tool_t;
 
 extern vtp0_t rnd_tools;
 extern rnd_toolid_t rnd_tool_prev_id;
@@ -84,7 +84,7 @@
 void rnd_tool_chg_mode(rnd_hidlib_t *hl);
 
 /* Insert a new tool in rnd_tools; returns -1 on failure */
-rnd_toolid_t rnd_tool_reg(pcb_tool_t *tool, const char *cookie);
+rnd_toolid_t rnd_tool_reg(rnd_tool_t *tool, const char *cookie);
 
 /* Unregister all tools that has matching cookie */
 void rnd_tool_unreg_by_cookie(const char *cookie);
@@ -122,6 +122,6 @@
 /**** Low level, for internal use ****/
 
 /* Get the tool pointer of a tool by id */
-#define rnd_tool_get(id) ((const pcb_tool_t *)*vtp0_get(&rnd_tools, id, 0))
+#define rnd_tool_get(id) ((const rnd_tool_t *)*vtp0_get(&rnd_tools, id, 0))
 
 #endif
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 31027)
+++ trunk/src/librnd/pcb_compat.h	(revision 31028)
@@ -1115,8 +1115,8 @@
 #define pcb_tool_flags_t rnd_tool_flags_t
 #define PCB_TOOL_CURSOR_NAMED RND_TOOL_CURSOR_NAMED
 #define PCB_TOOL_CURSOR_XBM RND_TOOL_CURSOR_XBM
-#define pcb_tool_s rnd_tool_s
-#define pcb_tool_t rnd_tool_t
+#define rnd_tool_s rnd_tool_s
+#define rnd_tool_t rnd_tool_t
 #define pcb_tools rnd_tools
 #define pcb_tool_prev_id rnd_tool_prev_id
 #define pcb_tool_next_id rnd_tool_next_id
@@ -1200,3 +1200,6 @@
 #define pcb_funchash_reverse rnd_funchash_reverse
 #define pcb_funchash_init rnd_funchash_init
 #define pcb_funchash_uninit rnd_funchash_uninit
+#define PCB_TLF_AUTO_TOOLBAR RND_TLF_AUTO_TOOLBAR
+#define pcb_tool_s rnd_tool_s
+#define pcb_tool_t rnd_tool_t
Index: trunk/src_plugins/ddraft/ddraft.c
===================================================================
--- trunk/src_plugins/ddraft/ddraft.c	(revision 31027)
+++ trunk/src_plugins/ddraft/ddraft.c	(revision 31028)
@@ -501,7 +501,7 @@
 "     ..... ....      ",
 "                     "};
 
-static pcb_tool_t tool_ddraft = {
+static rnd_tool_t tool_ddraft = {
 	"ddraft", "2 dimensional drafting",
 	NULL, 1000, ddraft_xpm, RND_TOOL_CURSOR_NAMED(NULL), 1,
 	NULL,
Index: trunk/src_plugins/lib_hid_common/toolbar.c
===================================================================
--- trunk/src_plugins/lib_hid_common/toolbar.c	(revision 31027)
+++ trunk/src_plugins/lib_hid_common/toolbar.c	(revision 31028)
@@ -79,7 +79,7 @@
 	rnd_tool_select_by_id(rnd_gui->get_dad_hidlib(hid_ctx), tid);
 }
 
-static void toolbar_create_tool(rnd_toolid_t tid, pcb_tool_t *tool, const char *menufile_help)
+static void toolbar_create_tool(rnd_toolid_t tid, rnd_tool_t *tool, const char *menufile_help)
 {
 	int wid;
 	const char *help = tool->help;
@@ -107,13 +107,13 @@
 	if ((ts != NULL) && (ts->type == LHT_LIST)) {
 		for(t = ts->data.list.first; t != NULL; t = t->next) {
 			rnd_toolid_t tid = rnd_tool_lookup(t->name);
-			pcb_tool_t **tool;
+			rnd_tool_t **tool;
 			const char *mf_help;
 			lht_node_t *nhelp;
 			lht_err_t err;
 
 
-			tool = (pcb_tool_t **)vtp0_get(&rnd_tools, tid, 0);
+			tool = (rnd_tool_t **)vtp0_get(&rnd_tools, tid, 0);
 			if ((tid < 0) || (tool == NULL)) {
 				rnd_message(RND_MSG_ERROR, "toolbar: tool '%s' not found (referenced from the menu file %s:%d)\n", t->name, t->file_name, t->line);
 				continue;
@@ -135,11 +135,11 @@
 
 static void toolbar_create_dyn_all(void)
 {
-	pcb_tool_t **t;
+	rnd_tool_t **t;
 	rnd_toolid_t tid;
-	for(tid = 0, t = (pcb_tool_t **)rnd_tools.array; tid < rnd_tools.used; tid++,t++) {
+	for(tid = 0, t = (rnd_tool_t **)rnd_tools.array; tid < rnd_tools.used; tid++,t++) {
 		int *wid = vti0_get(&toolbar.tid2wid, tid, 0);
-		if (((*t)->flags & PCB_TLF_AUTO_TOOLBAR) == 0)
+		if (((*t)->flags & RND_TLF_AUTO_TOOLBAR) == 0)
 			continue; /* static or inivisible */
 		if ((wid != NULL) && (*wid != 0))
 			continue; /* already has an icon */
@@ -188,9 +188,9 @@
 void pcb_toolbar_reg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	if ((toolbar.sub_inited) && (argv[1].type == RND_EVARG_PTR)) {
-		pcb_tool_t *tool = argv[1].d.p;
+		rnd_tool_t *tool = argv[1].d.p;
 		rnd_toolid_t tid = rnd_tool_lookup(tool->name);
-		if ((tool->flags & PCB_TLF_AUTO_TOOLBAR) != 0) {
+		if ((tool->flags & RND_TLF_AUTO_TOOLBAR) != 0) {
 			int *wid = vti0_get(&toolbar.tid2wid, tid, 0);
 			if ((wid != NULL) && (*wid != 0))
 				return;
Index: trunk/src_plugins/serpentine/serpentine.c
===================================================================
--- trunk/src_plugins/serpentine/serpentine.c	(revision 31027)
+++ trunk/src_plugins/serpentine/serpentine.c	(revision 31028)
@@ -406,7 +406,7 @@
 	return rnd_true;
 }
 
-static pcb_tool_t tool_serpentine = {
+static rnd_tool_t tool_serpentine = {
 	"serpentine", "experimental",
 	NULL, 100, NULL, RND_TOOL_CURSOR_NAMED(NULL), 0,
 	tool_serpentine_init,
Index: trunk/src_plugins/sketch_route/sketch_route.c
===================================================================
--- trunk/src_plugins/sketch_route/sketch_route.c	(revision 31027)
+++ trunk/src_plugins/sketch_route/sketch_route.c	(revision 31028)
@@ -1122,9 +1122,9 @@
 " ...  .  . .   .  .  ",
 "                     "};
 
-static pcb_tool_t tool_skline = {
+static rnd_tool_t tool_skline = {
 	"skline", "convert a free-hand sketch of a route to traces",
-	NULL, 100, skroute_xpm, RND_TOOL_CURSOR_NAMED(NULL), PCB_TLF_AUTO_TOOLBAR,
+	NULL, 100, skroute_xpm, RND_TOOL_CURSOR_NAMED(NULL), RND_TLF_AUTO_TOOLBAR,
 	tool_skline_init,
 	tool_skline_uninit,
 	tool_skline_notify_mode,
Index: trunk/src_plugins/tool_std/tool_arc.c
===================================================================
--- trunk/src_plugins/tool_std/tool_arc.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_arc.c	(revision 31028)
@@ -232,7 +232,7 @@
 "ooooooooooooooooooooo"
 };
 
-pcb_tool_t pcb_tool_arc = {
+rnd_tool_t pcb_tool_arc = {
 	"arc", NULL, NULL, 100, arc_icon, RND_TOOL_CURSOR_NAMED("question_arrow"), 0,
 	pcb_tool_arc_init,
 	pcb_tool_arc_uninit,
Index: trunk/src_plugins/tool_std/tool_arc.h
===================================================================
--- trunk/src_plugins/tool_std/tool_arc.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_arc.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_arc;
+extern rnd_tool_t pcb_tool_arc;
 
 void pcb_tool_arc_init(void);
 void pcb_tool_arc_uninit(void);
Index: trunk/src_plugins/tool_std/tool_arrow.c
===================================================================
--- trunk/src_plugins/tool_std/tool_arrow.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_arrow.c	(revision 31028)
@@ -268,7 +268,7 @@
 "o ooo o ooo oo ooo oo"
 };
 
-pcb_tool_t pcb_tool_arrow = {
+rnd_tool_t pcb_tool_arrow = {
 	"arrow", NULL, NULL, 10, arrow_icon, RND_TOOL_CURSOR_NAMED("left_ptr"), 0,
 	NULL,
 	pcb_tool_arrow_uninit,
Index: trunk/src_plugins/tool_std/tool_arrow.h
===================================================================
--- trunk/src_plugins/tool_std/tool_arrow.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_arrow.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_arrow;
+extern rnd_tool_t pcb_tool_arrow;
 
 void pcb_tool_arrow_uninit(void);
 void pcb_tool_arrow_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_buffer.c
===================================================================
--- trunk/src_plugins/tool_std/tool_buffer.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_buffer.c	(revision 31028)
@@ -129,7 +129,7 @@
 "ooooooooooooooooooooo"
 };
 
-pcb_tool_t pcb_tool_buffer = {
+rnd_tool_t pcb_tool_buffer = {
 	"buffer", NULL, NULL, 100, buf_icon, RND_TOOL_CURSOR_NAMED("hand"), 0,
 	pcb_tool_buffer_init,
 	pcb_tool_buffer_uninit,
Index: trunk/src_plugins/tool_std/tool_buffer.h
===================================================================
--- trunk/src_plugins/tool_std/tool_buffer.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_buffer.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_buffer;
+extern rnd_tool_t pcb_tool_buffer;
 
 void pcb_tool_buffer_init(void);
 void pcb_tool_buffer_uninit(void);
Index: trunk/src_plugins/tool_std/tool_copy.c
===================================================================
--- trunk/src_plugins/tool_std/tool_copy.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_copy.c	(revision 31028)
@@ -119,7 +119,7 @@
 	return rnd_true;
 }
 
-pcb_tool_t pcb_tool_copy = {
+rnd_tool_t pcb_tool_copy = {
 	"copy", NULL, NULL, 100, NULL, RND_TOOL_CURSOR_NAMED("crosshair"), 0,
 	NULL,
 	pcb_tool_copy_uninit,
Index: trunk/src_plugins/tool_std/tool_copy.h
===================================================================
--- trunk/src_plugins/tool_std/tool_copy.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_copy.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_copy;
+extern rnd_tool_t pcb_tool_copy;
 
 void pcb_tool_copy_uninit(void);
 void pcb_tool_copy_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_insert.c
===================================================================
--- trunk/src_plugins/tool_std/tool_insert.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_insert.c	(revision 31028)
@@ -185,7 +185,7 @@
 "ooo   o ooo o    oooo"
 };
 
-pcb_tool_t pcb_tool_insert = {
+rnd_tool_t pcb_tool_insert = {
 	"insert", NULL, NULL, 100, ins_icon, RND_TOOL_CURSOR_NAMED("dotbox"), 0,
 	NULL,
 	pcb_tool_insert_uninit,
Index: trunk/src_plugins/tool_std/tool_insert.h
===================================================================
--- trunk/src_plugins/tool_std/tool_insert.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_insert.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_insert;
+extern rnd_tool_t pcb_tool_insert;
 
 void pcb_tool_insert_uninit(void);
 void pcb_tool_insert_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_line.c
===================================================================
--- trunk/src_plugins/tool_std/tool_line.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_line.c	(revision 31028)
@@ -516,7 +516,7 @@
 };
 
 
-pcb_tool_t pcb_tool_line = {
+rnd_tool_t pcb_tool_line = {
 	"line", NULL, NULL, 100, line_icon, RND_TOOL_CURSOR_NAMED("pencil"), 0,
 	pcb_tool_line_init,
 	pcb_tool_line_uninit,
Index: trunk/src_plugins/tool_std/tool_line.h
===================================================================
--- trunk/src_plugins/tool_std/tool_line.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_line.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_line;
+extern rnd_tool_t pcb_tool_line;
 
 void pcb_tool_line_init(void);
 void pcb_tool_line_uninit(void);
Index: trunk/src_plugins/tool_std/tool_lock.c
===================================================================
--- trunk/src_plugins/tool_std/tool_lock.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_lock.c	(revision 31028)
@@ -119,7 +119,7 @@
    0x1c, 0x30, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f,
    0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f};
 
-pcb_tool_t pcb_tool_lock = {
+rnd_tool_t pcb_tool_lock = {
 	"lock", NULL, NULL, 100, lock_icon, RND_TOOL_CURSOR_XBM(lockIcon_bits, lockMask_bits), 0,
 	NULL,
 	NULL,
Index: trunk/src_plugins/tool_std/tool_lock.h
===================================================================
--- trunk/src_plugins/tool_std/tool_lock.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_lock.h	(revision 31028)
@@ -1,3 +1,3 @@
-extern pcb_tool_t pcb_tool_lock;
+extern rnd_tool_t pcb_tool_lock;
 
 void pcb_tool_lock_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_move.c
===================================================================
--- trunk/src_plugins/tool_std/tool_move.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_move.c	(revision 31028)
@@ -128,7 +128,7 @@
 	return rnd_true;
 }
 
-pcb_tool_t pcb_tool_move = {
+rnd_tool_t pcb_tool_move = {
 	"move", NULL, NULL, 100, NULL, RND_TOOL_CURSOR_NAMED("crosshair"), 0,
 	NULL,
 	pcb_tool_move_uninit,
Index: trunk/src_plugins/tool_std/tool_move.h
===================================================================
--- trunk/src_plugins/tool_std/tool_move.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_move.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_move;
+extern rnd_tool_t pcb_tool_move;
 
 void pcb_tool_move_uninit(void);
 void pcb_tool_move_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_poly.c
===================================================================
--- trunk/src_plugins/tool_std/tool_poly.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_poly.c	(revision 31028)
@@ -189,7 +189,7 @@
 "ooooooooooooooooooooo"
 };
 
-pcb_tool_t pcb_tool_poly = {
+rnd_tool_t pcb_tool_poly = {
 	"poly", NULL, NULL, 100, poly_icon, RND_TOOL_CURSOR_NAMED("up_arrow"), 0,
 	NULL,
 	pcb_tool_poly_uninit,
Index: trunk/src_plugins/tool_std/tool_poly.h
===================================================================
--- trunk/src_plugins/tool_std/tool_poly.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_poly.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_poly;
+extern rnd_tool_t pcb_tool_poly;
 
 void pcb_tool_poly_uninit(void);
 void pcb_tool_poly_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_polyhole.c
===================================================================
--- trunk/src_plugins/tool_std/tool_polyhole.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_polyhole.c	(revision 31028)
@@ -218,7 +218,7 @@
 };
 
 
-pcb_tool_t pcb_tool_polyhole = {
+rnd_tool_t pcb_tool_polyhole = {
 	"polyhole", NULL, NULL, 100, polyhole_icon, RND_TOOL_CURSOR_NAMED("up_arrow"), 0,
 	NULL,
 	pcb_tool_polyhole_uninit,
Index: trunk/src_plugins/tool_std/tool_polyhole.h
===================================================================
--- trunk/src_plugins/tool_std/tool_polyhole.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_polyhole.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_polyhole;
+extern rnd_tool_t pcb_tool_polyhole;
 
 void pcb_tool_polyhole_uninit(void);
 void pcb_tool_polyhole_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_rectangle.c
===================================================================
--- trunk/src_plugins/tool_std/tool_rectangle.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_rectangle.c	(revision 31028)
@@ -155,7 +155,7 @@
 };
 
 
-pcb_tool_t pcb_tool_rectangle = {
+rnd_tool_t pcb_tool_rectangle = {
 	"rectangle", NULL, NULL, 100, rect_icon, RND_TOOL_CURSOR_NAMED("ul_angle"), 0,
 	NULL,
 	pcb_tool_rectangle_uninit,
Index: trunk/src_plugins/tool_std/tool_rectangle.h
===================================================================
--- trunk/src_plugins/tool_std/tool_rectangle.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_rectangle.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_rectangle;
+extern rnd_tool_t pcb_tool_rectangle;
 
 void pcb_tool_rectangle_uninit(void);
 void pcb_tool_rectangle_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_remove.c
===================================================================
--- trunk/src_plugins/tool_std/tool_remove.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_remove.c	(revision 31028)
@@ -116,7 +116,7 @@
 "XX     XX     X     X"
 };
 
-pcb_tool_t pcb_tool_remove = {
+rnd_tool_t pcb_tool_remove = {
 	"remove", NULL, NULL, 100, del_icon, RND_TOOL_CURSOR_NAMED("pirate"), 0,
 	NULL,
 	NULL,
Index: trunk/src_plugins/tool_std/tool_remove.h
===================================================================
--- trunk/src_plugins/tool_std/tool_remove.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_remove.h	(revision 31028)
@@ -1,3 +1,3 @@
-extern pcb_tool_t pcb_tool_remove;
+extern rnd_tool_t pcb_tool_remove;
 
 void pcb_tool_remove_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_rotate.c
===================================================================
--- trunk/src_plugins/tool_std/tool_rotate.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_rotate.c	(revision 31028)
@@ -95,7 +95,7 @@
    0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x1f, 0x80, 0x0f, 0xc0,
    0x1f, 0x60, 0x3b, 0x30, 0xe1, 0x3f, 0xc0, 0x0f};
 
-pcb_tool_t pcb_tool_rotate = {
+rnd_tool_t pcb_tool_rotate = {
 	"rotate", NULL, NULL, 100, rot_icon, RND_TOOL_CURSOR_XBM(rotateIcon_bits, rotateMask_bits), 0,
 	NULL,
 	NULL,
Index: trunk/src_plugins/tool_std/tool_rotate.h
===================================================================
--- trunk/src_plugins/tool_std/tool_rotate.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_rotate.h	(revision 31028)
@@ -1,3 +1,3 @@
-extern pcb_tool_t pcb_tool_rotate;
+extern rnd_tool_t pcb_tool_rotate;
 
 void pcb_tool_rotate_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_text.c
===================================================================
--- trunk/src_plugins/tool_std/tool_text.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_text.c	(revision 31028)
@@ -124,7 +124,7 @@
 "ooooooooooooooooooooo"
 };
 
-pcb_tool_t pcb_tool_text = {
+rnd_tool_t pcb_tool_text = {
 	"text", NULL, NULL, 100, text_icon, RND_TOOL_CURSOR_NAMED("xterm"), 0,
 	NULL,
 	NULL,
Index: trunk/src_plugins/tool_std/tool_text.h
===================================================================
--- trunk/src_plugins/tool_std/tool_text.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_text.h	(revision 31028)
@@ -1,3 +1,3 @@
-extern pcb_tool_t pcb_tool_text;
+extern rnd_tool_t pcb_tool_text;
 
 void pcb_tool_text_notify_mode(rnd_hidlib_t *hl);
Index: trunk/src_plugins/tool_std/tool_thermal.c
===================================================================
--- trunk/src_plugins/tool_std/tool_thermal.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_thermal.c	(revision 31028)
@@ -132,7 +132,7 @@
 "oo ooo oo o oo o ooo "
 };
 
-pcb_tool_t pcb_tool_thermal = {
+rnd_tool_t pcb_tool_thermal = {
 	"thermal", NULL, NULL, 100, thrm_icon, RND_TOOL_CURSOR_NAMED("iron_cross"), 0,
 	NULL,
 	NULL,
Index: trunk/src_plugins/tool_std/tool_thermal.h
===================================================================
--- trunk/src_plugins/tool_std/tool_thermal.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_thermal.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_thermal;
+extern rnd_tool_t pcb_tool_thermal;
 
 void pcb_tool_thermal_notify_mode(rnd_hidlib_t *hl);
 
Index: trunk/src_plugins/tool_std/tool_via.c
===================================================================
--- trunk/src_plugins/tool_std/tool_via.c	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_via.c	(revision 31028)
@@ -135,7 +135,7 @@
 "ooooooooooooooooooooo"
 };
 
-pcb_tool_t pcb_tool_via = {
+rnd_tool_t pcb_tool_via = {
 	"via", NULL, NULL, 100, via_icon, RND_TOOL_CURSOR_NAMED(NULL), 0,
 	NULL,
 	NULL,
Index: trunk/src_plugins/tool_std/tool_via.h
===================================================================
--- trunk/src_plugins/tool_std/tool_via.h	(revision 31027)
+++ trunk/src_plugins/tool_std/tool_via.h	(revision 31028)
@@ -1,4 +1,4 @@
-extern pcb_tool_t pcb_tool_via;
+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);