move a few headers around