OK! I did the thing. Added the included-in-core tag, updated the OP, and added a reply. In some cases I found some updates that were needed to the OP too. Thanks @moin for your eagle eye to find problems.
Feel free to flag affected topics that need further fixing or updates. Otherwise I think we are caught up.