Index: tool.h
===================================================================
--- tool.h	(revision 16584)
+++ tool.h	(revision 16585)
@@ -62,6 +62,8 @@
 	unsigned int priority;        /* lower values are higher priorities; escaping mode will try to select the highest prio tool */
 
 	/* tool implementation */
+	void     (*init)(void);
+	void     (*uninit)(void);
 	void     (*notify_mode)(void);
 	void     (*release_mode)(void);
 	void     (*adjust_attached_objects)(void);
@@ -119,6 +121,8 @@
 
 extern pcb_tool_note_t pcb_tool_note;
 extern pcb_bool pcb_tool_is_saved;
+extern pcb_toolid_t pcb_tool_prev_id;
+extern pcb_toolid_t pcb_tool_next_id;
 
 void pcb_tool_attach_for_copy(pcb_coord_t PlaceX, pcb_coord_t PlaceY, pcb_bool do_rubberband);
 void pcb_tool_notify_block(void);	/* create first or second corner of a marked block (when clicked) */