Tidy up header linkage makefile
Merge pull request #90 from dmcdougall/tidy-header

Tidy up header linkage makefile