PIM-2602 : fix headers for new files