Moved the headers code from Entries to Po extractor