Added links; include paths to Makefile generator