Headercleanup 2013 mar

Perfection!