Removed surplus #includes