Index: io_lihata.c
===================================================================
--- io_lihata.c	(revision 29256)
+++ io_lihata.c	(revision 29257)
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "plugins.h"
+#include <librnd/core/plugins.h>
 #include "plug_io.h"
 #include "read.h"
 #include "write.h"
Index: io_lihata.h
===================================================================
--- io_lihata.h	(revision 29256)
+++ io_lihata.h	(revision 29257)
@@ -24,7 +24,7 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
-#include "conf.h"
+#include <librnd/core/conf.h>
 #include "lht_conf.h"
 
 extern conf_io_lihata_t conf_io_lihata;
Index: lht_conf.h
===================================================================
--- lht_conf.h	(revision 29256)
+++ lht_conf.h	(revision 29257)
@@ -1,7 +1,7 @@
 #ifndef PCB_IO_LIHATA_CONF_H
 #define PCB_IO_LIHATA_CONF_H
 
-#include "conf.h"
+#include <librnd/core/conf.h>
 
 typedef struct {
 	const struct {
Index: read.c
===================================================================
--- read.c	(revision 29256)
+++ read.c	(revision 29257)
@@ -36,13 +36,13 @@
 #include "config.h"
 #include "board.h"
 #include "data.h"
-#include "plugins.h"
+#include <librnd/core/plugins.h>
 #include "plug_io.h"
 #include "flag_str.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "macro.h"
-#include "error.h"
-#include "misc_util.h"
+#include <librnd/core/error.h>
+#include <librnd/core/misc_util.h>
 #include "layer.h"
 #include <genvector/vtp0.h>
 #include "common.h"
@@ -52,7 +52,7 @@
 #include "pcb_minuid.h"
 #include "thermal.h"
 #include "io_lihata.h"
-#include "safe_fs.h"
+#include <librnd/core/safe_fs.h>
 #include "plug_footprint.h"
 #include "vtpadstack.h"
 #include "obj_pstk_inlines.h"
Index: write.c
===================================================================
--- write.c	(revision 29256)
+++ write.c	(revision 29257)
@@ -35,26 +35,26 @@
 #include "board.h"
 #include "conf_core.h"
 #include "data.h"
-#include "plugins.h"
+#include <librnd/core/plugins.h>
 #include "plug_io.h"
 #include "flag_str.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "rats_patch.h"
-#include "actions.h"
-#include "misc_util.h"
+#include <librnd/core/actions.h>
+#include <librnd/core/misc_util.h>
 #include "macro.h"
 #include "layer.h"
 #include "common.h"
 #include "write_style.h"
 #include "io_lihata.h"
-#include "paths.h"
+#include <librnd/core/paths.h>
 #include "obj_subc_list.h"
 #include "pcb_minuid.h"
-#include "safe_fs.h"
+#include <librnd/core/safe_fs.h>
 #include "thermal.h"
 #include "funchash_core.h"
 #include "netlist.h"
-#include "hid_dad.h"
+#include <librnd/core/hid_dad.h>
 
 #include "src_plugins/lib_compat_help/pstk_compat.h"