diff --git a/firmware/Makefile b/firmware/Makefile
index 4210dc1..0617675 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,4 +1,4 @@
-CFLAGS  = -Wall -Werror -D__REDLIB__ -DDEBUG -D__CODE_RED -D__USE_CMSIS=CMSISv1p30_LPC13xx -Iinc -O0 -g3 -Wall -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections -mcpu=cortex-m3 -mthumb
+CFLAGS  = -Wall -Werror -D__REDLIB__ -DDEBUG -D__CODE_RED -D__USE_CMSIS=CMSISv1p30_LPC13xx -O0 -g3 -Wall -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections -mcpu=cortex-m3 -mthumb
 LDFLAGS = -nostdlib -Xlinker -Map=obj/edubrm.map --gc-sections -mcpu=cortex-m3 -mthumb -T obj/debug.ld
 LIST = $(shell cd src/ ; ls *.c)
 OBJS = $(addprefix obj/,$(LIST:.c=.o))
diff --git a/firmware/inc/LPC13xx.h b/firmware/src/LPC13xx.h
similarity index 100%
rename from firmware/inc/LPC13xx.h
rename to firmware/src/LPC13xx.h
diff --git a/firmware/inc/cdc.h b/firmware/src/cdc.h
similarity index 100%
rename from firmware/inc/cdc.h
rename to firmware/src/cdc.h
diff --git a/firmware/inc/cdcuser.h b/firmware/src/cdcuser.h
similarity index 100%
rename from firmware/inc/cdcuser.h
rename to firmware/src/cdcuser.h
diff --git a/firmware/inc/clkconfig.h b/firmware/src/clkconfig.h
similarity index 100%
rename from firmware/inc/clkconfig.h
rename to firmware/src/clkconfig.h
diff --git a/firmware/inc/config.h b/firmware/src/config.h
similarity index 100%
rename from firmware/inc/config.h
rename to firmware/src/config.h
diff --git a/firmware/inc/core_cm3.h b/firmware/src/core_cm3.h
similarity index 100%
rename from firmware/inc/core_cm3.h
rename to firmware/src/core_cm3.h
diff --git a/firmware/inc/memory.h b/firmware/src/memory.h
similarity index 100%
rename from firmware/inc/memory.h
rename to firmware/src/memory.h
diff --git a/firmware/inc/msc.h b/firmware/src/msc.h
similarity index 100%
rename from firmware/inc/msc.h
rename to firmware/src/msc.h
diff --git a/firmware/inc/mscuser.h b/firmware/src/mscuser.h
similarity index 100%
rename from firmware/inc/mscuser.h
rename to firmware/src/mscuser.h
diff --git a/firmware/inc/serial.h b/firmware/src/serial.h
similarity index 100%
rename from firmware/inc/serial.h
rename to firmware/src/serial.h
diff --git a/firmware/inc/system_LPC13xx.h b/firmware/src/system_LPC13xx.h
similarity index 100%
rename from firmware/inc/system_LPC13xx.h
rename to firmware/src/system_LPC13xx.h
diff --git a/firmware/inc/type.h b/firmware/src/type.h
similarity index 100%
rename from firmware/inc/type.h
rename to firmware/src/type.h
diff --git a/firmware/inc/usb.h b/firmware/src/usb.h
similarity index 100%
rename from firmware/inc/usb.h
rename to firmware/src/usb.h
diff --git a/firmware/inc/usbcfg.h b/firmware/src/usbcfg.h
similarity index 100%
rename from firmware/inc/usbcfg.h
rename to firmware/src/usbcfg.h
diff --git a/firmware/inc/usbcore.h b/firmware/src/usbcore.h
similarity index 100%
rename from firmware/inc/usbcore.h
rename to firmware/src/usbcore.h
diff --git a/firmware/inc/usbdesc.h b/firmware/src/usbdesc.h
similarity index 100%
rename from firmware/inc/usbdesc.h
rename to firmware/src/usbdesc.h
diff --git a/firmware/inc/usbhw.h b/firmware/src/usbhw.h
similarity index 100%
rename from firmware/inc/usbhw.h
rename to firmware/src/usbhw.h
diff --git a/firmware/inc/usbreg.h b/firmware/src/usbreg.h
similarity index 100%
rename from firmware/inc/usbreg.h
rename to firmware/src/usbreg.h
diff --git a/firmware/inc/usbuser.h b/firmware/src/usbuser.h
similarity index 100%
rename from firmware/inc/usbuser.h
rename to firmware/src/usbuser.h
diff --git a/firmware/inc/vcomdemo.h b/firmware/src/vcomdemo.h
similarity index 100%
rename from firmware/inc/vcomdemo.h
rename to firmware/src/vcomdemo.h