Tweaked targets.
Split out Makefile into includes.