Tidy up header linkage makefile