Fix all headers