Move more file stuff to file.h