Index: trunk/src/libcschem/undo.c
===================================================================
--- trunk/src/libcschem/undo.c	(revision 6038)
+++ trunk/src/libcschem/undo.c	(revision 6039)
@@ -28,9 +28,9 @@
 #include "config.h"
 
 #include <librnd/core/error.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <librnd/core/compat_misc.h>
 #include "event.h"
 
Index: trunk/src/plugins/act_draw/act_draw.c
===================================================================
--- trunk/src/plugins/act_draw/act_draw.c	(revision 6038)
+++ trunk/src/plugins/act_draw/act_draw.c	(revision 6039)
@@ -30,7 +30,7 @@
 #include <libcschem/config.h>
 
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/conf.h>
 #include <librnd/core/error.h>
Index: trunk/src/plugins/backann/backann.h
===================================================================
--- trunk/src/plugins/backann/backann.h	(revision 6038)
+++ trunk/src/plugins/backann/backann.h	(revision 6039)
@@ -1,4 +1,4 @@
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 #include <libcschem/concrete.h>
 
Index: trunk/src/plugins/backann/dlg_ba.c
===================================================================
--- trunk/src/plugins/backann/dlg_ba.c	(revision 6038)
+++ trunk/src/plugins/backann/dlg_ba.c	(revision 6039)
@@ -29,7 +29,7 @@
 
 #include <libcschem/config.h>
 
-#include <librnd/core/hid_dad_tree.h>
+#include <librnd/hid/hid_dad_tree.h>
 
 #include <libcschem/attrib.h>
 #include <libcschem/project.h>
Index: trunk/src/plugins/export_abst/hid_impl.c
===================================================================
--- trunk/src/plugins/export_abst/hid_impl.c	(revision 6038)
+++ trunk/src/plugins/export_abst/hid_impl.c	(revision 6039)
@@ -24,10 +24,10 @@
  *    mailing list: http://www.repo.hu/projects/sch-rnd/contact.html
  */
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_nogui.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_nogui.h>
+#include <librnd/hid/hid_init.h>
 #include <libcschem/project.h>
 #include <sch-rnd/export.h>
 
Index: trunk/src/plugins/export_lpr/lpr.c
===================================================================
--- trunk/src/plugins/export_lpr/lpr.c	(revision 6038)
+++ trunk/src/plugins/export_lpr/lpr.c	(revision 6039)
@@ -27,7 +27,7 @@
 #include <libcschem/config.h>
 
 #include <stdio.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/plugins/lib_exp_text/lpr_hid.h>
 
 #include "../export_ps/export_ps.h"
Index: trunk/src/plugins/export_png/export_png.c
===================================================================
--- trunk/src/plugins/export_png/export_png.c	(revision 6038)
+++ trunk/src/plugins/export_png/export_png.c	(revision 6039)
@@ -37,10 +37,10 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/safe_fs.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>
 #include <librnd/plugins/lib_exp_pixmap/draw_pixmap.h>
 
Index: trunk/src/plugins/export_ps/eps.c
===================================================================
--- trunk/src/plugins/export_ps/eps.c	(revision 6038)
+++ trunk/src/plugins/export_ps/eps.c	(revision 6039)
@@ -14,10 +14,10 @@
 #include <librnd/core/color.h>
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/safe_fs.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>
 #include <librnd/plugins/lib_exp_text/draw_eps.h>
 
Index: trunk/src/plugins/export_ps/export_ps.c
===================================================================
--- trunk/src/plugins/export_ps/export_ps.c	(revision 6038)
+++ trunk/src/plugins/export_ps/export_ps.c	(revision 6039)
@@ -31,7 +31,7 @@
 #include <stdio.h>
 
 #include <librnd/core/plugins.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include "export_ps.h"
 
Index: trunk/src/plugins/export_ps/ps.c
===================================================================
--- trunk/src/plugins/export_ps/ps.c	(revision 6038)
+++ trunk/src/plugins/export_ps/ps.c	(revision 6039)
@@ -15,10 +15,10 @@
 #include <librnd/core/rnd_printf.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/safe_fs.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/actions.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/plugins/lib_exp_text/draw_ps.h>
Index: trunk/src/plugins/export_svg/export_svg.c
===================================================================
--- trunk/src/plugins/export_svg/export_svg.c	(revision 6038)
+++ trunk/src/plugins/export_svg/export_svg.c	(revision 6039)
@@ -44,10 +44,10 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/safe_fs.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/plugins/lib_exp_text/draw_svg.h>
 
 #include <libcschem/concrete.h>
