Changing where the headers from haarcommon are read from.
Comments cleanup.