Index: aperture.c
===================================================================
--- aperture.c	(revision 29256)
+++ aperture.c	(revision 29257)
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "global_typedefs.h"
+#include <librnd/core/global_typedefs.h>
 
 #define GVT_DONT_UNDEF
 #include "aperture.h"
Index: excellon.c
===================================================================
--- excellon.c	(revision 29256)
+++ excellon.c	(revision 29257)
@@ -1,23 +1,23 @@
 #include "config.h"
 
 #include "board.h"
-#include "global_typedefs.h"
-#include "pcb-printf.h"
-#include "safe_fs.h"
-#include "error.h"
+#include <librnd/core/global_typedefs.h>
+#include <librnd/core/pcb-printf.h>
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/error.h>
 #include "draw.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "layer.h"
 #include "layer_vis.h"
-#include "hid.h"
-#include "hid_attrib.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_attrib.h>
 #include "hid_cam.h"
-#include "hid_init.h"
-#include "hid_nogui.h"
-#include "plugins.h"
+#include <librnd/core/hid_init.h>
+#include <librnd/core/hid_nogui.h>
+#include <librnd/core/plugins.h>
 #include "funchash_core.h"
 #include "conf_core.h"
-#include "event.h"
+#include <librnd/core/event.h>
 #include "excellon_conf.h"
 
 #include "excellon.h"
Index: excellon_conf.h
===================================================================
--- excellon_conf.h	(revision 29256)
+++ excellon_conf.h	(revision 29257)
@@ -1,7 +1,7 @@
 #ifndef PCB_EXCELLON_CONF_H
 #define PCB_EXCELLON_CONF_H
 
-#include "conf.h"
+#include <librnd/core/conf.h>
 
 typedef struct {
 	const struct {