fixed makefile + headers