Switch to spaces, consistent header includes.