Fix order in a few headers