Rearrange header files.