These are files under common/ that have been moved around.  Updating
these manually is not satisfactory, but it's the only solution at the
moment.