Removed unused import, fixed error, added includes

Processed the comments of both teugis and daanvc.