Stdafx: More header cleaning.