Merge pull request #429 from ImperatorPrime/master

Removed unused files.
[SP] Removed g_headers files.

Files now explicitly depend on the headers they need, instead of that
catch all.