Fix some includes which are evidently pre-included within something on Windows (but not other OS').