Updated the header re-ordering script to use the new interface.