Add header dependencies in the Makefile, and continue the gradual
shift in style.