Fixup makefile and includes