Index: cli.c
===================================================================
--- cli.c	(revision 36985)
+++ 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: constraint.c
===================================================================
--- constraint.c	(revision 36985)
+++ 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: constraint_gui.c
===================================================================
--- constraint_gui.c	(revision 36985)
+++ 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.c
===================================================================
--- ddraft.c	(revision 36985)
+++ 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>