diff --git a/Makefile b/Makefile
index 3c4dd1b76..b0a39848d 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ include $(TOPDIR)/config.mk
 AOBJS =
 COBJS = $(patsubst %.c,%.o,$(wildcard src/*.c))
 #TESTS = $(wildcard tests/*.c)
-TESTS = tests/blink-red.c #tests/nvm-read.c
+#TESTS = tests/blink-red.c #tests/nvm-read.c
 TARGETS = $(patsubst %.c,%.o,$(TESTS))
 
 # Add GCC lib
@@ -54,12 +54,15 @@ ALL = $(TESTS:.c=.srec) $(TESTS:.c=.bin) $(TESTS:.c=.dis)
 
 LIBOBJS = $(patsubst %.c,%.o,$(wildcard libmc1322x/*.c))
 
+include $(TOPDIR)/board/dev/Makefile
+all: board
+
 libmc1322x: libmc1322x.a
 
 libmc1322x.a: $(LIBOBJS) 
 	$(AR) r libmc1322x.a $(LIBOBJS)
 
-all:		src/start.o src/isr.o $(ALL)
+#all:		src/start.o src/isr.o $(ALL)
 
 #tests/flasher.obj: src/maca.o src/nvm.o
 #tests/nvm-read.obj: src/maca.o src/nvm.o
diff --git a/config.mk b/config.mk
index 853084aa2..5af284c46 100644
--- a/config.mk
+++ b/config.mk
@@ -56,6 +56,7 @@ gccincdir := $(shell $(CC) -print-file-name=include)
 CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS)		\
 	-D__KERNEL__ -DTEXT_BASE=$(TEXT_BASE)		\
 	-I$(TOPDIR)/libmc1322x/include				\
+	-I$(TOPDIR)/board				\
 	-fno-builtin -ffreestanding -nostdinc -isystem	\
 	$(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
 
diff --git a/libmc1322x/include/maca.h b/libmc1322x/include/maca.h
index 3091685ce..15997ac1c 100644
--- a/libmc1322x/include/maca.h
+++ b/libmc1322x/include/maca.h
@@ -1,7 +1,7 @@
 #ifndef _MACA_H_
 #define _MACA_H_
 
-#include "embedded_types.h"
+#include <types.h>
 
 #define MACA_BASE       0x80004000
 #define MACA_RESET      0x80004004
diff --git a/tests/blink-red.c b/tests/blink-red.c
index cccc1b1ca..cde4ef6e1 100644
--- a/tests/blink-red.c
+++ b/tests/blink-red.c
@@ -1,5 +1,5 @@
-#include "mc1322x.h"
-#include "boards.h"
+#include <mc1322x.h>
+#include <boards.h>
 
 #define MBAR_GPIO       0x80000000
 #define GPIO_PAD_DIR0   ((volatile uint32_t *) 0x80000000)