Makefile adjustment
dependencies cleaned
include path fixed