added makefile and fixed include paths