Index: propdlg.c
===================================================================
--- propdlg.c	(revision 36985)
+++ 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: props.c
===================================================================
--- props.c	(revision 36985)
+++ 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