Updating before modifying and rearranging header files