add includes/ & change path in Makefile