Index: tool_arc.c
===================================================================
--- tool_arc.c	(revision 29339)
+++ tool_arc.c	(revision 29340)
@@ -43,7 +43,7 @@
 #include "draw.h"
 #include "draw_wireframe.h"
 #include "search.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "undo.h"
 
 #include "obj_arc_draw.h"
Index: tool_arrow.c
===================================================================
--- tool_arrow.c	(revision 29339)
+++ tool_arrow.c	(revision 29340)
@@ -44,7 +44,7 @@
 #include "move.h"
 #include "search.h"
 #include "select.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "undo.h"
 #include "extobj.h"
 
Index: tool_buffer.c
===================================================================
--- tool_buffer.c	(revision 29339)
+++ tool_buffer.c	(revision 29340)
@@ -42,7 +42,7 @@
 #include <librnd/core/actions.h>
 #include <librnd/poly/rtree.h>
 #include "search.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "undo.h"
 
 void pcb_tool_buffer_init(void)
Index: tool_copy.c
===================================================================
--- tool_copy.c	(revision 29339)
+++ tool_copy.c	(revision 29340)
@@ -38,7 +38,7 @@
 #include "move.h"
 #include "crosshair.h"
 #include "search.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 
 void pcb_tool_copy_uninit(void)
 {
Index: tool_insert.c
===================================================================
--- tool_insert.c	(revision 29339)
+++ tool_insert.c	(revision 29340)
@@ -39,7 +39,7 @@
 #include "insert.h"
 #include "polygon.h"
 #include "search.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 
 
 static struct {
Index: tool_line.c
===================================================================
--- tool_line.c	(revision 29339)
+++ tool_line.c	(revision 29340)
@@ -46,7 +46,7 @@
 #include "obj_line.h"
 #include "obj_subc.h"
 #include "search.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "undo.h"
 #include "netlist.h"
 
Index: tool_lock.c
===================================================================
--- tool_lock.c	(revision 29339)
+++ tool_lock.c	(revision 29340)
@@ -40,7 +40,7 @@
 #include "draw.h"
 #include <librnd/core/actions.h>
 #include "search.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "tool_lock.h"
 
 #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)
Index: tool_move.c
===================================================================
--- tool_move.c	(revision 29339)
+++ tool_move.c	(revision 29340)
@@ -38,7 +38,7 @@
 #include "move.h"
 #include "crosshair.h"
 #include "search.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "extobj.h"
 
 
Index: tool_poly.c
===================================================================
--- tool_poly.c	(revision 29339)
+++ tool_poly.c	(revision 29340)
@@ -39,7 +39,7 @@
 #include "crosshair.h"
 #include <librnd/core/actions.h>
 #include "polygon.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 
 
 void pcb_tool_poly_uninit(void)
Index: tool_polyhole.c
===================================================================
--- tool_polyhole.c	(revision 29339)
+++ tool_polyhole.c	(revision 29340)
@@ -40,7 +40,7 @@
 #include <librnd/core/actions.h>
 #include "polygon.h"
 #include "search.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 
 
 void pcb_tool_polyhole_uninit(void)
Index: tool_rectangle.c
===================================================================
--- tool_rectangle.c	(revision 29339)
+++ tool_rectangle.c	(revision 29340)
@@ -39,7 +39,7 @@
 #include "crosshair.h"
 #include "data.h"
 #include "draw.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "undo.h"
 
 #include "obj_poly_draw.h"
Index: tool_remove.c
===================================================================
--- tool_remove.c	(revision 29339)
+++ tool_remove.c	(revision 29340)
@@ -41,7 +41,7 @@
 #include "remove.h"
 #include "search.h"
 #include "obj_rat.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "crosshair.h"
 
 
Index: tool_rotate.c
===================================================================
--- tool_rotate.c	(revision 29339)
+++ tool_rotate.c	(revision 29340)
@@ -38,7 +38,7 @@
 #include <librnd/core/actions.h>
 #include "board.h"
 #include "rotate.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "crosshair.h"
 
 
Index: tool_std.c
===================================================================
--- tool_std.c	(revision 29339)
+++ tool_std.c	(revision 29340)
@@ -31,7 +31,7 @@
 #include "conf_core.h"
 
 #include <librnd/core/plugins.h>
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "crosshair.h"
 
 #include "tool_arc.h"
Index: tool_text.c
===================================================================
--- tool_text.c	(revision 29339)
+++ tool_text.c	(revision 29340)
@@ -39,7 +39,7 @@
 #include "data.h"
 #include "draw.h"
 #include <librnd/core/actions.h>
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "undo.h"
 
 #include "obj_text_draw.h"
Index: tool_thermal.c
===================================================================
--- tool_thermal.c	(revision 29339)
+++ tool_thermal.c	(revision 29340)
@@ -41,7 +41,7 @@
 #include "obj_pstk.h"
 #include "search.h"
 #include "thermal.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 
 void pcb_tool_thermal_on_pstk(pcb_pstk_t *ps, unsigned long lid)
 {
Index: tool_via.c
===================================================================
--- tool_via.c	(revision 29339)
+++ tool_via.c	(revision 29340)
@@ -42,7 +42,7 @@
 #include <librnd/core/hid_inlines.h>
 #include "data.h"
 #include "draw.h"
-#include "tool.h"
+#include <librnd/core/tool.h>
 #include "tool_thermal.h"
 #include "undo.h"