Index: shape.c
===================================================================
--- shape.c	(revision 29256)
+++ shape.c	(revision 29257)
@@ -28,16 +28,16 @@
 
 #include "shape.h"
 
-#include "plugins.h"
-#include "actions.h"
+#include <librnd/core/plugins.h>
+#include <librnd/core/actions.h>
 
 #include "board.h"
 #include "buffer.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "conf_core.h"
 #include "data.h"
-#include "error.h"
-#include "event.h"
+#include <librnd/core/error.h>
+#include <librnd/core/event.h>
 #include "layer.h"
 #include "math_helper.h"
 #include "obj_poly.h"
Index: shape.h
===================================================================
--- shape.h	(revision 29256)
+++ shape.h	(revision 29257)
@@ -29,7 +29,7 @@
 #include "board.h"
 #include "data.h"
 #include "layer.h"
-#include "pcb_bool.h"
+#include <librnd/core/pcb_bool.h>
 
 /* special layer: when used, the shape is always placed on the current layer */
 extern pcb_layer_t *pcb_shape_current_layer;
Index: shape_dialog.c
===================================================================
--- shape_dialog.c	(revision 29256)
+++ shape_dialog.c	(revision 29257)
@@ -1,4 +1,4 @@
-#include "hid_dad.h"
+#include <librnd/core/hid_dad.h>
 
 typedef struct {
 	PCB_DAD_DECL_NOINIT(dlg)