fixup two header guards
untested StateTransfer