"make depend" will need to be run after merging this code.