Index: act.c
===================================================================
--- act.c	(revision 29256)
+++ act.c	(revision 29257)
@@ -26,14 +26,14 @@
 
 #include "config.h"
 
-#include "actions.h"
+#include <librnd/core/actions.h>
 #include "board.h"
-#include "compat_misc.h"
-#include "conf.h"
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/conf.h>
 #include "conf_core.h"
-#include "hidlib_conf.h"
+#include <librnd/core/hidlib_conf.h>
 #include "draw.h"
-#include "hid.h"
+#include <librnd/core/hid.h>
 #include "layer_vis.h"
 #include "search.h"
 #include "obj_subc_parent.h"
Index: infobar.c
===================================================================
--- infobar.c	(revision 29256)
+++ infobar.c	(revision 29257)
@@ -28,7 +28,7 @@
 
 #include "board.h"
 #include "conf_core.h"
-#include "safe_fs.h"
+#include <librnd/core/safe_fs.h>
 
 static pcb_hidval_t infobar_timer;
 static int infobar_timer_active = 0;
Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 29256)
+++ layer_menu.c	(revision 29257)
@@ -29,14 +29,14 @@
 #include "board.h"
 #include "data.h"
 #include "conf_core.h"
-#include "hidlib_conf.h"
-#include "event.h"
+#include <librnd/core/hidlib_conf.h>
+#include <librnd/core/event.h>
 #include "layer.h"
 #include "layer_ui.h"
 #include "layer_grp.h"
-#include "pcb-printf.h"
-#include "hid_cfg.h"
-#include "hid.h"
+#include <librnd/core/pcb-printf.h>
+#include <librnd/core/hid_cfg.h>
+#include <librnd/core/hid.h>
 
 #include "layer_menu.h"
 
Index: layer_menu.h
===================================================================
--- layer_menu.h	(revision 29256)
+++ layer_menu.h	(revision 29257)
@@ -1,4 +1,4 @@
-#include "event.h"
+#include <librnd/core/event.h>
 
 void pcb_layer_menu_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_layer_menu_vis_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
Index: layersel.c
===================================================================
--- layersel.c	(revision 29256)
+++ layersel.c	(revision 29257)
@@ -29,19 +29,19 @@
 #include <genvector/vti0.h>
 #include <genvector/vtp0.h>
 
-#include "hid.h"
-#include "hid_cfg.h"
-#include "hid_dad.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_cfg.h>
+#include <librnd/core/hid_dad.h>
 
-#include "actions.h"
+#include <librnd/core/actions.h>
 #include "board.h"
 #include "data.h"
-#include "event.h"
+#include <librnd/core/event.h>
 #include "layer.h"
 #include "layer_grp.h"
 #include "layer_ui.h"
 #include "layer_vis.h"
-#include "hidlib_conf.h"
+#include <librnd/core/hidlib_conf.h>
 
 #include "layersel.h"
 
Index: lib_hid_pcbui.c
===================================================================
--- lib_hid_pcbui.c	(revision 29256)
+++ lib_hid_pcbui.c	(revision 29257)
@@ -27,9 +27,9 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include "plugins.h"
-#include "conf_hid.h"
-#include "event.h"
+#include <librnd/core/plugins.h>
+#include <librnd/core/conf_hid.h>
+#include <librnd/core/event.h>
 
 #include "layer_menu.h"
 #include "layersel.h"
Index: routest.c
===================================================================
--- routest.c	(revision 29256)
+++ routest.c	(revision 29257)
@@ -27,13 +27,13 @@
 #include "config.h"
 
 #include "board.h"
-#include "conf.h"
+#include <librnd/core/conf.h>
 #include "conf_core.h"
 #include "route_style.h"
-#include "event.h"
-#include "hid.h"
-#include "hid_cfg.h"
-#include "hid_dad.h"
+#include <librnd/core/event.h>
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_cfg.h>
+#include <librnd/core/hid_dad.h>
 
 #include "routest.h"
 
Index: routest.h
===================================================================
--- routest.h	(revision 29256)
+++ routest.h	(revision 29257)
@@ -1,6 +1,6 @@
-#include "conf.h"
-#include "event.h"
-#include "actions.h"
+#include <librnd/core/conf.h>
+#include <librnd/core/event.h>
+#include <librnd/core/actions.h>
 
 void pcb_rst_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_rst_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 29256)
+++ routest_dlg.c	(revision 29257)
@@ -26,7 +26,7 @@
 
 /* included from routest.c - split for clarity */
 
-#include "hid_dad_tree.h"
+#include <librnd/core/hid_dad_tree.h>
 
 typedef struct{
 	PCB_DAD_DECL_NOINIT(dlg)
Index: status.c
===================================================================
--- status.c	(revision 29256)
+++ status.c	(revision 29257)
@@ -29,11 +29,11 @@
 #include <genvector/gds_char.h>
 
 #include "board.h"
-#include "hid.h"
-#include "hid_cfg_input.h"
-#include "hid_dad.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_cfg_input.h>
+#include <librnd/core/hid_dad.h>
 #include "conf_core.h"
-#include "hidlib_conf.h"
+#include <librnd/core/hidlib_conf.h>
 #include "crosshair.h"
 #include "layer.h"
 #include "search.h"
Index: status.h
===================================================================
--- status.h	(revision 29256)
+++ status.h	(revision 29257)
@@ -1,6 +1,6 @@
-#include "event.h"
-#include "conf.h"
-#include "actions.h"
+#include <librnd/core/event.h>
+#include <librnd/core/conf.h>
+#include <librnd/core/actions.h>
 
 void pcb_status_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_status_st_update_conf(conf_native_t *cfg, int arr_idx);
Index: toolbar.c
===================================================================
--- toolbar.c	(revision 29256)
+++ toolbar.c	(revision 29257)
@@ -29,12 +29,12 @@
 #include <genvector/vti0.h>
 #include <liblihata/tree.h>
 
-#include "hid.h"
-#include "hid_cfg.h"
-#include "hid_dad.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_cfg.h>
+#include <librnd/core/hid_dad.h>
 #include "tool.h"
 #include "board.h"
-#include "hidlib_conf.h"
+#include <librnd/core/hidlib_conf.h>
 
 #include "toolbar.h"
 
Index: toolbar.h
===================================================================
--- toolbar.h	(revision 29256)
+++ toolbar.h	(revision 29257)
@@ -1,5 +1,5 @@
-#include "event.h"
-#include "conf.h"
+#include <librnd/core/event.h>
+#include <librnd/core/conf.h>
 
 void pcb_toolbar_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_toolbar_reg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);