Formatting and inc files

Tried to correct some formatting issues that occurred in the initial
import. I also added some include files that were missed from my dev env
setup.