Index: act.c
===================================================================
--- act.c	(revision 36985)
+++ act.c	(revision 36986)
@@ -33,7 +33,7 @@
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
 #include "draw.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include "layer.h"
 #include "layer_vis.h"
 #include "search.h"
Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 36985)
+++ layer_menu.c	(revision 36986)
@@ -37,7 +37,7 @@
 #include "layer_grp.h"
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/hid_cfg.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include "layer_menu.h"
 
Index: layersel.c
===================================================================
--- layersel.c	(revision 36985)
+++ layersel.c	(revision 36986)
@@ -29,9 +29,9 @@
 #include <genvector/vti0.h>
 #include <genvector/vtp0.h>
 
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/hid_cfg.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/plugins/lib_hid_common/xpm.h>
 
 #include <librnd/core/actions.h>
Index: routest.c
===================================================================
--- routest.c	(revision 36985)
+++ routest.c	(revision 36986)
@@ -31,10 +31,10 @@
 #include "conf_core.h"
 #include "route_style.h"
 #include "event.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/hid_cfg.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_menu.h>
 
 #include "routest.h"
 
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 36985)
+++ routest_dlg.c	(revision 36986)
@@ -26,7 +26,7 @@
 
 /* included from routest.c - split for clarity */
 
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_dad_tree.h>
 #include "route_style.h"
 #include "data.h"
 
Index: status.c
===================================================================
--- status.c	(revision 36985)
+++ status.c	(revision 36986)
@@ -29,9 +29,9 @@
 #include <genvector/gds_char.h>
 
 #include "board.h"
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_cfg_input.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_cfg_input.h>
+#include <librnd/hid/hid_dad.h>
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
 #include <librnd/plugins/lib_hid_common/xpm.h>