Makefile made more generic; missing includes added