* Fix header include so that is works on unix
* Update Makefile.