fixed makefile and header guards