Re-ordered the Makefile, commented and debugged includes