Rearrange some things so such that low-level CoreLib headers aren't quite so crazy. For higher level stuff, you still need to include the appropriate header.