More header file rearrangement.