diff --git a/fw/Makefile b/fw/Makefile
index 90e12d6..ced3b26 100644
--- a/fw/Makefile
+++ b/fw/Makefile
@@ -17,7 +17,8 @@ NAME = antorcha
 CFLAGS = -g -mmcu=$(CHIP) \
 	 -DBOOT_ADDR=$(BOOT_ADDR) \
 	 -Wall -Wextra -Wshadow -Werror -Wno-unused-parameter \
-	 -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes
+	 -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes \
+	 -I../../ben-wpan/atusb/fw/include/
 
 CHIP = atmega168
 HOST = jlime
diff --git a/fw/rf.c b/fw/rf.c
index 87847d5..d1b3cff 100644
--- a/fw/rf.c
+++ b/fw/rf.c
@@ -17,7 +17,8 @@
 #define F_CPU	8000000UL
 #include <util/delay.h>
 
-#include "at86rf230.h"
+#include <at86rf230.h>
+
 #include "io.h"
 #include "spi.h"
 #include "rf.h"
diff --git a/tools/Makefile b/tools/Makefile
index 2625c63..d63242e 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,7 +13,8 @@
 
 MAIN = antorcha
 
-CFLAGS = -g -I../fw -I../../ben-wpan/tools/include
+CFLAGS = -g -I../fw -I../../ben-wpan/tools/include \
+	 -I../../ben-wpan/atusb/fw/include
 LDLIBS = -L../../ben-wpan/tools/lib -latrf -lusb
 
 OBJS = antorcha.o hash.o
diff --git a/tools/antorcha.c b/tools/antorcha.c
index d4754d2..2eb790f 100644
--- a/tools/antorcha.c
+++ b/tools/antorcha.c
@@ -18,14 +18,13 @@
 #include <string.h>
 #include <assert.h>
 
+#include <at86rf230.h>
 #include <atrf.h>
 #include <misctxrx.h>
 
 #include <hash.h>
 #include <proto.h>
 
-#include "../fw/at86rf230.h"
-
 
 static int verbose = 1;