fix typo and add missing includes