Reorganize headers for installation.