Index: hyp_l.c
===================================================================
--- hyp_l.c	(revision 29256)
+++ hyp_l.c	(revision 29257)
@@ -2205,7 +2205,7 @@
 #line 28 "hyp_l.l"
 #include <stdlib.h>
 
-char *pcb_strdup(const char *s); /* from #include "compat_misc.h" */
+char *pcb_strdup(const char *s); /* from #include <librnd/core/compat_misc.h> */
 
 #include "hyp_y.h"
 
Index: hyp_l.l
===================================================================
--- hyp_l.l	(revision 29256)
+++ hyp_l.l	(revision 29257)
@@ -27,7 +27,7 @@
 %{
 #include <stdlib.h>
 
-char *pcb_strdup(const char *s); /* from #include "compat_misc.h" */
+char *pcb_strdup(const char *s); /* from #include <librnd/core/compat_misc.h> */
 
 #include "hyp_y.h"
 
Index: io_hyp.c
===================================================================
--- io_hyp.c	(revision 29256)
+++ io_hyp.c	(revision 29257)
@@ -32,13 +32,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "hid.h"
-#include "hid_nogui.h"
-#include "actions.h"
-#include "hid_init.h"
-#include "hid_attrib.h"
-#include "plugins.h"
-#include "event.h"
+#include <librnd/core/hid.h>
+#include <librnd/core/hid_nogui.h>
+#include <librnd/core/actions.h>
+#include <librnd/core/hid_init.h>
+#include <librnd/core/hid_attrib.h>
+#include <librnd/core/plugins.h>
+#include <librnd/core/event.h>
 #include "plug_io.h"
 #include "parser.h"
 #include "board.h"
Index: parser.c
===================================================================
--- parser.c	(revision 29256)
+++ parser.c	(revision 29257)
@@ -24,8 +24,8 @@
 #include "parser.h"
 #include "hyp_l.h"
 #include "hyp_y.h"
-#include "error.h"
-#include "pcb-printf.h"
+#include <librnd/core/error.h>
+#include <librnd/core/pcb-printf.h>
 #include "flag_str.h"
 #include "polygon.h"
 #include "board.h"
@@ -33,10 +33,10 @@
 #include "data.h"
 #include "search.h"
 #include "rotate.h"
-#include "actions.h"
+#include <librnd/core/actions.h>
 #include "plug_io.h"
-#include "compat_misc.h"
-#include "safe_fs.h"
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/safe_fs.h>
 #include "../src_plugins/lib_compat_help/pstk_help.h"
 #include "../src_plugins/lib_compat_help/subc_help.h"
 #include <string.h>
Index: parser.h
===================================================================
--- parser.h	(revision 29256)
+++ parser.h	(revision 29257)
@@ -22,7 +22,7 @@
 #define PCB_IO_HYP_PARSER_H
 
 #include <stdio.h>
-#include "pcb_bool.h"
+#include <librnd/core/pcb_bool.h>
 #include "board.h"
 
 	/* 
Index: write.c
===================================================================
--- write.c	(revision 29256)
+++ write.c	(revision 29257)
@@ -30,7 +30,7 @@
 
 #include "board.h"
 #include "data.h"
-#include "compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "polygon.h"
 #include "obj_subc_parent.h"
 #include "obj_pstk_inlines.h"
Index: write.h
===================================================================
--- write.h	(revision 29256)
+++ write.h	(revision 29257)
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "pcb_bool.h"
+#include <librnd/core/pcb_bool.h>
 #include "plug_io.h"
 
 int io_hyp_write_pcb(pcb_plug_io_t * ctx, FILE * f, const char *old_filename, const char *new_filename, pcb_bool emergency);