[flashrom-gerrit] Change in flashrom[master]: layout: Tidy up forward declarations