Index: dialogs.c
===================================================================
--- dialogs.c	(revision 36985)
+++ 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: dlg_about.c
===================================================================
--- dlg_about.c	(revision 36985)
+++ 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: dlg_flag_edit.c
===================================================================
--- dlg_flag_edit.c	(revision 36985)
+++ 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: dlg_fontsel.c
===================================================================
--- dlg_fontsel.c	(revision 36985)
+++ 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: dlg_infobar.c
===================================================================
--- dlg_infobar.c	(revision 36985)
+++ 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: dlg_layer_binding.c
===================================================================
--- dlg_layer_binding.c	(revision 36985)
+++ 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: dlg_layer_flags.c
===================================================================
--- dlg_layer_flags.c	(revision 36985)
+++ 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: dlg_lib_pstk.c
===================================================================
--- dlg_lib_pstk.c	(revision 36985)
+++ 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: dlg_library.c
===================================================================
--- dlg_library.c	(revision 36985)
+++ 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: dlg_loadsave.c
===================================================================
--- dlg_loadsave.c	(revision 36985)
+++ 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: dlg_padstack.c
===================================================================
--- dlg_padstack.c	(revision 36985)
+++ 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: dlg_pref_lib.c
===================================================================
--- dlg_pref_lib.c	(revision 36985)
+++ 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: dlg_printcalib.c
===================================================================
--- dlg_printcalib.c	(revision 36985)
+++ 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: dlg_test.c
===================================================================
--- dlg_test.c	(revision 36985)
+++ 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: dlg_view.c
===================================================================
--- dlg_view.c	(revision 36985)
+++ 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>