Index: gerber.c
===================================================================
--- gerber.c	(revision 29256)
+++ gerber.c	(revision 29257)
@@ -14,28 +14,28 @@
 #include "build_run.h"
 #include "config.h"
 #include "data.h"
-#include "error.h"
+#include <librnd/core/error.h>
 #include "draw.h"
 #include "layer.h"
 #include "layer_vis.h"
-#include "pcb-printf.h"
-#include "plugins.h"
+#include <librnd/core/pcb-printf.h>
+#include <librnd/core/plugins.h>
 #include "hid_cam.h"
-#include "compat_misc.h"
-#include "safe_fs.h"
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/safe_fs.h>
 #include "macro.h"
 #include "funchash_core.h"
 #include "gerber_conf.h"
-#include "event.h"
+#include <librnd/core/event.h>
 
-#include "hid.h"
-#include "hid_nogui.h"
-#include "hid_init.h"
-#include "hid_attrib.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_nogui.h>
+#include <librnd/core/hid_init.h>
+#include <librnd/core/hid_attrib.h>
 #include "hid_inlines.h"
-#include "hid_dad.h"
+#include <librnd/core/hid_dad.h>
 #include "conf_core.h"
-#include "hidlib_conf.h"
+#include <librnd/core/hidlib_conf.h>
 
 #include "../src_plugins/export_excellon/aperture.h"
 #include "../src_plugins/export_excellon/excellon.h"
Index: gerber_conf.h
===================================================================
--- gerber_conf.h	(revision 29256)
+++ gerber_conf.h	(revision 29257)
@@ -1,7 +1,7 @@
 #ifndef PCB_GERBER_CONF_H
 #define PCB_GERBER_CONF_H
 
-#include "conf.h"
+#include <librnd/core/conf.h>
 
 typedef struct {
 	const struct {