Fix makefile: include missing paths and be less explicit