Index: ar_extern/ar_extern.c
===================================================================
--- ar_extern/ar_extern.c	(revision 36985)
+++ ar_extern/ar_extern.c	(revision 36986)
@@ -35,10 +35,10 @@
 #include "data.h"
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include "conf_core.h"
 #include "obj_pstk_inlines.h"
 #include "src_plugins/lib_netmap/netmap.h"
Index: ar_extern/dlg_extroute.c
===================================================================
--- ar_extern/dlg_extroute.c	(revision 36985)
+++ ar_extern/dlg_extroute.c	(revision 36986)
@@ -27,7 +27,7 @@
  */
 
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 typedef struct {
 	RND_DAD_DECL_NOINIT(dlg)
Index: asm/asm.c
===================================================================
--- asm/asm.c	(revision 36985)
+++ asm/asm.c	(revision 36986)
@@ -39,9 +39,9 @@
 #include <librnd/core/compat_misc.h>
 #include "obj_subc.h"
 #include <librnd/core/rnd_printf.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
+#include <librnd/hid/hid_menu.h>
 #include "search.h"
 #include "draw.h"
 #include "select.h"
Index: autoplace/action.c
===================================================================
--- autoplace/action.c	(revision 36985)
+++ autoplace/action.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include "config.h"
 #include "autoplace.h"
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/actions.h>
 #include "board.h"
 #include <librnd/core/event.h>
Index: autoroute/action.c
===================================================================
--- autoroute/action.c	(revision 36985)
+++ autoroute/action.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include "config.h"
 #include "autoroute.h"
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/event.h>
 #include "funchash_core.h"
Index: cam/cam.c
===================================================================
--- cam/cam.c	(revision 36985)
+++ cam/cam.c	(revision 36986)
@@ -34,9 +34,9 @@
 
 #include "board.h"
 #include "hid_cam.h"
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_nogui.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
 #include "cam_conf.h"
Index: cam/cam_gui.c
===================================================================
--- cam/cam_gui.c	(revision 36985)
+++ cam/cam_gui.c	(revision 36986)
@@ -27,8 +27,8 @@
  */
 
 #include <genht/htsp.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
 
 static const char *OUTFILE_HELP = "Output file name sample, which will\nbe split to prefix and base name (%base%)\nto be used in file name templates";
 static const char *PREFIX_HELP = "File name prefix: every output file\npath will start with this prefix.\nIt is derived from outfile.";
Index: ch_editpoint/ch_editpoint.c
===================================================================
--- ch_editpoint/ch_editpoint.c	(revision 36985)
+++ ch_editpoint/ch_editpoint.c	(revision 36986)
@@ -34,10 +34,10 @@
 
 #include <genvector/vtp0.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <librnd/poly/rtree.h>
 #include <librnd/poly/rtree2_compat.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/hidlib_conf.h>
 #include "board.h"
 #include "conf_core.h"
Index: ch_onpoint/ch_onpoint.c
===================================================================
--- ch_onpoint/ch_onpoint.c	(revision 36985)
+++ ch_onpoint/ch_onpoint.c	(revision 36986)
@@ -36,7 +36,7 @@
 
 #include <genvector/vtp0.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <librnd/poly/rtree.h>
 #include <librnd/poly/rtree2_compat.h>
 #include <librnd/core/hidlib_conf.h>
Index: ddraft/cli.c
===================================================================
--- ddraft/cli.c	(revision 36985)
+++ ddraft/cli.c	(revision 36986)
@@ -26,7 +26,7 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include <librnd/core/compat_misc.h>
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
Index: ddraft/constraint.c
===================================================================
--- ddraft/constraint.c	(revision 36985)
+++ ddraft/constraint.c	(revision 36986)
@@ -28,7 +28,7 @@
 
 #include "crosshair.h"
 #include "obj_line.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 typedef struct {
 	double line_angle[32], move_angle[32];
Index: ddraft/constraint_gui.c
===================================================================
--- ddraft/constraint_gui.c	(revision 36985)
+++ ddraft/constraint_gui.c	(revision 36986)
@@ -26,7 +26,7 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 typedef struct{
 	RND_DAD_DECL_NOINIT(dlg)
Index: ddraft/ddraft.c
===================================================================
--- ddraft/ddraft.c	(revision 36985)
+++ ddraft/ddraft.c	(revision 36986)
@@ -33,8 +33,8 @@
 #include <genvector/gds_char.h>
 #include <genvector/vtp0.h>
 
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
 #include <librnd/core/plugins.h>
 #include "event.h"
 #include <librnd/core/actions.h>
Index: diag/diag.c
===================================================================
--- diag/diag.c	(revision 36985)
+++ diag/diag.c	(revision 36986)
@@ -40,9 +40,9 @@
 #include <librnd/core/error.h>
 #include <librnd/core/event.h>
 #include "integrity.h"
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_dad.h>
 #include "search.h"
 #include "plug_footprint.h"
 #include "plug_io.h"
Index: dialogs/dialogs.c
===================================================================
--- dialogs/dialogs.c	(revision 36985)
+++ dialogs/dialogs.c	(revision 36986)
@@ -28,10 +28,10 @@
  */
 
 #include "config.h"
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/core/plugins.h>
 #include "funchash_core.h"
 #include <librnd/plugins/lib_hid_common/dialogs_conf.h>
Index: dialogs/dlg_about.c
===================================================================
--- dialogs/dlg_about.c	(revision 36985)
+++ dialogs/dlg_about.c	(revision 36986)
@@ -30,7 +30,7 @@
 #include <librnd/core/actions.h>
 #include "build_run.h"
 #include <librnd/core/file_loaded.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/core/rnd_printf.h>
 #include "dlg_about.h"
 
Index: dialogs/dlg_flag_edit.c
===================================================================
--- dialogs/dlg_flag_edit.c	(revision 36985)
+++ dialogs/dlg_flag_edit.c	(revision 36986)
@@ -26,7 +26,7 @@
 
 #include "config.h"
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "flag.h"
 #include "flag_str.h"
 #include "change.h"
Index: dialogs/dlg_fontsel.c
===================================================================
--- dialogs/dlg_fontsel.c	(revision 36985)
+++ dialogs/dlg_fontsel.c	(revision 36986)
@@ -30,7 +30,7 @@
 #include "change.h"
 #include "conf_core.h"
 #include "event.h"
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "stub_draw.h"
 #include "idpath.h"
 #include "search.h"
Index: dialogs/dlg_infobar.c
===================================================================
--- dialogs/dlg_infobar.c	(revision 36985)
+++ dialogs/dlg_infobar.c	(revision 36986)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include <librnd/core/actions.h>
 #include "board.h"
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/plugins/lib_hid_common/xpm.h>
 #include <librnd/plugins/lib_hid_common/dlg_comm_m.h>
 #include "plug_io.h"
Index: dialogs/dlg_layer_binding.c
===================================================================
--- dialogs/dlg_layer_binding.c	(revision 36985)
+++ dialogs/dlg_layer_binding.c	(revision 36986)
@@ -31,7 +31,7 @@
 #include <librnd/core/event.h>
 #include "conf_core.h"
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "funchash_core.h"
 #include "obj_subc.h"
 #include "search.h"
Index: dialogs/dlg_layer_flags.c
===================================================================
--- dialogs/dlg_layer_flags.c	(revision 36985)
+++ dialogs/dlg_layer_flags.c	(revision 36986)
@@ -28,7 +28,7 @@
 #include "board.h"
 #include <librnd/core/actions.h>
 #include "event.h"
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "dlg_layer_binding.h"
 #include "dlg_layer_flags.h"
 
Index: dialogs/dlg_lib_pstk.c
===================================================================
--- dialogs/dlg_lib_pstk.c	(revision 36985)
+++ dialogs/dlg_lib_pstk.c	(revision 36986)
@@ -31,9 +31,9 @@
 #include "data.h"
 #include "obj_subc.h"
 #include "vtpadstack.h"
-#include <librnd/core/hid_inlines.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_inlines.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/safe_fs.h>
 #include "obj_pstk.h"
Index: dialogs/dlg_library.c
===================================================================
--- dialogs/dlg_library.c	(revision 36985)
+++ dialogs/dlg_library.c	(revision 36986)
@@ -41,13 +41,13 @@
 #include "event.h"
 #include "obj_subc.h"
 #include "plug_footprint.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "undo.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
+#include <librnd/hid/hid_init.h>
 
 #include "dlg_library.h"
 
Index: dialogs/dlg_loadsave.c
===================================================================
--- dialogs/dlg_loadsave.c	(revision 36985)
+++ dialogs/dlg_loadsave.c	(revision 36986)
@@ -31,7 +31,7 @@
 #include "board.h"
 #include "data.h"
 #include <librnd/core/event.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/core/compat_fs.h>
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
Index: dialogs/dlg_padstack.c
===================================================================
--- dialogs/dlg_padstack.c	(revision 36985)
+++ dialogs/dlg_padstack.c	(revision 36986)
@@ -26,7 +26,7 @@
 
 #include "config.h"
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/core/hidlib_conf.h>
 #include "funchash_core.h"
 #include "obj_pstk.h"
Index: dialogs/dlg_pref_lib.c
===================================================================
--- dialogs/dlg_pref_lib.c	(revision 36985)
+++ dialogs/dlg_pref_lib.c	(revision 36986)
@@ -30,7 +30,7 @@
 #include <librnd/core/conf.h>
 #include "conf_core.h"
 #include <librnd/core/paths.h>
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_dad_tree.h>
 #include <librnd/plugins/lib_hid_common/dlg_pref.h>
 
 typedef struct pref_libhelp_ctx_s {
Index: dialogs/dlg_printcalib.c
===================================================================
--- dialogs/dlg_printcalib.c	(revision 36985)
+++ dialogs/dlg_printcalib.c	(revision 36986)
@@ -26,7 +26,7 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 
 
 const char pcb_acts_PrintCalibrate[] = "PrintCalibrate()";
Index: dialogs/dlg_test.c
===================================================================
--- dialogs/dlg_test.c	(revision 36985)
+++ dialogs/dlg_test.c	(revision 36986)
@@ -26,8 +26,8 @@
 
 #include "board.h"
 #include "obj_text.h"
-#include <librnd/core/hid_dad_tree.h>
-#include <librnd/core/hid_dad_spin.h>
+#include <librnd/hid/hid_dad_tree.h>
+#include <librnd/hid/hid_dad_spin.h>
 
 static const char dlg_test_syntax[] = "dlg_test()\n";
 static const char dlg_test_help[] = "test the attribute dialog";
Index: dialogs/dlg_view.c
===================================================================
--- dialogs/dlg_view.c	(revision 36985)
+++ dialogs/dlg_view.c	(revision 36986)
@@ -39,9 +39,9 @@
 #include "drc.h"
 #include "actions_pcb.h"
 #include <librnd/core/event.h>
-#include <librnd/core/hid_inlines.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_inlines.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
 #include "undo.h"
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/misc_util.h>
Index: distalign/distalign.c
===================================================================
--- distalign/distalign.c	(revision 36985)
+++ distalign/distalign.c	(revision 36986)
@@ -23,7 +23,7 @@
 #include "config.h"
 #include "data.h"
 #include "data_it.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/poly/rtree.h>
 #include "undo.h"
 #include <librnd/core/error.h>
Index: djopt/djopt.c
===================================================================
--- djopt/djopt.c	(revision 36985)
+++ djopt/djopt.c	(revision 36986)
@@ -57,7 +57,7 @@
 #include <librnd/core/event.h>
 #include "obj_pstk_inlines.h"
 
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include "menu_internal.c"
 
 conf_djopt_t conf_djopt;
Index: draw_fab/draw_fab.c
===================================================================
--- draw_fab/draw_fab.c	(revision 36985)
+++ draw_fab/draw_fab.c	(revision 36986)
@@ -43,7 +43,7 @@
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
 #include "obj_pstk_inlines.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include "funchash_core.h"
 
 #include "obj_text_draw.h"
Index: drc_query/dlg.c
===================================================================
--- drc_query/dlg.c	(revision 36985)
+++ drc_query/dlg.c	(revision 36986)
@@ -28,8 +28,8 @@
  *
  */
 
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
 #include <genlist/gendlist.h>
 #include "actions_pcb.h"
 
Index: drc_query/drc_query.c
===================================================================
--- drc_query/drc_query.c	(revision 36985)
+++ drc_query/drc_query.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include <liblihata/dom.h>
 #include <liblihata/tree.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/anyload.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/error.h>
Index: export_bom/bom.c
===================================================================
--- export_bom/bom.c	(revision 36985)
+++ export_bom/bom.c	(revision 36986)
@@ -21,11 +21,11 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 
 const char *bom_cookie = "bom HID";
 
Index: export_c_draw/export_c_draw.c
===================================================================
--- export_c_draw/export_c_draw.c	(revision 36985)
+++ export_c_draw/export_c_draw.c	(revision 36986)
@@ -48,11 +48,11 @@
 #include <librnd/core/safe_fs.h>
 #include "funchash_core.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 
 static rnd_hid_t c_draw_hid;
Index: export_debug/export_debug.c
===================================================================
--- export_debug/export_debug.c	(revision 36985)
+++ export_debug/export_debug.c	(revision 36986)
@@ -48,11 +48,11 @@
 #include <librnd/core/safe_fs.h>
 #include "funchash_core.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 
 static rnd_hid_t debug_hid;
Index: export_dxf/dxf.c
===================================================================
--- export_dxf/dxf.c	(revision 36985)
+++ export_dxf/dxf.c	(revision 36986)
@@ -48,11 +48,11 @@
 #include <librnd/core/safe_fs.h>
 #include "funchash_core.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 
 static const char *layer_names[] = {
Index: export_excellon/excellon.c
===================================================================
--- export_excellon/excellon.c	(revision 36985)
+++ export_excellon/excellon.c	(revision 36986)
@@ -9,11 +9,11 @@
 #include <librnd/core/compat_misc.h>
 #include "layer.h"
 #include "layer_vis.h"
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_nogui.h>
 #include <librnd/core/plugins.h>
 #include "funchash_core.h"
 #include "conf_core.h"
Index: export_fidocadj/fidocadj.c
===================================================================
--- export_fidocadj/fidocadj.c	(revision 36985)
+++ export_fidocadj/fidocadj.c	(revision 36986)
@@ -52,11 +52,11 @@
 #include "plug_io.h"
 #include <librnd/core/safe_fs.h>
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 
 #include "../src_plugins/lib_compat_help/pstk_compat.h"
Index: export_gcode/gcode.c
===================================================================
--- export_gcode/gcode.c	(revision 36985)
+++ export_gcode/gcode.c	(revision 36986)
@@ -32,11 +32,11 @@
 #include "funchash_core.h"
 #include "layer.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 
 #include "../src_plugins/millpath/toolpath.h"
Index: export_gerber/gerber.c
===================================================================
--- export_gerber/gerber.c	(revision 36985)
+++ export_gerber/gerber.c	(revision 36986)
@@ -27,12 +27,12 @@
 #include "gerber_conf.h"
 #include <librnd/core/event.h>
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_inlines.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_inlines.h>
+#include <librnd/hid/hid_dad.h>
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
 #include <librnd/core/actions.h>
Index: export_hpgl/export_hpgl.c
===================================================================
--- export_hpgl/export_hpgl.c	(revision 36985)
+++ export_hpgl/export_hpgl.c	(revision 36986)
@@ -47,11 +47,11 @@
 #include <librnd/core/safe_fs.h>
 #include "funchash_core.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 
 static rnd_hid_t exp_hpgl_hid;
Index: export_ipcd356/ipcd356.c
===================================================================
--- export_ipcd356/ipcd356.c	(revision 36985)
+++ export_ipcd356/ipcd356.c	(revision 36986)
@@ -46,11 +46,11 @@
 #include "obj_pstk.h"
 #include "obj_pstk_inlines.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 #include "hid_cam.h"
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
 #include <librnd/core/plugins.h>
 
 static const char *ipcd356_cookie = "ipcd356 exporter";
Index: export_lpr/lpr.c
===================================================================
--- export_lpr/lpr.c	(revision 36985)
+++ export_lpr/lpr.c	(revision 36986)
@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 
 #include "../export_ps/ps.h"
Index: export_oldconn/oldconn.c
===================================================================
--- export_oldconn/oldconn.c	(revision 36985)
+++ export_oldconn/oldconn.c	(revision 36986)
@@ -45,8 +45,8 @@
 #include "funchash_core.h"
 #include "search.h"
 
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 
 const char *oldconn_cookie = "export_oldconn HID";
 
Index: export_openems/excitation.c
===================================================================
--- export_openems/excitation.c	(revision 36985)
+++ export_openems/excitation.c	(revision 36986)
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "event.h"
 
 #define MAX_EXC 16
Index: export_openems/export_openems.c
===================================================================
--- export_openems/export_openems.c	(revision 36985)
+++ export_openems/export_openems.c	(revision 36986)
@@ -44,12 +44,12 @@
 #include "obj_subc_parent.h"
 #include "obj_pstk_inlines.h"
 
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid_nogui.h>
 #include "hid_cam.h"
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
 #include "../src_plugins/lib_polyhelp/topoly.h"
 #include "mesh.h"
 
Index: export_openems/mesh.c
===================================================================
--- export_openems/mesh.c	(revision 36985)
+++ export_openems/mesh.c	(revision 36986)
@@ -32,7 +32,7 @@
 #include <librnd/core/actions.h>
 #include "board.h"
 #include "data.h"
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "event.h"
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/rnd_printf.h>
Index: export_openscad/export_openscad.c
===================================================================
--- export_openscad/export_openscad.c	(revision 36985)
+++ export_openscad/export_openscad.c	(revision 36986)
@@ -51,12 +51,12 @@
 #include "obj_pstk_inlines.h"
 #include "funchash_core.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 
 
Index: export_openscad/scad_draw.c
===================================================================
--- export_openscad/scad_draw.c	(revision 36985)
+++ export_openscad/scad_draw.c	(revision 36986)
@@ -26,7 +26,7 @@
 
 #include "../lib_polyhelp/topoly.h"
 #include "plug_io.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 
 
 #define TRX_(x) (x)
Index: export_png/png.c
===================================================================
--- export_png/png.c	(revision 36985)
+++ export_png/png.c	(revision 36986)
@@ -53,10 +53,10 @@
 #include "funchash_core.h"
 #include "hid_cam.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/compat_misc.h>
 
 /* we depend on <gd.h> for photo mode */
Index: export_ps/eps.c
===================================================================
--- export_ps/eps.c	(revision 36985)
+++ export_ps/eps.c	(revision 36986)
@@ -23,11 +23,11 @@
 #include <librnd/core/safe_fs.h>
 #include <librnd/plugins/lib_exp_text/draw_eps.h>
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 #include "ps.h"
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 #include "funchash_core.h"
 
Index: export_ps/ps.c
===================================================================
--- export_ps/ps.c	(revision 36985)
+++ export_ps/ps.c	(revision 36986)
@@ -21,13 +21,13 @@
 #include "funchash_core.h"
 #include "layer_vis.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 #include <librnd/plugins/lib_exp_text/draw_ps.h>
 
 #include "ps.h"
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/actions.h>
 #include "conf_core.h"
 #include <librnd/core/compat_misc.h>
Index: export_stat/stat.c
===================================================================
--- export_stat/stat.c	(revision 36985)
+++ export_stat/stat.c	(revision 36986)
@@ -56,11 +56,11 @@
 #include <librnd/core/safe_fs.h>
 #include "obj_pstk_inlines.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 
 
Index: export_stl/export_stl.c
===================================================================
--- export_stl/export_stl.c	(revision 36985)
+++ export_stl/export_stl.c	(revision 36986)
@@ -28,10 +28,10 @@
 
 #include <genvector/vtd0.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid_nogui.h>
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/compat_misc.h>
Index: export_svg/svg.c
===================================================================
--- export_svg/svg.c	(revision 36985)
+++ export_svg/svg.c	(revision 36986)
@@ -54,11 +54,11 @@
 #include <librnd/core/safe_fs.h>
 #include "funchash_core.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
 
 #include <librnd/plugins/lib_exp_text/draw_svg.h>
Index: export_vfs_fuse/export_vfs_fuse.c
===================================================================
--- export_vfs_fuse/export_vfs_fuse.c	(revision 36985)
+++ export_vfs_fuse/export_vfs_fuse.c	(revision 36986)
@@ -27,10 +27,10 @@
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/compat_fs.h>
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_nogui.h>
 
 #include "../src_plugins/lib_vfs/lib_vfs.h"
 
Index: export_vfs_mc/export_vfs_mc.c
===================================================================
--- export_vfs_mc/export_vfs_mc.c	(revision 36985)
+++ export_vfs_mc/export_vfs_mc.c	(revision 36986)
@@ -15,10 +15,10 @@
 #include <librnd/core/plugins.h>
 #include "plug_io.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_nogui.h>
 
 #include "../src_plugins/lib_vfs/lib_vfs.h"
 
Index: export_xy/xy.c
===================================================================
--- export_xy/xy.c	(revision 36985)
+++ export_xy/xy.c	(revision 36986)
@@ -27,11 +27,11 @@
 #include "operation.h"
 #include "xy_conf.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
+#include <librnd/hid/hid_attrib.h>
 #include "hid_cam.h"
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 
 #include "../src_plugins/lib_compat_help/elem_rot.h"
 #include "../src_plugins/export_xy/conf_internal.c"
Index: extedit/extedit.c
===================================================================
--- extedit/extedit.c	(revision 36985)
+++ extedit/extedit.c	(revision 36986)
@@ -26,10 +26,10 @@
 
 #include "config.h"
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/core/plugins.h>
 
 #include "board.h"
Index: extedit/extedit_dad.c
===================================================================
--- extedit/extedit_dad.c	(revision 36985)
+++ extedit/extedit_dad.c	(revision 36986)
@@ -24,7 +24,7 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 typedef struct {
 	RND_DAD_DECL_NOINIT(dlg)
Index: exto_std/exto_std.c
===================================================================
--- exto_std/exto_std.c	(revision 36985)
+++ exto_std/exto_std.c	(revision 36986)
@@ -39,8 +39,8 @@
 #include "extobj.h"
 #include "extobj_helper.h"
 #include "conf_core.h"
-#include <librnd/core/hid_inlines.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_inlines.h>
+#include <librnd/hid/hid_dad.h>
 
 #include "line_of_vias.c"
 #include "dimension.c"
Index: fp_fs/fp_fs.c
===================================================================
--- fp_fs/fp_fs.c	(revision 36985)
+++ fp_fs/fp_fs.c	(revision 36986)
@@ -51,7 +51,7 @@
 #include <librnd/core/conf.h>
 #include <librnd/core/conf_hid.h>
 #include "conf_core.h"
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/safe_fs_dir.h>
 
Index: import_accel_net/accel_net.c
===================================================================
--- import_accel_net/accel_net.c	(revision 36985)
+++ import_accel_net/accel_net.c	(revision 36986)
@@ -40,10 +40,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <gensexpr/gsxl.h>
 #include <genvector/gds_char.h>
 #include "undo.h"
Index: import_calay/calay.c
===================================================================
--- import_calay/calay.c	(revision 36985)
+++ import_calay/calay.c	(revision 36986)
@@ -40,10 +40,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #define NETEXT ".net"
 #define CMPEXT ".cmp"
Index: import_fpcb_nl/fpcb_nl.c
===================================================================
--- import_fpcb_nl/fpcb_nl.c	(revision 36985)
+++ import_fpcb_nl/fpcb_nl.c	(revision 36986)
@@ -41,10 +41,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include "menu_internal.c"
 
Index: import_gnetlist/import_gnetlist.c
===================================================================
--- import_gnetlist/import_gnetlist.c	(revision 36985)
+++ import_gnetlist/import_gnetlist.c	(revision 36986)
@@ -36,7 +36,7 @@
 #include <librnd/core/actions.h>
 
 /* for win32 paths: */
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 
 #include "board.h"
 #include "undo.h"
Index: import_hpgl/hpgl.c
===================================================================
--- import_hpgl/hpgl.c	(revision 36985)
+++ import_hpgl/hpgl.c	(revision 36986)
@@ -42,10 +42,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include "menu_internal.c"
 
Index: import_ipcd356/ipcd356.c
===================================================================
--- import_ipcd356/ipcd356.c	(revision 36985)
+++ import_ipcd356/ipcd356.c	(revision 36986)
@@ -37,12 +37,12 @@
 #include <librnd/core/safe_fs.h>
 
 #include "conf_core.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
 #include <librnd/poly/rtree.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 
 #include "../src_plugins/lib_compat_help/pstk_help.h"
 
Index: import_ltspice/ltspice.c
===================================================================
--- import_ltspice/ltspice.c	(revision 36985)
+++ import_ltspice/ltspice.c	(revision 36986)
@@ -43,10 +43,10 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/compat_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include "menu_internal.c"
 
Index: import_mentor_sch/mentor_sch.c
===================================================================
--- import_mentor_sch/mentor_sch.c	(revision 36985)
+++ import_mentor_sch/mentor_sch.c	(revision 36986)
@@ -40,10 +40,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <gensexpr/gsxl.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include "mentor_sch_conf.h"
 #include <librnd/core/paths.h>
 #include <librnd/core/safe_fs.h>
Index: import_mucs/mucs.c
===================================================================
--- import_mucs/mucs.c	(revision 36985)
+++ import_mucs/mucs.c	(revision 36986)
@@ -44,7 +44,7 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
 #include "layer.h"
Index: import_net_action/import_net_action.c
===================================================================
--- import_net_action/import_net_action.c	(revision 36985)
+++ import_net_action/import_net_action.c	(revision 36986)
@@ -44,7 +44,7 @@
 
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 static int net_action_support_prio(pcb_plug_import_t *ctx, unsigned int aspects, const char **args, int numargs)
 {
Index: import_orcad_net/orcad_net.c
===================================================================
--- import_orcad_net/orcad_net.c	(revision 36985)
+++ import_orcad_net/orcad_net.c	(revision 36986)
@@ -41,10 +41,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <gensexpr/gsxl.h>
 #include <genvector/gds_char.h>
 
Index: import_pads_net/pads_net.c
===================================================================
--- import_pads_net/pads_net.c	(revision 36985)
+++ import_pads_net/pads_net.c	(revision 36986)
@@ -41,10 +41,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include "menu_internal.c"
 
Index: import_protel_net/protel_net.c
===================================================================
--- import_protel_net/protel_net.c	(revision 36985)
+++ import_protel_net/protel_net.c	(revision 36986)
@@ -41,10 +41,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include "menu_internal.c"
 
Index: import_sch2/import_sch.c
===================================================================
--- import_sch2/import_sch.c	(revision 36985)
+++ import_sch2/import_sch.c	(revision 36986)
@@ -30,7 +30,7 @@
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/core/conf_hid.h>
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/compat_lrealpath.h>
Index: import_sch_rnd/import_sch_rnd.c
===================================================================
--- import_sch_rnd/import_sch_rnd.c	(revision 36985)
+++ import_sch_rnd/import_sch_rnd.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include <librnd/core/actions.h>
 
 /* for win32 paths: */
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 
 #include "board.h"
 #include "undo.h"
Index: import_tinycad/tinycad.c
===================================================================
--- import_tinycad/tinycad.c	(revision 36985)
+++ import_tinycad/tinycad.c	(revision 36986)
@@ -42,10 +42,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include "menu_internal.c"
 
Index: import_ttf/ttf.c
===================================================================
--- import_ttf/ttf.c	(revision 36985)
+++ import_ttf/ttf.c	(revision 36986)
@@ -37,9 +37,9 @@
 
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_menu.h>
 
 #include "ttf_load.h"
 #include "str_approx.h"
Index: io_altium/io_altium.c
===================================================================
--- io_altium/io_altium.c	(revision 36985)
+++ io_altium/io_altium.c	(revision 36986)
@@ -30,7 +30,7 @@
 
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
 #include "plug_io.h"
 
Index: io_autotrax/io_autotrax.c
===================================================================
--- io_autotrax/io_autotrax.c	(revision 36985)
+++ io_autotrax/io_autotrax.c	(revision 36986)
@@ -41,7 +41,7 @@
 #include "board.h"
 #include "conf_core.h"
 #include "buffer.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
 
 static pcb_plug_io_t io_autotrax;
Index: io_bxl/io_bxl.c
===================================================================
--- io_bxl/io_bxl.c	(revision 36985)
+++ io_bxl/io_bxl.c	(revision 36986)
@@ -31,7 +31,7 @@
 
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
 #include "plug_io.h"
 
Index: io_dsn/export.c
===================================================================
--- io_dsn/export.c	(revision 36985)
+++ io_dsn/export.c	(revision 36986)
@@ -29,9 +29,9 @@
 
 #include "config.h"
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_nogui.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_nogui.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/safe_fs.h>
 
 #include "board.h"
Index: io_dsn/io_dsn.c
===================================================================
--- io_dsn/io_dsn.c	(revision 36985)
+++ io_dsn/io_dsn.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include "read.h"
 #include "write.h"
 
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
 #include "plug_io.h"
 #include <librnd/core/plugins.h>
Index: io_dsn/ses.c
===================================================================
--- io_dsn/ses.c	(revision 36985)
+++ io_dsn/ses.c	(revision 36986)
@@ -42,8 +42,8 @@
 #include <librnd/core/safe_fs.h>
 
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/compat_misc.h>
 
Index: io_eagle/io_eagle.c
===================================================================
--- io_eagle/io_eagle.c	(revision 36985)
+++ io_eagle/io_eagle.c	(revision 36986)
@@ -29,7 +29,7 @@
 
 #include "config.h"
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include "plug_io.h"
 #include "read.h"
 #include "read_dru.h"
Index: io_hyp/io_hyp.c
===================================================================
--- io_hyp/io_hyp.c	(revision 36985)
+++ io_hyp/io_hyp.c	(revision 36986)
@@ -32,12 +32,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_nogui.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/plugins.h>
 #include "event.h"
 #include "plug_io.h"
Index: io_kicad/io_kicad.c
===================================================================
--- io_kicad/io_kicad.c	(revision 36985)
+++ io_kicad/io_kicad.c	(revision 36986)
@@ -29,7 +29,7 @@
 
 #include "config.h"
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include "plug_io.h"
 #include "write.h"
 #include "read.h"
Index: io_kicad/read_net.c
===================================================================
--- io_kicad/read_net.c	(revision 36985)
+++ io_kicad/read_net.c	(revision 36986)
@@ -44,7 +44,7 @@
 
 #include <librnd/core/actions.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #define if_strval(node, name) \
 	if (strcmp(node->str, #name) == 0) { \
Index: io_lihata/read.c
===================================================================
--- io_lihata/read.c	(revision 36985)
+++ io_lihata/read.c	(revision 36986)
@@ -45,7 +45,7 @@
 #include <librnd/core/error.h>
 #include <librnd/core/misc_util.h>
 #include <librnd/core/base64.h>
-#include <librnd/core/pixmap.h>
+#include <librnd/hid/pixmap.h>
 #include <libulzw/libulzw.h>
 #include "layer.h"
 #include <genvector/vtp0.h>
Index: io_lihata/write.c
===================================================================
--- io_lihata/write.c	(revision 36985)
+++ io_lihata/write.c	(revision 36986)
@@ -46,7 +46,7 @@
 #include "rats_patch.h"
 #include <librnd/core/actions.h>
 #include <librnd/core/base64.h>
-#include <librnd/core/pixmap.h>
+#include <librnd/hid/pixmap.h>
 #include <librnd/core/misc_util.h>
 #include "layer.h"
 #include "common.h"
@@ -60,7 +60,7 @@
 #include "thermal.h"
 #include "funchash_core.h"
 #include "netlist.h"
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 #include "src_plugins/lib_compat_help/pstk_compat.h"
 #include "src_plugins/lib_compat_help/route_style.h"
Index: io_pads/io_pads.c
===================================================================
--- io_pads/io_pads.c	(revision 36985)
+++ io_pads/io_pads.c	(revision 36986)
@@ -31,7 +31,7 @@
 
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
 #include "plug_io.h"
 #include "io_pads_conf.h"
Index: io_pcb/file.c
===================================================================
--- io_pcb/file.c	(revision 36985)
+++ io_pcb/file.c	(revision 36986)
@@ -46,7 +46,7 @@
 #include <librnd/core/error.h>
 #include "file.h"
 #include "plug_io.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include "layer.h"
 #include "layer_grp.h"
 #include "move.h"
Index: io_tedax/io_tedax.c
===================================================================
--- io_tedax/io_tedax.c	(revision 36985)
+++ io_tedax/io_tedax.c	(revision 36986)
@@ -38,11 +38,11 @@
 #include "conf_core.h"
 #include "buffer.h"
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include "plug_io.h"
 #include "stackup.h"
 #include "tlayer.h"
Index: io_tedax/tetest.c
===================================================================
--- io_tedax/tetest.c	(revision 36985)
+++ io_tedax/tetest.c	(revision 36986)
@@ -44,11 +44,11 @@
 #include "netlist.h"
 #include <librnd/core/plugins.h>
 #include "plug_io.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include "hid_cam.h"
-#include <librnd/core/hid_nogui.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_nogui.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid_attrib.h>
 
 static const char *sides(pcb_layer_type_t lyt)
 {
Index: io_tedax/trouter.c
===================================================================
--- io_tedax/trouter.c	(revision 36985)
+++ io_tedax/trouter.c	(revision 36986)
@@ -47,7 +47,7 @@
 #include "tlayer.h"
 #include "obj_pstk.h"
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/actions.h>
 #include "plug_io.h"
 #include "conf_core.h"
Index: jostle/jostle.c
===================================================================
--- jostle/jostle.c	(revision 36985)
+++ jostle/jostle.c	(revision 36986)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "board.h"
 #include "data.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/poly/rtree.h>
 #include "undo.h"
 #include "polygon.h"
Index: lib_hid_pcbui/act.c
===================================================================
--- lib_hid_pcbui/act.c	(revision 36985)
+++ lib_hid_pcbui/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: lib_hid_pcbui/layer_menu.c
===================================================================
--- lib_hid_pcbui/layer_menu.c	(revision 36985)
+++ lib_hid_pcbui/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: lib_hid_pcbui/layersel.c
===================================================================
--- lib_hid_pcbui/layersel.c	(revision 36985)
+++ lib_hid_pcbui/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: lib_hid_pcbui/routest.c
===================================================================
--- lib_hid_pcbui/routest.c	(revision 36985)
+++ lib_hid_pcbui/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: lib_hid_pcbui/routest_dlg.c
===================================================================
--- lib_hid_pcbui/routest_dlg.c	(revision 36985)
+++ lib_hid_pcbui/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: lib_hid_pcbui/status.c
===================================================================
--- lib_hid_pcbui/status.c	(revision 36985)
+++ lib_hid_pcbui/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>
Index: lib_polyhelp/polyhelp.c
===================================================================
--- lib_polyhelp/polyhelp.c	(revision 36985)
+++ lib_polyhelp/polyhelp.c	(revision 36986)
@@ -38,7 +38,7 @@
 #include "undo.h"
 #include <librnd/core/box.h>
 #include <librnd/poly/offset.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 #include "topoly.h"
 
@@ -49,7 +49,7 @@
 #include "data.h"
 #include "conf_core.h"
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hid_attrib.h>
+#include <librnd/hid/hid_attrib.h>
 #include <librnd/core/actions.h>
 
 void pcb_pline_fprint_anim(FILE *f, const rnd_pline_t *pl)
Index: lib_polyhelp/topoly.c
===================================================================
--- lib_polyhelp/topoly.c	(revision 36985)
+++ lib_polyhelp/topoly.c	(revision 36986)
@@ -42,7 +42,7 @@
 #include "find.h"
 #include "polygon.h"
 #include "search.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/actions.h>
 #include "funchash_core.h"
 
Index: order/order.c
===================================================================
--- order/order.c	(revision 36985)
+++ order/order.c	(revision 36986)
@@ -34,9 +34,9 @@
 #include "funchash_core.h"
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/core/hid_cfg.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include "layer.h"
 #include <librnd/core/event.h>
 #include "order_conf.h"
Index: order/order.h
===================================================================
--- order/order.h	(revision 36985)
+++ order/order.h	(revision 36986)
@@ -28,7 +28,7 @@
 #define PCB_ORDER_H
 
 #include <genvector/vtp0.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "../src_plugins/order/order_conf.h"
 
 extern conf_order_t conf_order;
Index: polycombine/polycombine.c
===================================================================
--- polycombine/polycombine.c	(revision 36985)
+++ polycombine/polycombine.c	(revision 36986)
@@ -17,7 +17,7 @@
 #include "board.h"
 #include "data.h"
 #include "remove.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/error.h>
 #include <librnd/poly/rtree.h>
 #include "polygon.h"
Index: polystitch/polystitch.c
===================================================================
--- polystitch/polystitch.c	(revision 36985)
+++ polystitch/polystitch.c	(revision 36986)
@@ -19,7 +19,7 @@
 #include "board.h"
 #include "data.h"
 #include "remove.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/error.h>
 #include <librnd/poly/rtree.h>
 #include "draw.h"
Index: propedit/propdlg.c
===================================================================
--- propedit/propdlg.c	(revision 36985)
+++ propedit/propdlg.c	(revision 36986)
@@ -32,10 +32,10 @@
 
 #include "board.h"
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
 #include <librnd/core/conf_hid.h>
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include "netlist.h"
 #include "event.h"
 
Index: propedit/props.c
===================================================================
--- propedit/props.c	(revision 36985)
+++ propedit/props.c	(revision 36986)
@@ -29,7 +29,7 @@
 #include <librnd/core/compat_misc.h>
 #include "board.h"
 #include <librnd/core/rnd_printf.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <genht/hash.h>
 /*#define HT_INVALID_VALUE ((pcb_propval_t){PCB_PROPT_invalid, {0}})*/
 #define HT(x) htprop_ ## x
Index: puller/puller.c
===================================================================
--- puller/puller.c	(revision 36985)
+++ puller/puller.c	(revision 36986)
@@ -82,7 +82,7 @@
 #include "search.h"
 #include "find.h"
 
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include "menu_internal.c"
 
 #define abort1() fprintf(stderr, "abort at line %d\n", __LINE__), abort()
Index: query/dlg_search.c
===================================================================
--- query/dlg_search.c	(revision 36985)
+++ query/dlg_search.c	(revision 36986)
@@ -31,7 +31,7 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/conf_hid.h>
 #include <librnd/core/hidlib_conf.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include <librnd/core/event.h>
 #include <librnd/core/error.h>
 #include "query.h"
Index: query/dlg_search_edit.c
===================================================================
--- query/dlg_search_edit.c	(revision 36985)
+++ query/dlg_search_edit.c	(revision 36986)
@@ -28,8 +28,8 @@
 
 #include <librnd/core/actions.h>
 #include <librnd/core/conf_hid.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
 #include <librnd/core/error.h>
 
 typedef struct{
Index: query/query.c
===================================================================
--- query/query.c	(revision 36985)
+++ query/query.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include <librnd/core/error.h>
 #include "undo.h"
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/compat_misc.h>
 #include "query.h"
Index: renumber/renumberblock.c
===================================================================
--- renumber/renumberblock.c	(revision 36985)
+++ renumber/renumberblock.c	(revision 36986)
@@ -18,7 +18,7 @@
 #include "board.h"
 #include <librnd/core/actions.h>
 #include "data.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/poly/rtree.h>
 #include "undo.h"
 #include <librnd/core/error.h>
Index: report/report.c
===================================================================
--- report/report.c	(revision 36985)
+++ report/report.c	(revision 36986)
@@ -64,7 +64,7 @@
 #include "obj_pstk.h"
 #include "obj_pstk_inlines.h"
 #include "obj_subc_parent.h"
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 #include "netlist.h"
 
 #include <genregex/regex_sei.h>
Index: serpentine/serpentine.c
===================================================================
--- serpentine/serpentine.c	(revision 36985)
+++ serpentine/serpentine.c	(revision 36986)
@@ -35,7 +35,7 @@
 #include "data_it.h"
 #include <librnd/core/error.h>
 #include "search.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <librnd/poly/rtree.h>
 #include "flag_str.h"
 #include "undo.h"
Index: shand_cmd/command.c
===================================================================
--- shand_cmd/command.c	(revision 36985)
+++ shand_cmd/command.c	(revision 36986)
@@ -45,7 +45,7 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/misc_util.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 static const char pcb_acts_Help[] = "h";
 static const char pcb_acth_Help[] = "Print a help message for commands.";
Index: shape/shape.c
===================================================================
--- shape/shape.c	(revision 36985)
+++ shape/shape.c	(revision 36986)
@@ -43,8 +43,8 @@
 #include "obj_poly.h"
 #include "obj_poly_draw.h"
 #include "rotate.h"
-#include <librnd/core/tool.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/tool.h>
+#include <librnd/hid/hid_menu.h>
 #include "menu_internal.c"
 
 const char *pcb_shape_corner_name[] = {"Rn", "Ch", "Sq", NULL};
Index: shape/shape_dialog.c
===================================================================
--- shape/shape_dialog.c	(revision 36985)
+++ shape/shape_dialog.c	(revision 36986)
@@ -1,4 +1,4 @@
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 typedef struct {
 	RND_DAD_DECL_NOINIT(dlg)
Index: show_netnames/show_netnames.c
===================================================================
--- show_netnames/show_netnames.c	(revision 36985)
+++ show_netnames/show_netnames.c	(revision 36986)
@@ -28,7 +28,7 @@
 
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <genht/htpp.h>
 #include <genht/hash.h>
 
Index: sketch_route/sketch_route.c
===================================================================
--- sketch_route/sketch_route.c	(revision 36985)
+++ sketch_route/sketch_route.c	(revision 36986)
@@ -45,7 +45,7 @@
 #include "obj_subc_parent.h"
 #include <librnd/core/rnd_printf.h>
 #include "search.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "layer_ui.h"
 #include "netlist.h"
 
Index: smartdisperse/smartdisperse.c
===================================================================
--- smartdisperse/smartdisperse.c	(revision 36985)
+++ smartdisperse/smartdisperse.c	(revision 36986)
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "board.h"
 #include "data.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/poly/rtree.h>
 #include "undo.h"
 #include "netlist.h"
Index: teardrops/teardrops.c
===================================================================
--- teardrops/teardrops.c	(revision 36985)
+++ teardrops/teardrops.c	(revision 36986)
@@ -21,7 +21,7 @@
 #include <librnd/core/math_helper.h>
 #include "board.h"
 #include "data.h"
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/poly/rtree.h>
 #include "undo.h"
 #include <librnd/core/plugins.h>
Index: tool_std/tool_arc.c
===================================================================
--- tool_std/tool_arc.c	(revision 36985)
+++ tool_std/tool_arc.c	(revision 36986)
@@ -43,7 +43,7 @@
 #include "draw.h"
 #include "draw_wireframe.h"
 #include "search.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "undo.h"
 
 #include "obj_arc_draw.h"
Index: tool_std/tool_arrow.c
===================================================================
--- tool_std/tool_arrow.c	(revision 36985)
+++ tool_std/tool_arrow.c	(revision 36986)
@@ -44,7 +44,7 @@
 #include "move.h"
 #include "search.h"
 #include "select.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "undo.h"
 #include "extobj.h"
 #include "tool_logic.h"
Index: tool_std/tool_buffer.c
===================================================================
--- tool_std/tool_buffer.c	(revision 36985)
+++ tool_std/tool_buffer.c	(revision 36986)
@@ -42,7 +42,7 @@
 #include <librnd/core/actions.h>
 #include <librnd/poly/rtree.h>
 #include "search.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "undo.h"
 
 void pcb_tool_buffer_init(void)
Index: tool_std/tool_copy.c
===================================================================
--- tool_std/tool_copy.c	(revision 36985)
+++ tool_std/tool_copy.c	(revision 36986)
@@ -39,7 +39,7 @@
 #include "crosshair.h"
 #include "search.h"
 #include "tool_logic.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 void pcb_tool_copy_uninit(void)
 {
Index: tool_std/tool_insert.c
===================================================================
--- tool_std/tool_insert.c	(revision 36985)
+++ tool_std/tool_insert.c	(revision 36986)
@@ -40,7 +40,7 @@
 #include "polygon.h"
 #include "search.h"
 #include "tool_logic.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 
 static struct {
Index: tool_std/tool_line.c
===================================================================
--- tool_std/tool_line.c	(revision 36985)
+++ tool_std/tool_line.c	(revision 36986)
@@ -46,7 +46,7 @@
 #include "obj_line.h"
 #include "obj_subc.h"
 #include "search.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "undo.h"
 #include "netlist.h"
 #include "tool_logic.h"
Index: tool_std/tool_lock.c
===================================================================
--- tool_std/tool_lock.c	(revision 36985)
+++ tool_std/tool_lock.c	(revision 36986)
@@ -41,7 +41,7 @@
 #include "undo.h"
 #include <librnd/core/actions.h>
 #include "search.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "tool_logic.h"
 #include "tool_lock.h"
 
Index: tool_std/tool_move.c
===================================================================
--- tool_std/tool_move.c	(revision 36985)
+++ tool_std/tool_move.c	(revision 36986)
@@ -39,7 +39,7 @@
 #include "crosshair.h"
 #include "search.h"
 #include "tool_logic.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "extobj.h"
 #include "obj_gfx.h"
 #include "undo.h"
Index: tool_std/tool_poly.c
===================================================================
--- tool_std/tool_poly.c	(revision 36985)
+++ tool_std/tool_poly.c	(revision 36986)
@@ -39,7 +39,7 @@
 #include "crosshair.h"
 #include <librnd/core/actions.h>
 #include "polygon.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 
 void pcb_tool_poly_uninit(void)
Index: tool_std/tool_polyhole.c
===================================================================
--- tool_std/tool_polyhole.c	(revision 36985)
+++ tool_std/tool_polyhole.c	(revision 36986)
@@ -40,7 +40,7 @@
 #include <librnd/core/actions.h>
 #include "polygon.h"
 #include "search.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 
 void pcb_tool_polyhole_uninit(void)
Index: tool_std/tool_rectangle.c
===================================================================
--- tool_std/tool_rectangle.c	(revision 36985)
+++ tool_std/tool_rectangle.c	(revision 36986)
@@ -40,7 +40,7 @@
 #include "data.h"
 #include "draw.h"
 #include "tool_logic.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "undo.h"
 
 #include "obj_poly_draw.h"
Index: tool_std/tool_remove.c
===================================================================
--- tool_std/tool_remove.c	(revision 36985)
+++ tool_std/tool_remove.c	(revision 36986)
@@ -41,7 +41,7 @@
 #include "remove.h"
 #include "search.h"
 #include "obj_rat.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "crosshair.h"
 #include "tool_logic.h"
 
Index: tool_std/tool_rotate.c
===================================================================
--- tool_std/tool_rotate.c	(revision 36985)
+++ tool_std/tool_rotate.c	(revision 36986)
@@ -38,7 +38,7 @@
 #include <librnd/core/actions.h>
 #include "board.h"
 #include "rotate.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "crosshair.h"
 #include "tool_logic.h"
 
Index: tool_std/tool_std.c
===================================================================
--- tool_std/tool_std.c	(revision 36985)
+++ tool_std/tool_std.c	(revision 36986)
@@ -28,7 +28,7 @@
 #include "conf_core.h"
 
 #include <librnd/core/plugins.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "crosshair.h"
 
 #include "tool_arc.h"
Index: tool_std/tool_text.c
===================================================================
--- tool_std/tool_text.c	(revision 36985)
+++ tool_std/tool_text.c	(revision 36986)
@@ -39,7 +39,7 @@
 #include "data.h"
 #include "draw.h"
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "undo.h"
 
 #include "obj_text_draw.h"
Index: tool_std/tool_thermal.c
===================================================================
--- tool_std/tool_thermal.c	(revision 36985)
+++ tool_std/tool_thermal.c	(revision 36986)
@@ -42,7 +42,7 @@
 #include "obj_pstk.h"
 #include "search.h"
 #include "thermal.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 void pcb_tool_thermal_on_obj(pcb_any_obj_t *obj, unsigned long lid)
 {
Index: tool_std/tool_via.c
===================================================================
--- tool_std/tool_via.c	(revision 36985)
+++ tool_std/tool_via.c	(revision 36986)
@@ -39,10 +39,10 @@
 
 #include "board.h"
 #include "change.h"
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include "data.h"
 #include "draw.h"
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include "tool_thermal.h"
 #include "undo.h"
 
Index: vendordrill/vendor.c
===================================================================
--- vendordrill/vendor.c	(revision 36985)
+++ vendordrill/vendor.c	(revision 36986)
@@ -49,7 +49,7 @@
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/hid_cfg.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include "vendor_conf.h"
 #include <librnd/core/compat_misc.h>
 #include "obj_pstk_inlines.h"