diff --git a/fw/atspi/Makefile b/fw/atspi/Makefile
index 231e5bb..52b3db7 100644
--- a/fw/atspi/Makefile
+++ b/fw/atspi/Makefile
@@ -19,7 +19,7 @@ F32XBASE = ../../../f32xbase
 include $(F32XBASE)/fw/common/Makefile.system
 include $(F32XBASE)/fw/common/Makefile.common
 
-CFLAGS += -I../include
+CFLAGS += -I../common -I../include
 LDFLAGS += --code-size $(PAYLOAD_SIZE) --code-loc $(PAYLOAD_START)
 
 USB_ID = $(shell \
diff --git a/fw/boot/Makefile b/fw/boot/Makefile
index c2c2c5e..d8c4922 100644
--- a/fw/boot/Makefile
+++ b/fw/boot/Makefile
@@ -18,4 +18,5 @@ F32XBASE = ../../../f32xbase
 include $(F32XBASE)/fw/common/Makefile.system
 include $(F32XBASE)/fw/common/Makefile.common
 
+CFLAGS += -I../common
 LDFLAGS += --code-size $(PAYLOAD_START)
diff --git a/fw/boot/config.h b/fw/common/config.h
similarity index 77%
rename from fw/boot/config.h
rename to fw/common/config.h
index e234ef1..3c384e4 100644
--- a/fw/boot/config.h
+++ b/fw/common/config.h
@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /*
- *  Platform-specific settings for boot.c
+ *  Platform-specific settings
  *
  * USB_VENDOR = Qi Hardware
  * USB_PRODUCT = 802.15.4, device 0
@@ -12,4 +12,6 @@
 #define	USB_VENDOR	0x20b7
 #define	USB_PRODUCT	0x1540
 
+#define	HW_TYPE		HW_TYPE_100813
+
 #endif /* !CONFIG_H */
diff --git a/fw/atspi/io.h b/fw/common/io.h
similarity index 100%
rename from fw/atspi/io.h
rename to fw/common/io.h