Revert "Remove some unnecessary includes." Turns out this explodes on Linux. This reverts commit c4696568cc15d140cbdae460cd5e227c46845114.
