Shuffling some things between headers.