Index: trunk/src/plugins/export_tedax/hid_impl.c
===================================================================
--- trunk/src/plugins/export_tedax/hid_impl.c	(revision 6038)
+++ trunk/src/plugins/export_tedax/hid_impl.c	(revision 6039)
@@ -24,10 +24,10 @@
  *    mailing list: http://www.repo.hu/projects/sch-rnd/contact.html
  */
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_attrib.h>
-#include <librnd/core/hid_nogui.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_attrib.h>
+#include <librnd/hid/hid_nogui.h>
+#include <librnd/hid/hid_init.h>
 #include <libcschem/project.h>
 #include <sch-rnd/export.h>
 
Index: trunk/src/plugins/gui/act.c
===================================================================
--- trunk/src/plugins/gui/act.c	(revision 6038)
+++ trunk/src/plugins/gui/act.c	(revision 6039)
@@ -34,7 +34,7 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/conf.h>
 #include <librnd/core/hidlib_conf.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/hidlib.h>
 
 #include "act.h"
Index: trunk/src/plugins/gui/layersel.c
===================================================================
--- trunk/src/plugins/gui/layersel.c	(revision 6038)
+++ trunk/src/plugins/gui/layersel.c	(revision 6039)
@@ -32,9 +32,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/core/actions.h>
 #include <librnd/core/event.h>
Index: trunk/src/plugins/gui/sch_rnd_gui.c
===================================================================
--- trunk/src/plugins/gui/sch_rnd_gui.c	(revision 6038)
+++ trunk/src/plugins/gui/sch_rnd_gui.c	(revision 6039)
@@ -39,7 +39,7 @@
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/globalconst.h>
 #include <librnd/core/conf_hid.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <librnd/core/plugins.h>
 #include <librnd/plugins/lib_hid_common/toolbar.h>
 
Index: trunk/src/plugins/gui/sheetsel.c
===================================================================
--- trunk/src/plugins/gui/sheetsel.c	(revision 6038)
+++ trunk/src/plugins/gui/sheetsel.c	(revision 6039)
@@ -33,10 +33,10 @@
 #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/core/hid_dad_tree.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
 
 #include <librnd/core/actions.h>
 #include <librnd/core/event.h>
Index: trunk/src/plugins/gui/status.c
===================================================================
--- trunk/src/plugins/gui/status.c	(revision 6038)
+++ trunk/src/plugins/gui/status.c	(revision 6039)
@@ -30,9 +30,9 @@
 #include <libcschem/config.h>
 
 #include <librnd/core/actions.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 <librnd/core/event.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/core/hidlib_conf.h>
Index: trunk/src/plugins/propedit/propdlg.c
===================================================================
--- trunk/src/plugins/propedit/propdlg.c	(revision 6038)
+++ trunk/src/plugins/propedit/propdlg.c	(revision 6039)
@@ -36,8 +36,8 @@
 #include <genlist/gendlist.h>
 #include <genvector/gds_char.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/globalconst.h>
 #include <librnd/core/actions.h>
 #include <librnd/core/conf.h>
Index: trunk/src/plugins/propedit/props.c
===================================================================
--- trunk/src/plugins/propedit/props.c	(revision 6038)
+++ trunk/src/plugins/propedit/props.c	(revision 6039)
@@ -32,7 +32,7 @@
 /*#include "propsel.h"*/
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/rnd_printf.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <genht/hash.h>
 #define HT(x) htprop_ ## x
 #include <genht/ht.c>
Index: trunk/src/plugins/query/dlg_search.c
===================================================================
--- trunk/src/plugins/query/dlg_search.c	(revision 6038)
+++ trunk/src/plugins/query/dlg_search.c	(revision 6039)
@@ -34,7 +34,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: trunk/src/plugins/query/dlg_search_edit.c
===================================================================
--- trunk/src/plugins/query/dlg_search_edit.c	(revision 6038)
+++ trunk/src/plugins/query/dlg_search_edit.c	(revision 6039)
@@ -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: trunk/src/plugins/query/query.c
===================================================================
--- trunk/src/plugins/query/query.c	(revision 6038)
+++ trunk/src/plugins/query/query.c	(revision 6039)
@@ -34,7 +34,7 @@
 #include <librnd/core/conf.h>
 #include <librnd/core/error.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: trunk/src/plugins/query/query_act.c
