Clean up a few more includes