Build fix - finish the file.h split.