Improvements to Makefile; fixed inconsistencies in includes