Makefile, header tweaks