Index: trunk/src_plugins/io_bxl/bxl_gram.h
===================================================================
--- trunk/src_plugins/io_bxl/bxl_gram.h	(revision 33583)
+++ trunk/src_plugins/io_bxl/bxl_gram.h	(revision 33584)
@@ -43,8 +43,8 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 #include <stdio.h>
-#include "bxl_gram.h"
-#include "bxl.h"
+#include "../src_plugins/io_bxl/bxl_gram.h"
+#include "../src_plugins/io_bxl/bxl.h"
 
 TODO("Can remove this once the coord unit is converted with getvalue")
 #include <librnd/core/unit.h>
@@ -53,7 +53,7 @@
 #define YCRD(c) pcb_bxl_coord_y(c)
 
 #line 8 "bxl_gram.y"
-typedef union
+typedef union pcb_bxl_tokunion_u
 {
 	double d;
 	int i;
@@ -61,7 +61,7 @@
 	rnd_coord_t c;
 } pcb_bxl_tokunion_t;
 #line 3 "bxl_gram.y"
-typedef struct
+typedef struct pcb_bxl_tokstruct_s
 {
 	pcb_bxl_tokunion_t un;
 	long line, first_col, last_col;
Index: trunk/src_plugins/io_bxl/bxl_gram.y
===================================================================
--- trunk/src_plugins/io_bxl/bxl_gram.y	(revision 33583)
+++ trunk/src_plugins/io_bxl/bxl_gram.y	(revision 33584)
@@ -44,8 +44,8 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 #include <stdio.h>
-#include "bxl_gram.h"
-#include "bxl.h"
+#include "../src_plugins/io_bxl/bxl_gram.h"
+#include "../src_plugins/io_bxl/bxl.h"
 
 TODO("Can remove this once the coord unit is converted with getvalue")
 #include <librnd/core/unit.h>
Index: trunk/src_plugins/io_bxl/bxl_lex.c
===================================================================
--- trunk/src_plugins/io_bxl/bxl_lex.c	(revision 33583)
+++ trunk/src_plugins/io_bxl/bxl_lex.c	(revision 33584)
@@ -485,7 +485,7 @@
 	 */
 	#include <stdlib.h>
 	#include <librnd/core/compat_misc.h>
-	#include "bxl_gram.h"
+	#include "../src_plugins/io_bxl/bxl_gram.h"
 	#define lval  ((pcb_bxl_STYPE *)(user_ctx))
 /* TOP CODE END } */
 
Index: trunk/src_plugins/io_bxl/bxl_lex.ul
===================================================================
--- trunk/src_plugins/io_bxl/bxl_lex.ul	(revision 33583)
+++ trunk/src_plugins/io_bxl/bxl_lex.ul	(revision 33584)
@@ -32,7 +32,7 @@
 	 */
 	#include <stdlib.h>
 	#include <librnd/core/compat_misc.h>
-	#include "bxl_gram.h"
+	#include "../src_plugins/io_bxl/bxl_gram.h"
 	#define lval  ((pcb_bxl_STYPE *)(user_ctx))
 
 rule integer