Index: shape.c
===================================================================
--- shape.c	(revision 36985)
+++ shape.c	(revision 36986)
@@ -43,8 +43,8 @@
 #include "obj_poly.h"
 #include "obj_poly_draw.h"
 #include "rotate.h"
-#include <librnd/core/tool.h>
-#include <librnd/core/hid_menu.h>
+#include <librnd/hid/tool.h>
+#include <librnd/hid/hid_menu.h>
 #include "menu_internal.c"
 
 const char *pcb_shape_corner_name[] = {"Rn", "Ch", "Sq", NULL};
Index: shape_dialog.c
===================================================================
--- shape_dialog.c	(revision 36985)
+++ shape_dialog.c	(revision 36986)
@@ -1,4 +1,4 @@
-#include <librnd/core/hid_dad.h>
+#include <librnd/hid/hid_dad.h>
 
 typedef struct {
 	RND_DAD_DECL_NOINIT(dlg)