Remake headers