rename header files for reordering