r1572 header issue for BlockSaver.h