Remove include headers, add spaces