Changed to "correct way" syntax. Removed useless includes.