Get to compile again
More makefile cleanup
Remove redundant macros