Index: excitation.c
===================================================================
--- excitation.c	(revision 29256)
+++ excitation.c	(revision 29257)
@@ -26,8 +26,8 @@
 
 #include "config.h"
 
-#include "hid_dad.h"
-#include "event.h"
+#include <librnd/core/hid_dad.h>
+#include <librnd/core/event.h>
 
 #define MAX_EXC 16
 #define FREQ_MAX ((double)(100.0*1000.0*1000.0*1000.0))
Index: export_openems.c
===================================================================
--- export_openems.c	(revision 29256)
+++ export_openems.c	(revision 29257)
@@ -37,19 +37,19 @@
 #include "data.h"
 #include "data_it.h"
 #include "draw.h"
-#include "compat_misc.h"
-#include "plugins.h"
-#include "safe_fs.h"
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/plugins.h>
+#include <librnd/core/safe_fs.h>
 #include "layer_vis.h"
 #include "obj_subc_parent.h"
 #include "obj_pstk_inlines.h"
 
-#include "hid.h"
-#include "actions.h"
-#include "hid_nogui.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/actions.h>
+#include <librnd/core/hid_nogui.h>
 #include "hid_cam.h"
-#include "hid_attrib.h"
-#include "hid_init.h"
+#include <librnd/core/hid_attrib.h>
+#include <librnd/core/hid_init.h>
 #include "../src_plugins/lib_polyhelp/topoly.h"
 #include "mesh.h"
 
Index: mesh.c
===================================================================
--- mesh.c	(revision 29256)
+++ mesh.c	(revision 29257)
@@ -29,13 +29,13 @@
 #include "mesh.h"
 #include "layer.h"
 #include "layer_ui.h"
-#include "actions.h"
+#include <librnd/core/actions.h>
 #include "board.h"
 #include "data.h"
-#include "hid_dad.h"
-#include "event.h"
-#include "safe_fs.h"
-#include "pcb-printf.h"
+#include <librnd/core/hid_dad.h>
+#include <librnd/core/event.h>
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/pcb-printf.h>
 
 static pcb_mesh_t mesh;
 static const char *mesh_ui_cookie = "mesh ui layer cookie";
Index: mesh.h
===================================================================
--- mesh.h	(revision 29256)
+++ mesh.h	(revision 29257)
@@ -1,5 +1,5 @@
 #include "layer.h"
-#include "vtc0.h"
+#include <librnd/core/vtc0.h>
 #include "vtr0.h"
 #include <libfungw/fungw.h>