Reduce header dependencies in surefile.h.