Stdafx: Major header cleanup
More header changes.
Fix conflicts.
Remove some indirect headers.
Merge pull request #417 from xsacha/master

Stdafx: More header cleaning.