Index: centgeo.c
===================================================================
--- centgeo.c	(revision 29256)
+++ centgeo.c	(revision 29257)
@@ -34,7 +34,7 @@
 #include "obj_line.h"
 #include "obj_arc.h"
 #include "math_helper.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "search.h"
 
 /* Note about all intersection code: same basic algo as in find_geo.c -
Index: cli.c
===================================================================
--- cli.c	(revision 29256)
+++ cli.c	(revision 29257)
@@ -27,9 +27,9 @@
  */
 
 #include "hid_inlines.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "conf_core.h"
-#include "hidlib_conf.h"
+#include <librnd/core/hidlib_conf.h>
 
 #define CLI_MAX_INS_LEN 128
 
Index: constraint_gui.c
===================================================================
--- constraint_gui.c	(revision 29256)
+++ constraint_gui.c	(revision 29257)
@@ -26,7 +26,7 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-#include "hid_dad.h"
+#include <librnd/core/hid_dad.h>
 
 typedef struct{
 	PCB_DAD_DECL_NOINIT(dlg)
Index: ddraft.c
===================================================================
--- ddraft.c	(revision 29256)
+++ ddraft.c	(revision 29257)
@@ -33,15 +33,15 @@
 #include <genvector/gds_char.h>
 #include <genvector/vtp0.h>
 
-#include "hid_attrib.h"
-#include "hid_init.h"
-#include "plugins.h"
-#include "event.h"
-#include "actions.h"
+#include <librnd/core/hid_attrib.h>
+#include <librnd/core/hid_init.h>
+#include <librnd/core/plugins.h>
+#include <librnd/core/event.h>
+#include <librnd/core/actions.h>
 #include "funchash_core.h"
 #include "search.h"
 #include "centgeo.h"
-#include "misc_util.h"
+#include <librnd/core/misc_util.h>
 #include "board.h"
 #include "data_it.h"
 #include "obj_line.h"
@@ -49,8 +49,8 @@
 #include "fields_sphash.h"
 #include "draw_wireframe.h"
 #include "conf_core.h"
-#include "conf_hid.h"
-#include "vtc0.h"
+#include <librnd/core/conf_hid.h>
+#include <librnd/core/vtc0.h>
 
 static const char *ddraft_cookie = "ddraft plugin";
 static int pcb_ddraft_tool;