Remove unnecessary includes.
WIP: This PR is *far* from finished. Submitting this version to trigger a Travis CI build to get testing on multiple platforms. Let's discuss which of these includes that should still be kept around despite being "technically redundant" and which we really want to remove.