Superfluous includes removed, fixed syntax error
Makefile added