===================================================================
--- trunk/src/plugins/query/query_act.c	(revision 6038)
+++ trunk/src/plugins/query/query_act.c	(revision 6039)
@@ -43,7 +43,7 @@
 #include <libcschem/cnc_any_obj.h>
 #include "dlg_search.h"
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 static const char csch_acts_query[] =
 	"query(dump, expr) - dry run: compile and dump an expression\n"
Index: trunk/src/plugins/renumber/renumber_dlg.c
===================================================================
--- trunk/src/plugins/renumber/renumber_dlg.c	(revision 6038)
+++ trunk/src/plugins/renumber/renumber_dlg.c	(revision 6039)
@@ -29,7 +29,7 @@
 #include <genvector/gds_char.h>
 #include <librnd/core/actions.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 <sch-rnd/build_run.h>
Index: trunk/src/plugins/sch_dialogs/abst_attr.c
===================================================================
--- trunk/src/plugins/sch_dialogs/abst_attr.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/abst_attr.c	(revision 6039)
@@ -36,8 +36,8 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/core/hidlib_conf.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 <libcschem/actions_csch.h>
 
Index: trunk/src/plugins/sch_dialogs/dlg_about.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_about.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_about.c	(revision 6039)
@@ -30,7 +30,7 @@
 #include <genvector/gds_char.h>
 #include <librnd/core/actions.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 <sch-rnd/build_run.h>
Index: trunk/src/plugins/sch_dialogs/dlg_abstract.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_abstract.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_abstract.c	(revision 6039)
@@ -38,8 +38,8 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/core/hidlib_conf.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/rnd_printf.h>
 
 #include <libcschem/abstract.h>
Index: trunk/src/plugins/sch_dialogs/dlg_attrib.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_attrib.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_attrib.c	(revision 6039)
@@ -36,8 +36,8 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/core/hidlib_conf.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/compat_misc.h>
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/globalconst.h>
Index: trunk/src/plugins/sch_dialogs/dlg_infobar.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_infobar.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_infobar.c	(revision 6039)
@@ -30,7 +30,7 @@
    action). */
 
 #include <librnd/core/actions.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>
 
Index: trunk/src/plugins/sch_dialogs/dlg_library.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_library.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_library.c	(revision 6039)
@@ -38,9 +38,9 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/core/hidlib_conf.h>
-#include <librnd/core/hid_dad.h>
-#include <librnd/core/hid_dad_tree.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/hid_dad.h>
+#include <librnd/hid/hid_dad_tree.h>
+#include <librnd/hid/tool.h>
 
 #include <libcschem/concrete.h>
 #include <libcschem/cnc_any_obj.h>
Index: trunk/src/plugins/sch_dialogs/dlg_pen.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_pen.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_pen.c	(revision 6039)
@@ -39,8 +39,8 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/core/hidlib_conf.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/compat_misc.h>
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/globalconst.h>
Index: trunk/src/plugins/sch_dialogs/dlg_pref_lib.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_pref_lib.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_pref_lib.c	(revision 6039)
@@ -35,7 +35,7 @@
 #include <librnd/core/conf.h>
 #include <sch-rnd/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: trunk/src/plugins/sch_dialogs/dlg_text.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_text.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_text.c	(revision 6039)
@@ -36,7 +36,7 @@
 
 #include <librnd/core/actions.h>
 #include <librnd/core/hidlib.h>
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 #include <libcschem/concrete.h>
 #include <libcschem/cnc_text.h>
Index: trunk/src/plugins/sch_dialogs/dlg_tree.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_tree.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_tree.c	(revision 6039)
@@ -38,8 +38,8 @@
 #include <librnd/core/actions.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/core/hidlib_conf.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 <libcschem/concrete.h>
 #include <libcschem/project.h>
Index: trunk/src/plugins/sch_dialogs/dlg_undo.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_undo.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_undo.c	(revision 6039)
@@ -29,8 +29,8 @@
 
 #include <libuundo/uundo.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/actions.h>
 #include <libcschem/event.h>
 #include <libcschem/concrete.h>
Index: trunk/src/plugins/sch_dialogs/dlg_view.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_view.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/dlg_view.c	(revision 6039)
@@ -36,8 +36,8 @@
 #include <libcschem/project.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 <sch-rnd/project.h>
 
Index: trunk/src/plugins/sch_dialogs/quick_attr.c
===================================================================
--- trunk/src/plugins/sch_dialogs/quick_attr.c	(revision 6038)
+++ trunk/src/plugins/sch_dialogs/quick_attr.c	(revision 6039)
@@ -32,8 +32,8 @@
 
 #include <genvector/gds_char.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 <libcschem/actions_csch.h>
 
 #include "dlg_attrib.h"
