Clean up a few includes