Updating Makefile to handle includes