Remove non-existent header, add missing import, remove redundancy.

Didn't build as is, due to import of non-existent file and missing import of existing file!