Merge pull request #1 from codl/master

fix build
Oh my god let's never include cpp again guys
fix Makefile assuming this is C