Any reason not to renovate the code base and remote the various uses of auto_ptr in favour of unique_ptr and strip out the various typedefs at the same time so that we uniformly just use std::unique_ptr<> right in code where folks can see it? P.