Fix typo and remove unnecessary include files.