Tidy up unneeded lines in makefiles

Also remove some symlinked headers that weren't needed
Fix commented broken examples

make distcheck now succeeds