Index: mentor_sch.c
===================================================================
--- mentor_sch.c	(revision 29256)
+++ mentor_sch.c	(revision 29257)
@@ -34,17 +34,17 @@
 
 #include "board.h"
 #include "data.h"
-#include "error.h"
-#include "pcb-printf.h"
-#include "compat_misc.h"
+#include <librnd/core/error.h>
+#include <librnd/core/pcb-printf.h>
+#include <librnd/core/compat_misc.h>
 #include <gensexpr/gsxl.h>
 
-#include "actions.h"
-#include "plugins.h"
-#include "hid.h"
+#include <librnd/core/actions.h>
+#include <librnd/core/plugins.h>
+#include <librnd/core/hid.h>
 #include "mentor_sch_conf.h"
-#include "paths.h"
-#include "safe_fs.h"
+#include <librnd/core/paths.h>
+#include <librnd/core/safe_fs.h>
 
 #include "netlist_helper.h"
 
Index: mentor_sch_conf.h
===================================================================
--- mentor_sch_conf.h	(revision 29256)
+++ mentor_sch_conf.h	(revision 29257)
@@ -1,7 +1,7 @@
 #ifndef PCB_MENTOR_SCH_CONF_H
 #define PCB_MENTOR_SCH_CONF_H
 
-#include "conf.h"
+#include <librnd/core/conf.h>
 
 typedef struct {
 	const struct {
Index: netlist_helper.c
===================================================================
--- netlist_helper.c	(revision 29256)
+++ netlist_helper.c	(revision 29257)
@@ -34,11 +34,11 @@
 #include <genht/hash.h>
 
 #include "netlist_helper.h"
-#include "compat_misc.h"
-#include "pcb-printf.h"
-#include "error.h"
-#include "actions.h"
-#include "safe_fs.h"
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/pcb-printf.h>
+#include <librnd/core/error.h>
+#include <librnd/core/actions.h>
+#include <librnd/core/safe_fs.h>
 
 
 nethlp_ctx_t *nethlp_new(nethlp_ctx_t *prealloc)
Index: netlist_helper.h
===================================================================
--- netlist_helper.h	(revision 29256)
+++ netlist_helper.h	(revision 29257)
@@ -1,6 +1,6 @@
 #include <genht/htsp.h>
 #include <genregex/regex_se.h>
-#include "global_typedefs.h"
+#include <librnd/core/global_typedefs.h>
 
 typedef struct nethlp_rule_s nethlp_rule_t;