Index: trunk/src/plugins/std_cschem/quick_attr_connect.c
===================================================================
--- trunk/src/plugins/std_cschem/quick_attr_connect.c	(revision 6038)
+++ trunk/src/plugins/std_cschem/quick_attr_connect.c	(revision 6039)
@@ -30,8 +30,8 @@
 
 #include <ctype.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>
 
 typedef struct {
 	RND_DAD_DECL_NOINIT(dlg)
Index: trunk/src/plugins/std_devmap/quick_attr_portmap.c
===================================================================
--- trunk/src/plugins/std_devmap/quick_attr_portmap.c	(revision 6038)
+++ trunk/src/plugins/std_devmap/quick_attr_portmap.c	(revision 6039)
@@ -28,8 +28,8 @@
 
 /* quick-edit attribute: symbol portmap list, in sym->fp format */
 
-#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 <ctype.h>
 
Index: trunk/src/plugins/std_tools/line_common.c
===================================================================
--- trunk/src/plugins/std_tools/line_common.c	(revision 6038)
+++ trunk/src/plugins/std_tools/line_common.c	(revision 6039)
@@ -34,8 +34,8 @@
 #include "sch-rnd/conf_core.h"
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/misc_util.h>
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_inlines.h>
 
 typedef enum {
 	CSCH_TOOL_LINEDIR_ALL = 0,
Index: trunk/src/plugins/std_tools/std_tools.c
===================================================================
--- trunk/src/plugins/std_tools/std_tools.c	(revision 6038)
+++ trunk/src/plugins/std_tools/std_tools.c	(revision 6039)
@@ -31,7 +31,7 @@
 
 #include <librnd/core/global_typedefs.h>
 #include <librnd/core/hidlib.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <librnd/core/plugins.h>
 
 #include <libcschem/search.h>
Index: trunk/src/plugins/std_tools/tool_buffer.c
===================================================================
--- trunk/src/plugins/std_tools/tool_buffer.c	(revision 6038)
+++ trunk/src/plugins/std_tools/tool_buffer.c	(revision 6039)
@@ -28,7 +28,7 @@
 #include <libcschem/config.h>
 
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 #include <libcschem/concrete.h>
 
Index: trunk/src/plugins/std_tools/tool_lock.c
===================================================================
--- trunk/src/plugins/std_tools/tool_lock.c	(revision 6038)
+++ trunk/src/plugins/std_tools/tool_lock.c	(revision 6039)
@@ -30,7 +30,7 @@
 #include <libcschem/cnc_obj.h>
 
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <sch-rnd/crosshair.h>
 #include <sch-rnd/operation.h>
 #include <sch-rnd/conf_core.h>
Index: trunk/src/plugins/std_tools/tool_mirror.c
===================================================================
--- trunk/src/plugins/std_tools/tool_mirror.c	(revision 6038)
+++ trunk/src/plugins/std_tools/tool_mirror.c	(revision 6039)
@@ -29,7 +29,7 @@
 #include <libcschem/config.h>
 
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <sch-rnd/crosshair.h>
 #include <sch-rnd/operation.h>
 #include <sch-rnd/conf_core.h>
Index: trunk/src/plugins/std_tools/tool_rotate.c
===================================================================
--- trunk/src/plugins/std_tools/tool_rotate.c	(revision 6038)
+++ trunk/src/plugins/std_tools/tool_rotate.c	(revision 6039)
@@ -28,7 +28,7 @@
 #include <libcschem/config.h>
 
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <sch-rnd/crosshair.h>
 #include <sch-rnd/operation.h>
 #include <sch-rnd/conf_core.h>
Index: trunk/src/plugins/std_tools/tool_text.c
===================================================================
--- trunk/src/plugins/std_tools/tool_text.c	(revision 6038)
+++ trunk/src/plugins/std_tools/tool_text.c	(revision 6039)
@@ -28,7 +28,7 @@
 #include <libcschem/config.h>
 
 #include <librnd/core/actions.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 #include <sch-rnd/crosshair.h>
 #include <sch-rnd/operation.h>
 #include <sch-rnd/conf_core.h>
Index: trunk/src/plugins/symlib_local/symlib_local.c
===================================================================
--- trunk/src/plugins/symlib_local/symlib_local.c	(revision 6038)
+++ trunk/src/plugins/symlib_local/symlib_local.c	(revision 6039)
@@ -49,7 +49,7 @@
 #include <librnd/core/error.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include <sch-rnd/conf_core.h>
 
Index: trunk/src/sch-rnd/Makefile.in
===================================================================
--- trunk/src/sch-rnd/Makefile.in	(revision 6038)
+++ trunk/src/sch-rnd/Makefile.in	(revision 6039)
@@ -99,7 +99,7 @@
 CQUOTE=$(LIBRND_LIBDIR)/scconfig/cquote
 
 
-RNDLIB_LDLIBS = -lrnd-font -lrnd-poly -lrnd-hid -lrnd-3rd
+RNDLIB_LDLIBS = -lrnd-hid -lrnd-font -lrnd-poly -lrnd-core -lrnd-3rd
 ROOT=@/local/csch/root@
 CC=@cc/cc@
 CFLAGS=@/local/csch/CFLAGS@ @/local/csch/c89flags@ @?/local/pcb/CFLAGS@ $(CFLAGS_LIBRND) @?/local/csch/librnd_extra_inc@
Index: trunk/src/sch-rnd/build_run.c
===================================================================
--- trunk/src/sch-rnd/build_run.c	(revision 6038)
+++ trunk/src/sch-rnd/build_run.c	(revision 6039)
@@ -36,7 +36,7 @@
 #include <genvector/gds_char.h>
 #include "conf_core.h"
 #include "build_run.h"
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include <librnd/core/compat_misc.h>
 
 #include "emergency.h"
Index: trunk/src/sch-rnd/crosshair.c
===================================================================
--- trunk/src/sch-rnd/crosshair.c	(revision 6038)
+++ trunk/src/sch-rnd/crosshair.c	(revision 6039)
@@ -30,10 +30,10 @@
 
 #include <librnd/core/event.h>
 #include <librnd/core/hidlib_conf.h>
-#include <librnd/core/hid_inlines.h>
-#include <librnd/core/grid.h>
-#include <librnd/core/hid.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/hid_inlines.h>
+#include <librnd/hid/grid.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/tool.h>
 #include <librnd/core/actions.h>
 
 #include "conf_core.h"
Index: trunk/src/sch-rnd/draw.c
===================================================================
--- trunk/src/sch-rnd/draw.c	(revision 6038)
+++ trunk/src/sch-rnd/draw.c	(revision 6039)
@@ -26,8 +26,8 @@
 
 #include <libcschem/config.h>
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_inlines.h>
 #include <librnd/core/color.h>
 #include <librnd/core/vtc0.h>
 #include <librnd/core/compat_misc.h>
Index: trunk/src/sch-rnd/draw_xor.c
===================================================================
--- trunk/src/sch-rnd/draw_xor.c	(revision 6038)
+++ trunk/src/sch-rnd/draw_xor.c	(revision 6039)
@@ -26,8 +26,8 @@
  *    mailing list: http://www.repo.hu/projects/sch-rnd/contact.html
  */
 
-#include <librnd/core/hid.h>
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/hid_inlines.h>
 #include <librnd/core/color.h>
 #include <librnd/core/vtc0.h>
 
Index: trunk/src/sch-rnd/emergency.c
===================================================================
--- trunk/src/sch-rnd/emergency.c	(revision 6038)
+++ trunk/src/sch-rnd/emergency.c	(revision 6039)
@@ -35,7 +35,7 @@
 #include <librnd/core/error.h>
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/globalconst.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/paths.h>
 
 #include <libcschem/concrete.h>
Index: trunk/src/sch-rnd/file_act.c
===================================================================
--- trunk/src/sch-rnd/file_act.c	(revision 6038)
+++ trunk/src/sch-rnd/file_act.c	(revision 6039)
@@ -34,7 +34,7 @@
 #include <libcschem/event.h>
 #include <libcschem/plug_io.h>
 #include <librnd/core/actions.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
 
 #include "sheet.h"
Index: trunk/src/sch-rnd/font.c
===================================================================
--- trunk/src/sch-rnd/font.c	(revision 6038)
+++ trunk/src/sch-rnd/font.c	(revision 6039)
@@ -40,9 +40,9 @@
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/hidlib_conf.h>
 #include <librnd/core/conf.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/pixmap.h>
+#include <librnd/hid/pixmap.h>
 #include <librnd/core/paths.h>
 #include <librnd/src_3rd/genregex/regex_sei.h>
 
Index: trunk/src/sch-rnd/font_rnd.c
===================================================================
--- trunk/src/sch-rnd/font_rnd.c	(revision 6038)
+++ trunk/src/sch-rnd/font_rnd.c	(revision 6039)
@@ -32,7 +32,7 @@
 #include <genht/htsp.h>
 #include <genht/hash.h>
 #include <librnd/font/font.h>
-#include <librnd/core/hid_inlines.h>
+#include <librnd/hid/hid_inlines.h>
 #include <librnd/core/rotate.h>
 #include <librnd/core/safe_fs_dir.h>
 
Index: trunk/src/sch-rnd/main_act.c
===================================================================
--- trunk/src/sch-rnd/main_act.c	(revision 6038)
+++ trunk/src/sch-rnd/main_act.c	(revision 6039)
@@ -47,7 +47,7 @@
 #include "conf_core.h"
 #include "build_run.h"
 #include <librnd/core/safe_fs.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include <libcschem/undo.h>
 
 /* print usage lines */
Index: trunk/src/sch-rnd/multi.c
===================================================================
--- trunk/src/sch-rnd/multi.c	(revision 6038)
+++ trunk/src/sch-rnd/multi.c	(revision 6039)
@@ -33,10 +33,10 @@
 #include <librnd/core/conf.h>
 #include <librnd/core/conf_multi_temp.h>
 #include <librnd/core/compat_fs.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/event.h>
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/tool.h>
+#include <librnd/hid/tool.h>
 
 #include <libcschem/concrete.h>
 #include <libcschem/project.h>
Index: trunk/src/sch-rnd/operation.c
===================================================================
--- trunk/src/sch-rnd/operation.c	(revision 6038)
+++ trunk/src/sch-rnd/operation.c	(revision 6039)
@@ -26,7 +26,7 @@
  *    mailing list: http://www.repo.hu/projects/sch-rnd/contact.html
  */
 
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <libcschem/config.h>
 #include <libcschem/operation.h>
 #include <libcschem/cnc_text.h>
Index: trunk/src/sch-rnd/project.c
===================================================================
--- trunk/src/sch-rnd/project.c	(revision 6038)
+++ trunk/src/sch-rnd/project.c	(revision 6039)
@@ -33,7 +33,7 @@
 #include <librnd/core/list_conf.h>
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/compat_misc.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <liblihata/dom.h>
 #include <liblihata/tree.h>
 
Index: trunk/src/sch-rnd/sch-rnd.c
===================================================================
--- trunk/src/sch-rnd/sch-rnd.c	(revision 6038)
+++ trunk/src/sch-rnd/sch-rnd.c	(revision 6039)
@@ -36,8 +36,8 @@
 
 /* hidlib headers */
 #include <librnd/core/unit.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/conf.h>
 #include <librnd/core/hidlib.h>
 #include <librnd/core/buildin.hidlib.h>
Index: trunk/src/sch-rnd/search.c
===================================================================
--- trunk/src/sch-rnd/search.c	(revision 6038)
+++ trunk/src/sch-rnd/search.c	(revision 6039)
@@ -26,7 +26,7 @@
 
 #include <libcschem/config.h>
 
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 
 #include <libcschem/concrete.h>
 #include <libcschem/operation.h>
Index: trunk/src/sch-rnd/search.h
===================================================================
--- trunk/src/sch-rnd/search.h	(revision 6038)
+++ trunk/src/sch-rnd/search.h	(revision 6039)
@@ -2,8 +2,8 @@
 #define SCH_RND_SEARCH_H
 
 #include <libcschem/config.h>
-#include <librnd/core/hid.h>
-#include <librnd/core/grid.h>
+#include <librnd/hid/hid.h>
+#include <librnd/hid/grid.h>
 #include <libcschem/concrete.h>
 
 
Index: trunk/src/sch-rnd/select.c
===================================================================
--- trunk/src/sch-rnd/select.c	(revision 6038)
+++ trunk/src/sch-rnd/select.c	(revision 6039)
@@ -24,7 +24,7 @@
  *    mailing list: http://www.repo.hu/projects/sch-rnd/contact.html
  */
 
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <libcschem/config.h>
 #include <libcschem/concrete.h>
 #include <libcschem/operation.h>
Index: trunk/src/sch-rnd/sheet.c
===================================================================
--- trunk/src/sch-rnd/sheet.c	(revision 6038)
+++ trunk/src/sch-rnd/sheet.c	(revision 6039)
@@ -40,7 +40,7 @@
 #include <libcschem/plug_io.h>
 
 #include <librnd/core/conf.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/hid_menu.h>
 #include <librnd/core/hidlib_conf.h>
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/safe_fs.h>