Header Related Changes

Maybe I forgot to press Commit... but that would be silly of me.