modifiled Makefile, header to pass build on OS X