Minor makefile and include tweaks.