Fix a command-replay bug in tear-down-incremental mode.  Thanks to Christoph Sticksel for the report.
Fix improper #inclusion of private header outside library.