Makefile changes to support the addition of src and include dir