Add Searchpath and header changes.