simplified Sapi.rebuild, which no longer accepts options
[Fixes #57802618] fixes inclusions showing up as listed in own right