Snow Leopard: makefile_functions.sh - Also rename the other header source names
Merge remote-tracking branch 'origin/master'