Another clean-up series. Mostly trimming down on unneeded #includes. I tested DRI, non-DRI and MSVC builds of this series but it's possible I've missed some configuration and broke something. Fix-ups should be simple though. -Brian