Index: io_tedax.c
===================================================================
--- io_tedax.c	(revision 36985)
+++ 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: tetest.c
===================================================================
--- tetest.c	(revision 36985)
+++ 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: trouter.c
===================================================================
--- trouter.c	(revision 36985)
+++ 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"