remove unneeded #includes, fix indentation
3 files changed