Issue #PE-82: Fixed typos.
Issue #PE-82: Fixed include files.