Fixed boot error - Part 2

Fixed ALL of the file include errors now (tested on Ubuntu 12.04 &
Windows)