Move headers in fileio.h too